From bc1cca8d006f5c9cc6a6e695b2a12bb208694bb5 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Sat, 16 Oct 2010 09:27:02 +0000
Subject: [PATCH] - blender player builds again with CMake. - remove duplicate
 entries for libs for blender binary (where possible)

---
 source/blenderplayer/CMakeLists.txt | 12 +++++++-----
 source/creator/CMakeLists.txt       | 22 ++++++----------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index a61152d37ba..b1dbde8d4b1 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -65,7 +65,7 @@ IF(UNIX)
 		gp_ghost 
 		gp_common 
 		bf_intern_string 
-		bf_intern_ghost 
+		bf_intern_ghost
 		bf_rna
 		bf_blenkernel
 		bf_blenloader 
@@ -81,10 +81,10 @@ IF(UNIX)
 		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 @@ IF(UNIX)
 		extern_binreloc
 		extern_glew
 		extern_minilzo
+		bf_intern_ghost # duplicate for linking
+		bf_blenkernel # duplicate for linking
 	)
   
 	IF(WITH_QUICKTIME)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 0433f76c846..f2ea4d3dc75 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -451,9 +451,6 @@ IF(WITH_FLUID)
 	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 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 		bf_editor_animation
 		bf_editor_datafiles
 
-		bf_intern_bsp 
 		bf_render 
 		bf_intern_opennl 
 		bf_python 
@@ -529,8 +525,6 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 		bf_intern_memutil 
 		bf_intern_guardedalloc 
 		bf_intern_ctr 
-		bf_intern_moto 
-		bf_windowmanager
 		bf_blroutines 
 		bf_converter 
 		bf_dummy 
@@ -545,19 +539,13 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 		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 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 		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)