[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36105] trunk/blender/source/blenderplayer /CMakeLists.txt: enable blenderplayer library sorting on windows, ( was already enabled for blender), resolves linking issue on windows

Campbell Barton ideasman42 at gmail.com
Tue Apr 12 03:56:04 CEST 2011


Revision: 36105
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36105
Author:   campbellbarton
Date:     2011-04-12 01:56:03 +0000 (Tue, 12 Apr 2011)
Log Message:
-----------
enable blenderplayer library sorting on windows, (was already enabled for blender), resolves linking issue on windows

Modified Paths:
--------------
    trunk/blender/source/blenderplayer/CMakeLists.txt

Modified: trunk/blender/source/blenderplayer/CMakeLists.txt
===================================================================
--- trunk/blender/source/blenderplayer/CMakeLists.txt	2011-04-11 19:22:43 UTC (rev 36104)
+++ trunk/blender/source/blenderplayer/CMakeLists.txt	2011-04-12 01:56:03 UTC (rev 36105)
@@ -69,7 +69,7 @@
 	list(APPEND BLENDER_LINK_LIBS extern_binreloc)
 endif()
 
-if(UNIX)
+# if(UNIX)
 	# Sort libraries
 	set(BLENDER_SORTED_LIBS
 		ge_player_ghost 
@@ -128,13 +128,13 @@
 		bf_intern_mikktspace
 	)
 
-    if(WITH_ELTOPO)
+	if(WITH_ELTOPO)
 		list(APPEND BLENDER_SORTED_LIBS extern_eltopo)
-    endif()
-    
-    if(WITH_BUILTIN_GLEW)
+	endif()
+
+	if(WITH_BUILTIN_GLEW)
 		list(APPEND BLENDER_SORTED_LIBS extern_glew)
-    endif()
+	endif()
 
 	if(WITH_LZMA)
 		list(APPEND BLENDER_SORTED_LIBS extern_lzma)
@@ -176,9 +176,9 @@
 		message(STATUS "Player Skipping: (${REM_MSG})")
 	endif()
 	target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS})
-else()
-	target_link_libraries(blenderplayer ${BLENDER_LINK_LIBS})
-endif()
+# else()
+# 	target_link_libraries(blenderplayer ${BLENDER_LINK_LIBS})
+# endif()
 
 if(WITH_PLAYER)
 	add_subdirectory(bad_level_call_stubs)




More information about the Bf-blender-cvs mailing list