[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33156] trunk/blender/source: rename libs internal libs for CMake + SCons (used in MSVC project files)
Campbell Barton
ideasman42 at gmail.com
Thu Nov 18 12:42:05 CET 2010
Revision: 33156
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33156
Author: campbellbarton
Date: 2010-11-18 12:42:05 +0100 (Thu, 18 Nov 2010)
Log Message:
-----------
rename libs internal libs for CMake + SCons (used in MSVC project files)
for game engine use "ge_" prefix & make names generally more descriptive.
Modified Paths:
--------------
trunk/blender/source/blender/imbuf/intern/cineon/CMakeLists.txt
trunk/blender/source/blender/imbuf/intern/cineon/SConscript
trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt
trunk/blender/source/blender/imbuf/intern/dds/SConscript
trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt
trunk/blender/source/blender/imbuf/intern/openexr/SConscript
trunk/blender/source/blenderplayer/CMakeLists.txt
trunk/blender/source/creator/CMakeLists.txt
trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
trunk/blender/source/gameengine/BlenderRoutines/SConscript
trunk/blender/source/gameengine/Converter/CMakeLists.txt
trunk/blender/source/gameengine/Converter/SConscript
trunk/blender/source/gameengine/Expressions/CMakeLists.txt
trunk/blender/source/gameengine/Expressions/SConscript
trunk/blender/source/gameengine/GameLogic/CMakeLists.txt
trunk/blender/source/gameengine/GameLogic/SConscript
trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt
trunk/blender/source/gameengine/GamePlayer/common/SConscript
trunk/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
trunk/blender/source/gameengine/GamePlayer/ghost/SConscript
trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
trunk/blender/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
trunk/blender/source/gameengine/Ketsji/SConscript
trunk/blender/source/gameengine/Network/CMakeLists.txt
trunk/blender/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
trunk/blender/source/gameengine/Network/LoopBackNetwork/SConscript
trunk/blender/source/gameengine/Network/SConscript
trunk/blender/source/gameengine/Physics/Bullet/CMakeLists.txt
trunk/blender/source/gameengine/Physics/Bullet/SConscript
trunk/blender/source/gameengine/Physics/Dummy/CMakeLists.txt
trunk/blender/source/gameengine/Physics/Dummy/SConscript
trunk/blender/source/gameengine/Physics/common/CMakeLists.txt
trunk/blender/source/gameengine/Physics/common/SConscript
trunk/blender/source/gameengine/Rasterizer/CMakeLists.txt
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
trunk/blender/source/gameengine/Rasterizer/SConscript
trunk/blender/source/gameengine/SceneGraph/CMakeLists.txt
trunk/blender/source/gameengine/SceneGraph/SConscript
trunk/blender/source/gameengine/VideoTexture/CMakeLists.txt
trunk/blender/source/gameengine/VideoTexture/SConscript
trunk/blender/source/kernel/CMakeLists.txt
trunk/blender/source/kernel/SConscript
Modified: trunk/blender/source/blender/imbuf/intern/cineon/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/intern/cineon/CMakeLists.txt 2010-11-18 10:36:14 UTC (rev 33155)
+++ trunk/blender/source/blender/imbuf/intern/cineon/CMakeLists.txt 2010-11-18 11:42:05 UTC (rev 33156)
@@ -44,4 +44,4 @@
logmemfile.c
)
-BLENDERLIB(bf_cineon "${SRC}" "${INC}")
+BLENDERLIB(bf_imbuf_cineon "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/imbuf/intern/cineon/SConscript
===================================================================
--- trunk/blender/source/blender/imbuf/intern/cineon/SConscript 2010-11-18 10:36:14 UTC (rev 33155)
+++ trunk/blender/source/blender/imbuf/intern/cineon/SConscript 2010-11-18 11:42:05 UTC (rev 33156)
@@ -14,4 +14,4 @@
defs = []
-env.BlenderLib ('bf_cineon', source_files, incs, defs, libtype=['core','player'], priority = [220,175])
+env.BlenderLib ('bf_imbuf_cineon', source_files, incs, defs, libtype=['core','player'], priority = [220,175])
Modified: trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt 2010-11-18 10:36:14 UTC (rev 33155)
+++ trunk/blender/source/blender/imbuf/intern/dds/CMakeLists.txt 2010-11-18 11:42:05 UTC (rev 33156)
@@ -48,4 +48,4 @@
ADD_DEFINITIONS(-DWITH_DDS)
ENDIF(WITH_IMAGE_DDS)
-BLENDERLIB(bf_dds "${SRC}" "${INC}")
+BLENDERLIB(bf_imbuf_dds "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/imbuf/intern/dds/SConscript
===================================================================
--- trunk/blender/source/blender/imbuf/intern/dds/SConscript 2010-11-18 10:36:14 UTC (rev 33155)
+++ trunk/blender/source/blender/imbuf/intern/dds/SConscript 2010-11-18 11:42:05 UTC (rev 33156)
@@ -16,4 +16,4 @@
defs = ['WITH_DDS']
-env.BlenderLib ('bf_dds', source_files, incs, defs, libtype=['core','player'], priority = [230,190])
+env.BlenderLib ('bf_imbuf_dds', source_files, incs, defs, libtype=['core','player'], priority = [230,190])
Modified: trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt 2010-11-18 10:36:14 UTC (rev 33155)
+++ trunk/blender/source/blender/imbuf/intern/openexr/CMakeLists.txt 2010-11-18 11:42:05 UTC (rev 33156)
@@ -44,4 +44,4 @@
ADD_DEFINITIONS(-DWITH_OPENEXR)
ENDIF(WITH_IMAGE_OPENEXR)
-BLENDERLIB(bf_openexr "${SRC}" "${INC}")
+BLENDERLIB(bf_imbuf_openexr "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/imbuf/intern/openexr/SConscript
===================================================================
--- trunk/blender/source/blender/imbuf/intern/openexr/SConscript 2010-11-18 10:36:14 UTC (rev 33155)
+++ trunk/blender/source/blender/imbuf/intern/openexr/SConscript 2010-11-18 11:42:05 UTC (rev 33156)
@@ -15,4 +15,4 @@
defs = ['WITH_OPENEXR']
-env.BlenderLib ('bf_openexr', source_files, incs, defs, libtype=['core','player'], priority = [225,180])
+env.BlenderLib ('bf_imbuf_openexr', source_files, incs, defs, libtype=['core','player'], priority = [225,180])
Modified: trunk/blender/source/blenderplayer/CMakeLists.txt
===================================================================
--- trunk/blender/source/blenderplayer/CMakeLists.txt 2010-11-18 10:36:14 UTC (rev 33155)
+++ trunk/blender/source/blenderplayer/CMakeLists.txt 2010-11-18 11:42:05 UTC (rev 33156)
@@ -53,7 +53,7 @@
FILE(READ ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt BLENDER_LINK_LIBS)
-SET(BLENDER_LINK_LIBS ${BLENDER_LINK_LIBS} gp_common gp_ghost blenkernel_blc)
+SET(BLENDER_LINK_LIBS ${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)
@@ -62,53 +62,53 @@
IF(UNIX)
# Sort libraries
SET(BLENDER_SORTED_LIBS
- gp_ghost
- gp_common
+ ge_player_ghost
+ ge_player_common
bf_intern_string
bf_intern_ghost
bf_rna
bf_blenkernel
bf_blenloader
bf_blenpluginapi
- bf_blroutines
+ ge_blen_routines
bf_editor_datafiles
- bf_converter
- bf_ketsji
- bf_bullet
- bf_dummy
- bf_common
- bf_logic
- bf_rasterizer
- bf_oglrasterizer
- bf_expressions
- bf_scenegraph
+ 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
bf_modifiers
bf_intern_moto
- bf_kernel
+ bf_gen_system
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
- bf_cineon
- bf_openexr
+ bf_imbuf_cineon
+ bf_imbuf_openexr
extern_openjpeg
- bf_dds
+ bf_imbuf_dds
bf_readblenfile
bf_dna
- bf_videotex
+ ge_videotex
bf_blenfont
bf_intern_audaspace
blenkernel_blc
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2010-11-18 10:36:14 UTC (rev 33155)
+++ trunk/blender/source/creator/CMakeLists.txt 2010-11-18 11:42:05 UTC (rev 33156)
@@ -524,44 +524,44 @@
bf_blenpluginapi
bf_imbuf
bf_avi
- bf_cineon
- bf_openexr
- bf_dds
+ bf_imbuf_cineon
+ bf_imbuf_openexr
+ bf_imbuf_dds
bf_readblenfile
bf_collada
bf_intern_bsp
bf_intern_bop
- bf_kernel
+ bf_gen_system
bf_intern_decimate
bf_intern_elbeem
bf_intern_ik
bf_intern_memutil
bf_intern_guardedalloc
bf_intern_ctr
- bf_blroutines
- bf_converter
- bf_dummy
- bf_bullet
+ ge_blen_routines
+ ge_converter
+ ge_phys_dummy
+ ge_phys_bullet
bf_intern_smoke
extern_minilzo
extern_lzma
- bf_ketsji
- bf_common
- bf_logic
- bf_rasterizer
- bf_oglrasterizer
- bf_expressions
- bf_scenegraph
- kx_network
- bf_kernel
+ ge_logic_ketsji
+ ge_phys_common
+ ge_logic
+ ge_rasterizer
+ ge_oglrasterizer
+ ge_logic_expressions
+ ge_scenegraph
+ ge_logic_network
+ bf_gen_system
bf_python # duplicate for BPY_eval_driver
- bf_ngnetwork
+ ge_logic_ngnetwork
extern_bullet
- bf_loopbacknetwork
+ ge_logic_loopbacknetwork
bf_intern_moto
extern_glew
extern_openjpeg
- bf_videotex
+ ge_videotex
bf_rna
bf_dna
bf_blenfont
Modified: trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt 2010-11-18 10:36:14 UTC (rev 33155)
+++ trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt 2010-11-18 11:42:05 UTC (rev 33156)
@@ -54,4 +54,4 @@
ADD_DEFINITIONS(-DWITH_PYTHON)
ENDIF(WITH_PYTHON)
-BLENDERLIB(bf_blroutines "${SRC}" "${INC}")
+BLENDERLIB(ge_blen_routines "${SRC}" "${INC}")
Modified: trunk/blender/source/gameengine/BlenderRoutines/SConscript
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/SConscript 2010-11-18 10:36:14 UTC (rev 33155)
+++ trunk/blender/source/gameengine/BlenderRoutines/SConscript 2010-11-18 11:42:05 UTC (rev 33156)
@@ -35,4 +35,4 @@
incs += ' ' + env['BF_BULLET_INC']
incs += ' ' + env['BF_OPENGL_INC']
-env.BlenderLib ( 'bf_bloutines', sources, Split(incs), defs, libtype=['core','player'], priority=[300,35] , cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_blen_routines', sources, Split(incs), defs, libtype=['core','player'], priority=[300,35] , cxx_compileflags=env['BGE_CXXFLAGS'])
Modified: trunk/blender/source/gameengine/Converter/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/Converter/CMakeLists.txt 2010-11-18 10:36:14 UTC (rev 33155)
+++ trunk/blender/source/gameengine/Converter/CMakeLists.txt 2010-11-18 11:42:05 UTC (rev 33156)
@@ -92,4 +92,4 @@
ADD_DEFINITIONS(-DUSE_BULLET)
ENDIF(WITH_BULLET)
-BLENDERLIB(bf_converter "${SRC}" "${INC}")
+BLENDERLIB(ge_converter "${SRC}" "${INC}")
Modified: trunk/blender/source/gameengine/Converter/SConscript
===================================================================
--- trunk/blender/source/gameengine/Converter/SConscript 2010-11-18 10:36:14 UTC (rev 33155)
+++ trunk/blender/source/gameengine/Converter/SConscript 2010-11-18 11:42:05 UTC (rev 33156)
@@ -37,4 +37,4 @@
if env['WITH_BF_BULLET']:
defs.append('USE_BULLET')
-env.BlenderLib ( 'bf_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,40], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_converter', sources, Split(incs), defs, libtype=['core','player'], priority=[305,40], cxx_compileflags=env['BGE_CXXFLAGS'])
Modified: trunk/blender/source/gameengine/Expressions/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/Expressions/CMakeLists.txt 2010-11-18 10:36:14 UTC (rev 33155)
+++ trunk/blender/source/gameengine/Expressions/CMakeLists.txt 2010-11-18 11:42:05 UTC (rev 33156)
@@ -61,4 +61,4 @@
ADD_DEFINITIONS(-DWITH_PYTHON)
ENDIF(WITH_PYTHON)
-BLENDERLIB(bf_expressions "${SRC}" "${INC}")
+BLENDERLIB(ge_logic_expressions "${SRC}" "${INC}")
Modified: trunk/blender/source/gameengine/Expressions/SConscript
===================================================================
--- trunk/blender/source/gameengine/Expressions/SConscript 2010-11-18 10:36:14 UTC (rev 33155)
+++ trunk/blender/source/gameengine/Expressions/SConscript 2010-11-18 11:42:05 UTC (rev 33156)
@@ -14,4 +14,4 @@
if env['WITH_BF_CXX_GUARDEDALLOC']:
defs.append('WITH_CXX_GUARDEDALLOC')
-env.BlenderLib ( 'bf_expressions', sources, Split(incs), defs, libtype=['core','player'], priority = [360,80], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_logic_expressions', sources, Split(incs), defs, libtype=['core','player'], priority = [360,80], cxx_compileflags=env['BGE_CXXFLAGS'])
Modified: trunk/blender/source/gameengine/GameLogic/CMakeLists.txt
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list