diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/python/generic/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blender/render/CMakeLists.txt | 2 | ||||
-rw-r--r-- | source/blenderplayer/CMakeLists.txt | 24 | ||||
-rw-r--r-- | source/creator/CMakeLists.txt | 56 |
4 files changed, 42 insertions, 42 deletions
diff --git a/source/blender/python/generic/CMakeLists.txt b/source/blender/python/generic/CMakeLists.txt index b6985458d0c..1a91abfbec8 100644 --- a/source/blender/python/generic/CMakeLists.txt +++ b/source/blender/python/generic/CMakeLists.txt @@ -31,4 +31,4 @@ SET(INC ${PYTHON_INC} ) -BLENDERLIB(bf_gen_python "${SRC}" "${INC}") +BLENDERLIB(bf_python_ext "${SRC}" "${INC}") diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt index 2047ab29d24..1b6a29b616a 100644 --- a/source/blender/render/CMakeLists.txt +++ b/source/blender/render/CMakeLists.txt @@ -54,4 +54,4 @@ IF(APPLE) ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES "i386" OR CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") ENDIF(APPLE) -BLENDERLIB_NOLIST(blender_render "${SRC}" "${INC}") +BLENDERLIB_NOLIST(bf_render "${SRC}" "${INC}") diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 566bc88e46d..8fcea674ebb 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -64,8 +64,8 @@ IF(UNIX) SET(BLENDER_SORTED_LIBS gp_ghost gp_common - bf_string - bf_ghost + bf_intern_string + bf_intern_ghost bf_rna bf_blenkernel bf_blenloader @@ -82,11 +82,11 @@ IF(UNIX) bf_expressions bf_scenegraph bf_ikplugin - bf_ITASC - bf_IK - bf_smoke + bf_intern_itasc + bf_intern_ik + bf_intern_smoke bf_modifiers - bf_moto + bf_intern_moto bf_kernel bf_nodes bf_gpu @@ -96,20 +96,20 @@ IF(UNIX) bf_ngnetwork bf_loopbacknetwork extern_bullet - bf_guardedalloc - bf_memutil + bf_intern_guardedalloc + bf_intern_memutil bf_python - bf_gen_python + bf_python_ext bf_blenlib bf_cineon bf_openexr - extern_libopenjpeg + extern_openjpeg bf_dds bf_readblenfile bf_dna bf_videotex bf_blenfont - bf_audaspace + bf_intern_audaspace blenkernel_blc extern_binreloc extern_glew @@ -120,7 +120,7 @@ IF(UNIX) ENDIF(WITH_QUICKTIME) IF(WITH_CXX_GUARDEDALLOC) - SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp) + SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_intern_guardedalloc_cpp) ENDIF(WITH_CXX_GUARDEDALLOC) FOREACH(SORTLIB ${BLENDER_SORTED_LIBS}) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 4088369a05b..9920752f9d2 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -383,10 +383,10 @@ 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} bf_windowmanager blender_render) +SET(BLENDER_LINK_LIBS bf_nodes ${BLENDER_LINK_LIBS} bf_windowmanager bf_render) IF(WITH_FLUID) - SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} bf_elbeem) + SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} bf_intern_elbeem) ENDIF(WITH_FLUID) IF(CMAKE_SYSTEM_NAME MATCHES "Linux") @@ -436,11 +436,11 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") bf_editor_animation bf_editor_datafiles - blender_BSP - blender_render - blender_ONL + bf_intern_bsp + bf_render + bf_intern_opennl bf_python - bf_gen_python + bf_python_ext bf_ikplugin bf_modifiers bf_blenkernel @@ -448,8 +448,8 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") bf_gpu bf_blenloader bf_blenlib - bf_ghost - bf_string + bf_intern_ghost + bf_intern_string bf_blenpluginapi bf_imbuf bf_avi @@ -458,24 +458,24 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") bf_dds bf_readblenfile bf_collada - blender_BSP - blender_bop + bf_intern_bsp + bf_intern_bop bf_kernel - bf_decimation - bf_elbeem - bf_IK - bf_memutil - bf_guardedalloc - blender_CTR - bf_moto + bf_intern_decimate + bf_intern_elbeem + bf_intern_ik + bf_intern_memutil + bf_intern_guardedalloc + bf_intern_ctr + bf_intern_moto bf_windowmanager bf_blroutines bf_converter bf_dummy bf_bullet - bf_smoke - bf_minilzo - bf_lzma + bf_intern_smoke + extern_minilzo + extern_lzma bf_common bf_ketsji bf_logic @@ -483,32 +483,32 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") bf_oglrasterizer bf_expressions bf_scenegraph - bf_moto + bf_intern_moto bf_blroutines kx_network bf_kernel bf_ngnetwork extern_bullet bf_loopbacknetwork - bf_ITASC + bf_intern_itasc bf_common - bf_moto + bf_intern_moto bf_python - bf_gen_python + bf_python_ext extern_binreloc extern_glew - extern_libopenjpeg + extern_openjpeg bf_videotex bf_rna bf_dna bf_blenfont - bf_audaspace - bf_decimation + bf_intern_audaspace + bf_intern_decimate ) IF(WITH_CXX_GUARDEDALLOC) - SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_guardedalloc_cpp) + SET(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} bf_intern_guardedalloc_cpp) ENDIF(WITH_CXX_GUARDEDALLOC) IF(WITH_QUICKTIME) |