diff options
Diffstat (limited to 'source/creator/CMakeLists.txt')
| -rw-r--r-- | source/creator/CMakeLists.txt | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index ee6f19e457d..9908b98d285 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -38,6 +38,7 @@ INCLUDE_DIRECTORIES(../../intern/guardedalloc ../blender/python ../blender/makesdna ../blender/gpu + ../blender/windowmanager ../kernel/gen_messaging ../kernel/gen_system ../../extern/glew/include @@ -64,12 +65,15 @@ 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 + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/rna.c + COMMAND ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesrna ${CMAKE_CURRENT_BINARY_DIR}/rna.c ${CMAKE_SOURCE_DIR}/source/blender/makesrna/ + DEPENDS ${CMAKE_BINARY_DIR}/bin/${CMAKE_CFG_INTDIR}/makesrna ) IF(WIN32) - ADD_EXECUTABLE(blender ${EXETYPE} creator.c ${CMAKE_CURRENT_BINARY_DIR}/dna.c ../icons/winblender.rc) + ADD_EXECUTABLE(blender ${EXETYPE} creator.c ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_CURRENT_BINARY_DIR}/rna.c ../icons/winblender.rc) ELSE(WIN32) - ADD_EXECUTABLE(blender ${EXETYPE} creator.c ${CMAKE_CURRENT_BINARY_DIR}/dna.c) + ADD_EXECUTABLE(blender ${EXETYPE} creator.c ${CMAKE_CURRENT_BINARY_DIR}/dna.c ${CMAKE_CURRENT_BINARY_DIR}/rna.c) ENDIF(WIN32) @@ -190,7 +194,7 @@ ADD_DEPENDENCIES(blender makesdna) FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS) -SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} src blender_python blender_render blender_radiosity) +SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager bf_editors blender_render blender_radiosity) IF(WITH_ELBEEM) SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} bf_elbeem) @@ -203,7 +207,8 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") IF(UNIX) # Sort libraries SET(BLENDER_SORTED_LIBS - src + bf_windowmanager + bf_editors bf_decimation blender_BSP bf_soundsystem @@ -212,7 +217,7 @@ IF(UNIX) blender_render blender_radiosity blender_ONL - blender_python + bf_python bf_blenkernel bf_nodes bf_gpu @@ -237,7 +242,8 @@ IF(UNIX) bf_moto bf_bmfont verse - src + bf_windowmanager + bf_editors bf_ftfont extern_ftgl bf_blroutines @@ -263,7 +269,7 @@ IF(UNIX) extern_solid extern_qhull bf_moto - blender_python + bf_python bf_quicktime extern_binreloc extern_glew |