diff options
author | Joseph Eagar <joeedh@gmail.com> | 2011-02-27 09:19:40 +0300 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2011-02-27 09:19:40 +0300 |
commit | f01261d040be27337db9f9996d648a279c89b7c4 (patch) | |
tree | c448230939b3c90d53ce8852dd00925d6052e3a4 /source/blenderplayer/CMakeLists.txt | |
parent | dcaeda5c4e3a0687251b8511de4f2e8b85ef75c0 (diff) | |
parent | 2198cfdb2deec8b2e85e242c74a032f43d0b26ca (diff) |
merge with/from trunk at r35190
Diffstat (limited to 'source/blenderplayer/CMakeLists.txt')
-rw-r--r-- | source/blenderplayer/CMakeLists.txt | 163 |
1 files changed, 108 insertions, 55 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 8fcea674ebb..4bc4931cfb4 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -1,3 +1,4 @@ +# -*- mode: cmake; indent-tabs-mode: t; -*- # $Id$ # ***** BEGIN GPL LICENSE BLOCK ***** # @@ -24,52 +25,60 @@ # # ***** END GPL LICENSE BLOCK ***** -MESSAGE(STATUS "Configuring blenderplayer") +# message(STATUS "Configuring blenderplayer") -SETUP_LIBDIRS() +setup_libdirs() -IF(WITH_QUICKTIME) - ADD_DEFINITIONS(-DWITH_QUICKTIME) -ENDIF(WITH_QUICKTIME) +if(WITH_CODEC_QUICKTIME) + add_definitions(-DWITH_QUICKTIME) +endif() -IF(CMAKE_SYSTEM_NAME MATCHES "Linux") - ADD_DEFINITIONS(-DWITH_BINRELOC) - INCLUDE_DIRECTORIES(${BINRELOC_INC}) -ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") - -ADD_CUSTOM_COMMAND( +add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_SOURCE_DIR}/source/blender/makesdna/ DEPENDS ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesdna ) -IF(WIN32) - ADD_EXECUTABLE(blenderplayer ${EXETYPE} ${CMAKE_CURRENT_BINARY_DIR}/dna.c ../icons/winblender.rc) -ELSE(WIN32) - ADD_EXECUTABLE(blenderplayer ${CMAKE_CURRENT_BINARY_DIR}/dna.c) -ENDIF(WIN32) +if(WIN32 AND NOT UNIX) + add_executable(blenderplayer ${EXETYPE} ${CMAKE_CURRENT_BINARY_DIR}/dna.c ../icons/winblender.rc) +else() + add_executable(blenderplayer ${CMAKE_CURRENT_BINARY_DIR}/dna.c) +endif() -ADD_DEPENDENCIES(blenderplayer makesdna) +add_dependencies(blenderplayer makesdna) -FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS) +get_property(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS) -SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} gp_common gp_ghost blenkernel_blc) +list(APPEND BLENDER_LINK_LIBS + ge_player_common + ge_player_ghost + blenkernel_blc +) -IF(CMAKE_SYSTEM_NAME MATCHES "Linux") - SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} extern_binreloc) -ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") +if(CMAKE_SYSTEM_NAME MATCHES "Linux") + list(APPEND BLENDER_LINK_LIBS extern_binreloc) +endif() -IF(UNIX) +if(UNIX) # Sort libraries +<<<<<<< .working SET(BLENDER_SORTED_LIBS gp_ghost gp_common bf_intern_string bf_intern_ghost +======= + set(BLENDER_SORTED_LIBS + ge_player_ghost + ge_player_common + bf_intern_string + bf_intern_ghost +>>>>>>> .merge-right.r35190 bf_rna bf_blenkernel bf_blenloader bf_blenpluginapi +<<<<<<< .working bf_blroutines bf_converter bf_ketsji @@ -85,64 +94,108 @@ IF(UNIX) bf_intern_itasc bf_intern_ik bf_intern_smoke +======= + ge_blen_routines + bf_editor_datafiles + ge_converter + ge_logic_ketsji + ge_phys_bullet + ge_phys_dummy + ge_phys_common + ge_logic + ge_rasterizer + ge_oglrasterizer + ge_logic_expressions + ge_scenegraph + bf_ikplugin + bf_intern_itasc + bf_intern_ik + bf_intern_smoke +>>>>>>> .merge-right.r35190 bf_modifiers +<<<<<<< .working bf_intern_moto bf_kernel +======= + bf_intern_moto + bf_gen_system +>>>>>>> .merge-right.r35190 bf_nodes bf_gpu bf_imbuf bf_avi - kx_network - bf_ngnetwork - bf_loopbacknetwork + ge_logic_network + ge_logic_ngnetwork + ge_logic_loopbacknetwork extern_bullet bf_intern_guardedalloc bf_intern_memutil bf_python bf_python_ext bf_blenlib +<<<<<<< .working bf_cineon bf_openexr extern_openjpeg bf_dds +======= + bf_imbuf_cineon + bf_imbuf_openexr + extern_openjpeg + bf_imbuf_dds +>>>>>>> .merge-right.r35190 bf_readblenfile bf_dna - bf_videotex + ge_videotex bf_blenfont bf_intern_audaspace blenkernel_blc extern_binreloc extern_glew + extern_minilzo + bf_intern_ghost # duplicate for linking + bf_blenkernel # duplicate for linking + bf_intern_mikktspace ) - - IF(WITH_QUICKTIME) - SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_quicktime) - ENDIF(WITH_QUICKTIME) +<<<<<<< .working IF(WITH_CXX_GUARDEDALLOC) SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_intern_guardedalloc_cpp) ENDIF(WITH_CXX_GUARDEDALLOC) - - FOREACH(SORTLIB ${BLENDER_SORTED_LIBS}) - SET(REMLIB ${SORTLIB}) - FOREACH(SEARCHLIB ${BLENDER_LINK_LIBS}) - IF(${SEARCHLIB} STREQUAL ${SORTLIB}) - SET(REMLIB "") - ENDIF(${SEARCHLIB} STREQUAL ${SORTLIB}) - ENDFOREACH(SEARCHLIB) - IF(REMLIB) - MESSAGE(STATUS "Removing library ${REMLIB} from blenderplayer linking because: not configured") - LIST(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB}) - ENDIF(REMLIB) - ENDFOREACH(SORTLIB) - - TARGET_LINK_LIBRARIES(blenderplayer ${BLENDER_SORTED_LIBS}) -ELSE(UNIX) - TARGET_LINK_LIBRARIES(blenderplayer ${BLENDER_LINK_LIBS}) -ENDIF(UNIX) - -IF(WITH_PLAYER) - ADD_SUBDIRECTORY(bad_level_call_stubs) -ENDIF(WITH_PLAYER) - -SETUP_LIBLINKS(blenderplayer) +======= + if(WITH_CODEC_QUICKTIME) + list(APPEND BLENDER_SORTED_LIBS bf_quicktime) + endif() +>>>>>>> .merge-right.r35190 + + if(WITH_CXX_GUARDEDALLOC) + list(APPEND BLENDER_SORTED_LIBS bf_intern_guardedalloc_cpp) + endif() + + foreach(SORTLIB ${BLENDER_SORTED_LIBS}) + set(REMLIB ${SORTLIB}) + foreach(SEARCHLIB ${BLENDER_LINK_LIBS}) + if(${SEARCHLIB} STREQUAL ${SORTLIB}) + set(REMLIB "") + endif() + endforeach() + if(REMLIB) + # message(STATUS "Removing library ${REMLIB} from blenderplayer linking because: not configured") + list(APPEND REM_MSG ${REMLIB}) + list(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB}) + endif() + endforeach() + if(REM_MSG) + list(SORT REM_MSG) + message(STATUS "Player Skipping: (${REM_MSG})") + endif() + target_link_libraries(blenderplayer ${BLENDER_SORTED_LIBS}) +else() + target_link_libraries(blenderplayer ${BLENDER_LINK_LIBS}) +endif() + +if(WITH_PLAYER) + add_subdirectory(bad_level_call_stubs) +endif() + +setup_liblinks(blenderplayer) |