Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-04-12 05:56:03 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-04-12 05:56:03 +0400
commit3a73a75e844cf067c92f8c7f8d18065bc413b7b6 (patch)
tree361d2be6394521662c4af1ea89121b69ddf600cb /source/blenderplayer
parente210d82f17c89b92e8c9c60ff059c9f1d644b155 (diff)
enable blenderplayer library sorting on windows, (was already enabled for blender), resolves linking issue on windows
Diffstat (limited to 'source/blenderplayer')
-rw-r--r--source/blenderplayer/CMakeLists.txt18
1 files changed, 9 insertions, 9 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index eba394bcce6..8caa76ebc7e 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -69,7 +69,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Linux")
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 @@ if(UNIX)
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 @@ if(UNIX)
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)