Revision: 32512
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32512
Author: campbellbarton
Date: 2010-10-16 11:27:02 +0200 (Sat, 16 Oct 2010)
Log Message:
-----------
- blender player builds again with CMake.
- remove duplicate entries for libs for blender binary (where possible)
Modified Paths:
--------------
trunk/blender/source/blenderplayer/CMakeLists.txt
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/source/blenderplayer/CMakeLists.txt
===================================================================
--- trunk/blender/source/blenderplayer/CMakeLists.txt 2010-10-16 08:03:28 UTC
(rev 32511)
+++ trunk/blender/source/blenderplayer/CMakeLists.txt 2010-10-16 09:27:02 UTC
(rev 32512)
@@ -65,7 +65,7 @@
gp_ghost
gp_common
bf_intern_string
- bf_intern_ghost
+ bf_intern_ghost
bf_rna
bf_blenkernel
bf_blenloader
@@ -81,10 +81,10 @@
bf_oglrasterizer
bf_expressions
bf_scenegraph
- bf_ikplugin
- bf_intern_itasc
- bf_intern_ik
- bf_intern_smoke
+ bf_ikplugin
+ bf_intern_itasc
+ bf_intern_ik
+ bf_intern_smoke
bf_modifiers
bf_intern_moto
bf_kernel
@@ -114,6 +114,8 @@
extern_binreloc
extern_glew
extern_minilzo
+ bf_intern_ghost # duplicate for linking
+ bf_blenkernel # duplicate for linking
)
IF(WITH_QUICKTIME)
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2010-10-16 08:03:28 UTC (rev
32511)
+++ trunk/blender/source/creator/CMakeLists.txt 2010-10-16 09:27:02 UTC (rev
32512)
@@ -451,9 +451,6 @@
LIST(APPEND BLENDER_LINK_LIBS bf_intern_elbeem)
ENDIF(WITH_FLUID)
-IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
- LIST(APPEND BLENDER_LINK_LIBS extern_binreloc)
-ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
#IF(UNIX)
# Sort libraries
@@ -498,7 +495,6 @@
bf_editor_animation
bf_editor_datafiles
- bf_intern_bsp
bf_render
bf_intern_opennl
bf_python
@@ -529,8 +525,6 @@
bf_intern_memutil
bf_intern_guardedalloc
bf_intern_ctr
- bf_intern_moto
- bf_windowmanager
bf_blroutines
bf_converter
bf_dummy
@@ -545,19 +539,13 @@
bf_oglrasterizer
bf_expressions
bf_scenegraph
- bf_intern_moto
- bf_blroutines
kx_network
- bf_kernel
+ bf_kernel
+ bf_python # duplicate for BPY_eval_driver
bf_ngnetwork
extern_bullet
bf_loopbacknetwork
- bf_intern_itasc
- bf_common
bf_intern_moto
- bf_python
- bf_python_ext
- extern_binreloc
extern_glew
extern_openjpeg
bf_videotex
@@ -565,10 +553,12 @@
bf_dna
bf_blenfont
bf_intern_audaspace
- bf_intern_decimate
-
)
+ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+ LIST(APPEND BLENDER_SORTED_LIBS extern_binreloc)
+ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+
IF(WITH_CXX_GUARDEDALLOC)
LIST(APPEND BLENDER_SORTED_LIBS bf_intern_guardedalloc_cpp)
ENDIF(WITH_CXX_GUARDEDALLOC)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
