rename libs internal libs for CMake + SCons (used in MSVC project files)

for game engine use "ge_" prefix & make names generally more descriptive.

diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt
index a39235b20ec082430fe7efba5eff8b83936d21bd..0a1d2d3fd749f8eaaaf608e79deec4ed681bbbb0 100644 (file)
--- a/source/blender/imbuf/intern/cineon/CMakeLists.txt
+++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt
@@ -44,4 +44,4 @@ SET(SRC
        logmemfile.c
 )
 
-BLENDERLIB(bf_cineon "${SRC}" "${INC}")
+BLENDERLIB(bf_imbuf_cineon "${SRC}" "${INC}")

diff --git a/source/blender/imbuf/intern/cineon/SConscript b/source/blender/imbuf/intern/cineon/SConscript
index d9c8ab14d35ee014032ed01d1e67f33341114c49..25088c6e34aac5cc24d9e21ed81e23b0e6fdcfed 100644 (file)
--- a/source/blender/imbuf/intern/cineon/SConscript
+++ b/source/blender/imbuf/intern/cineon/SConscript
@@ -14,4 +14,4 @@ incs = ['.',
 
 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])

diff --git a/source/blender/imbuf/intern/dds/CMakeLists.txt b/source/blender/imbuf/intern/dds/CMakeLists.txt
index 78513b35b8749322f7427e86e6d8ca2398ca48d9..5634368383d76bdcdef2fe6d0df878bceb26b408 100644 (file)
--- a/source/blender/imbuf/intern/dds/CMakeLists.txt
+++ b/source/blender/imbuf/intern/dds/CMakeLists.txt
@@ -48,4 +48,4 @@ if(WITH_IMAGE_DDS)
        ADD_DEFINITIONS(-DWITH_DDS)
 ENDIF(WITH_IMAGE_DDS)
 
-BLENDERLIB(bf_dds "${SRC}" "${INC}")                 
+BLENDERLIB(bf_imbuf_dds "${SRC}" "${INC}")                 

diff --git a/source/blender/imbuf/intern/dds/SConscript b/source/blender/imbuf/intern/dds/SConscript
index 59509c88f03f276f7b428173545f4c714a2e02b7..918ae7b530baab3c77ed2a5833f97338ba9155d6 100644 (file)
--- a/source/blender/imbuf/intern/dds/SConscript
+++ b/source/blender/imbuf/intern/dds/SConscript
@@ -16,4 +16,4 @@ incs = ['.',
 
 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])

diff --git a/source/blender/imbuf/intern/openexr/CMakeLists.txt b/source/blender/imbuf/intern/openexr/CMakeLists.txt
index 836958f4b09a54db303b1d5290575ce2c60e25fc..edea033bb3a2d2ace04d6222d89927421c5126d8 100644 (file)
--- a/source/blender/imbuf/intern/openexr/CMakeLists.txt
+++ b/source/blender/imbuf/intern/openexr/CMakeLists.txt
@@ -44,4 +44,4 @@ IF(WITH_IMAGE_OPENEXR)
        ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_IMAGE_OPENEXR)
 
-BLENDERLIB(bf_openexr "${SRC}" "${INC}")                 
+BLENDERLIB(bf_imbuf_openexr "${SRC}" "${INC}")                 

diff --git a/source/blender/imbuf/intern/openexr/SConscript b/source/blender/imbuf/intern/openexr/SConscript
index 47f83868baacf9bb7713627c1abeb9ce6cee907e..082bb82c3220271470e18a6f3f4351eddba378c0 100644 (file)
--- a/source/blender/imbuf/intern/openexr/SConscript
+++ b/source/blender/imbuf/intern/openexr/SConscript
@@ -15,4 +15,4 @@ incs += Split(env['BF_OPENEXR_INC'])
 
 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])

diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index b3c9aede6b5770c9d3932a361128ddc4b1a3364c..ada62851bc534c29ad93684263fbbb670bdb9348 100644 (file)
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -53,7 +53,7 @@ ADD_DEPENDENCIES(blenderplayer makesdna)
 
 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 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 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

diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index e093eb8cb656c4ca988e791f70b4b8cb7a319028..5e33976cb945972ed2404245839f60bfd0ec47c3 100644 (file)
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -524,44 +524,44 @@ ENDIF(WITH_MOD_FLUID)
                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

diff --git a/source/gameengine/BlenderRoutines/CMakeLists.txt b/source/gameengine/BlenderRoutines/CMakeLists.txt
index 1f895ad0abc5c7dc68054493a84d25bf3d939703..63382e1f325351bf552210c00d95a37262c44a7d 100644 (file)
--- a/source/gameengine/BlenderRoutines/CMakeLists.txt
+++ b/source/gameengine/BlenderRoutines/CMakeLists.txt
@@ -54,4 +54,4 @@ IF(WITH_PYTHON)
        ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
-BLENDERLIB(bf_blroutines "${SRC}" "${INC}")
+BLENDERLIB(ge_blen_routines "${SRC}" "${INC}")

diff --git a/source/gameengine/BlenderRoutines/SConscript b/source/gameengine/BlenderRoutines/SConscript
index 91dc26923848b40e9c3267703abfe86e620573dc..ff70ad3bf7bdfd7896ea41b6f2bc89489b0ef408 100644 (file)
--- a/source/gameengine/BlenderRoutines/SConscript
+++ b/source/gameengine/BlenderRoutines/SConscript
@@ -35,4 +35,4 @@ if env['WITH_BF_CXX_GUARDEDALLOC']:
 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'])

diff --git a/source/gameengine/Converter/CMakeLists.txt b/source/gameengine/Converter/CMakeLists.txt
index 9e0b4242f282930d6895d5aa17558ef794e12a9b..4e64bcf8b1120a625a06cea0e6638199a747f748 100644 (file)
--- a/source/gameengine/Converter/CMakeLists.txt
+++ b/source/gameengine/Converter/CMakeLists.txt
@@ -92,4 +92,4 @@ IF(WITH_BULLET)
        ADD_DEFINITIONS(-DUSE_BULLET)
 ENDIF(WITH_BULLET)
 
-BLENDERLIB(bf_converter "${SRC}" "${INC}")
+BLENDERLIB(ge_converter "${SRC}" "${INC}")

diff --git a/source/gameengine/Converter/SConscript b/source/gameengine/Converter/SConscript
index f6cf2331a430b752ccda7b0bb8c851da868e41ad..9d88018d805ac3466377ea4f9ac8b120fc0d295b 100644 (file)
--- a/source/gameengine/Converter/SConscript
+++ b/source/gameengine/Converter/SConscript
@@ -37,4 +37,4 @@ if env['WITH_BF_CXX_GUARDEDALLOC']:
 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'])

diff --git a/source/gameengine/Expressions/CMakeLists.txt b/source/gameengine/Expressions/CMakeLists.txt
index ad446d1085e06f7a4883deb2fd4d44728a5fa9a3..5ab7c6eeae2cc75c11bf2249801b710e41a3ae44 100644 (file)
--- a/source/gameengine/Expressions/CMakeLists.txt
+++ b/source/gameengine/Expressions/CMakeLists.txt
@@ -61,4 +61,4 @@ IF(WITH_PYTHON)
        ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
-BLENDERLIB(bf_expressions "${SRC}" "${INC}")
+BLENDERLIB(ge_logic_expressions "${SRC}" "${INC}")

diff --git a/source/gameengine/Expressions/SConscript b/source/gameengine/Expressions/SConscript
index dea652dabb4ab18a562ace32e26a463e2088afc7..b1e34aa358bb4a7f66677e8910b135604e21deba 100644 (file)
--- a/source/gameengine/Expressions/SConscript
+++ b/source/gameengine/Expressions/SConscript
@@ -14,4 +14,4 @@ if env['WITH_BF_PYTHON']:
 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'])

diff --git a/source/gameengine/GameLogic/CMakeLists.txt b/source/gameengine/GameLogic/CMakeLists.txt
index b346df2b340cca0162182b2dfd2a59037f3658b1..1f0850d6970416c32e58097175490dc17c526132 100644 (file)
--- a/source/gameengine/GameLogic/CMakeLists.txt
+++ b/source/gameengine/GameLogic/CMakeLists.txt
@@ -90,4 +90,4 @@ IF(WITH_PYTHON)
        ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
-BLENDERLIB(bf_logic "${SRC}" "${INC}")
+BLENDERLIB(ge_logic "${SRC}" "${INC}")

diff --git a/source/gameengine/GameLogic/SConscript b/source/gameengine/GameLogic/SConscript
index 04990e10d066f2ec5e07bef73f2f29607de7fda9..a8d3ee65f4c9df409838009240cd0e955dff706d 100644 (file)
--- a/source/gameengine/GameLogic/SConscript
+++ b/source/gameengine/GameLogic/SConscript
@@ -26,4 +26,4 @@ if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')
     incs += ' #/intern/guardedalloc'
 
-env.BlenderLib ( 'bf_logic', sources, Split(incs), defs, libtype=['core','player'], priority=[330,65], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_logic', sources, Split(incs), defs, libtype=['core','player'], priority=[330,65], cxx_compileflags=env['BGE_CXXFLAGS'])

diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt
index 39667a27c7d5b49e679f67326cff6c06a74602a9..3ed2490aadd14f8fe4fae64bc3caaa105da954e6 100644 (file)
--- a/source/gameengine/GamePlayer/common/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/common/CMakeLists.txt
@@ -76,4 +76,4 @@ ENDIF(WITH_PYTHON)
 
 ADD_DEFINITIONS(-DGLEW_STATIC)
 
-BLENDERLIB_NOLIST(gp_common "${SRC}" "${INC}")
+BLENDERLIB_NOLIST(ge_player_common "${SRC}" "${INC}")

diff --git a/source/gameengine/GamePlayer/common/SConscript b/source/gameengine/GamePlayer/common/SConscript
index 60cb437b10fff8eb8f97561f0d395f6e52ee7c11..86fb66974db3649e14b2f11f2105960828598a73 100644 (file)
--- a/source/gameengine/GamePlayer/common/SConscript
+++ b/source/gameengine/GamePlayer/common/SConscript
@@ -67,4 +67,4 @@ if env['WITH_BF_PYTHON']:
 incs += Split(env['BF_PNG_INC'])
 incs += Split(env['BF_ZLIB_INC'])
 
-env.BlenderLib (libname='gp_common', sources=source_files, includes=incs, defines = defs, libtype=['player'], priority=[5], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib (libname='ge_player_common', sources=source_files, includes=incs, defines = defs, libtype=['player'], priority=[5], cxx_compileflags=env['BGE_CXXFLAGS'])

diff --git a/source/gameengine/GamePlayer/ghost/CMakeLists.txt b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
index 824b11d77f87ffc01480c376cc6cce0caf07f01d..8810e8758105cbef3cbbeaa7d0816344dff9820c 100644 (file)
--- a/source/gameengine/GamePlayer/ghost/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/ghost/CMakeLists.txt
@@ -76,4 +76,4 @@ IF(WITH_PYTHON)
        ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
-BLENDERLIB_NOLIST(gp_ghost "${SRC}" "${INC}")
+BLENDERLIB_NOLIST(ge_player_ghost "${SRC}" "${INC}")

diff --git a/source/gameengine/GamePlayer/ghost/SConscript b/source/gameengine/GamePlayer/ghost/SConscript
index eb3d50a49bd846927accddaa0a26bdd65719f424..7c8f1c6f4f0763be6010facd02d63fb383c002be 100644 (file)
--- a/source/gameengine/GamePlayer/ghost/SConscript
+++ b/source/gameengine/GamePlayer/ghost/SConscript
@@ -50,4 +50,4 @@ if env['WITH_BF_PYTHON']:
 if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
 
-env.BlenderLib (libname='gp_ghost', sources=source_files, includes = incs, defines = defs, libtype=['player'],priority=[0], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib (libname='ge_player_ghost', sources=source_files, includes = incs, defines = defs, libtype=['player'],priority=[0], cxx_compileflags=env['BGE_CXXFLAGS'])

diff --git a/source/gameengine/Ketsji/CMakeLists.txt b/source/gameengine/Ketsji/CMakeLists.txt
index 1ca71e678e835da48595b4a75acfe09b00bcf059..7b5a70f0676daa1fe09109a4595cd8d0c71d9563 100644 (file)
--- a/source/gameengine/Ketsji/CMakeLists.txt
+++ b/source/gameengine/Ketsji/CMakeLists.txt
@@ -147,4 +147,4 @@ IF(WITH_BULLET)
        LIST(APPEND INC ../../../source/gameengine/Physics/Bullet )
 ENDIF(WITH_BULLET)
 
-BLENDERLIB(bf_ketsji "${SRC}" "${INC}")
+BLENDERLIB(ge_logic_ketsji "${SRC}" "${INC}")

diff --git a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
index 5099534c0ad3251c047430c6ff33eecdcb4ad4bc..ce9a7492ba1e7362a6b314794c551538adc160cc 100644 (file)
--- a/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
+++ b/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
@@ -49,4 +49,4 @@ IF(WITH_PYTHON)
        ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
-BLENDERLIB(kx_network "${SRC}" "${INC}")
+BLENDERLIB(ge_logic_network "${SRC}" "${INC}")

diff --git a/source/gameengine/Ketsji/SConscript b/source/gameengine/Ketsji/SConscript
index 5f7cf9edcd8b793b3dd25fd44581fb0c048cf4b4..3e86080a2f8a3d346d41fac807fb0db2b42f1ca4 100644 (file)
--- a/source/gameengine/Ketsji/SConscript
+++ b/source/gameengine/Ketsji/SConscript
@@ -46,4 +46,4 @@ if env['WITH_BF_BULLET']:
     defs.append('USE_BULLET')
     incs += ' #source/gameengine/Physics/Bullet'
 
-env.BlenderLib ( 'bf_ketsji', sources, Split(incs), defs, libtype=['core','player'], priority=[320,45], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_logic_ketsji', sources, Split(incs), defs, libtype=['core','player'], priority=[320,45], cxx_compileflags=env['BGE_CXXFLAGS'])

diff --git a/source/gameengine/Network/CMakeLists.txt b/source/gameengine/Network/CMakeLists.txt
index 3dde84d29c1c412480db238a6fa4cca58dcd9d87..b46f6696efd80b3d0be63929c98b1e6ef26e4dca 100644 (file)
--- a/source/gameengine/Network/CMakeLists.txt
+++ b/source/gameengine/Network/CMakeLists.txt
@@ -37,4 +37,4 @@ SET(SRC
        NG_NetworkScene.cpp
 )
 
-BLENDERLIB(bf_ngnetwork "${SRC}" "${INC}")
+BLENDERLIB(ge_logic_ngnetwork "${SRC}" "${INC}")

diff --git a/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt b/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
index eae2971ce6ab0ed412aeb86eb5ad143f575ea15d..9467b59310f42f51a45a4398687790988383f072 100644 (file)
--- a/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
+++ b/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
@@ -35,4 +35,4 @@ SET(SRC
        NG_LoopBackNetworkDeviceInterface.cpp
 )
 
-BLENDERLIB(bf_loopbacknetwork "${SRC}" "${INC}")
+BLENDERLIB(ge_logic_loopbacknetwork "${SRC}" "${INC}")

diff --git a/source/gameengine/Network/LoopBackNetwork/SConscript b/source/gameengine/Network/LoopBackNetwork/SConscript
index dd23e1327ebcac55051c62b3d955e2f3b87672dc..af76065cc945c0c3d348c40386ef1a7d0c13fa23 100644 (file)
--- a/source/gameengine/Network/LoopBackNetwork/SConscript
+++ b/source/gameengine/Network/LoopBackNetwork/SConscript
@@ -5,4 +5,4 @@ sources = 'NG_LoopBackNetworkDeviceInterface.cpp'
 
 incs = '. #source/kernel/gen_system #intern/string #source/gameengine/Network'
 
-env.BlenderLib ( 'bf_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype=['core','player'], priority=[400,135] )
+env.BlenderLib ( 'ge_logic_loopbacknetwork', Split(sources), Split(incs), defines=[],libtype=['core','player'], priority=[400,135] )

diff --git a/source/gameengine/Network/SConscript b/source/gameengine/Network/SConscript
index 3cf1747d013b9ee2215a6115c73bbd024163cf66..1b63592d0a43bd5553a77f71c76ccd92d7e9aabf 100644 (file)
--- a/source/gameengine/Network/SConscript
+++ b/source/gameengine/Network/SConscript
@@ -11,4 +11,4 @@ if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')
     incs += ' #intern/guardedalloc'
 
-env.BlenderLib ( 'bf_ngnetwork', sources, Split(incs), defs, libtype=['core','player'], priority=[400,130] )
+env.BlenderLib ( 'ge_logic_ngnetwork', sources, Split(incs), defs, libtype=['core','player'], priority=[400,130] )

diff --git a/source/gameengine/Physics/Bullet/CMakeLists.txt b/source/gameengine/Physics/Bullet/CMakeLists.txt
index 1954d58df3ee6f8c8802bb3610cb7db6491d50d6..89f2649cfc1982d6cad303fbf96a4f55ccd6ba4f 100644 (file)
--- a/source/gameengine/Physics/Bullet/CMakeLists.txt
+++ b/source/gameengine/Physics/Bullet/CMakeLists.txt
@@ -57,4 +57,4 @@ IF(WITH_BULLET)
        ADD_DEFINITIONS(-DUSE_BULLET)
 ENDIF(WITH_BULLET)
 
-BLENDERLIB(bf_bullet "${SRC}" "${INC}")
+BLENDERLIB(ge_phys_bullet "${SRC}" "${INC}")

diff --git a/source/gameengine/Physics/Bullet/SConscript b/source/gameengine/Physics/Bullet/SConscript
index 272d0003c1a0e235630f621b498d33258743e97e..f8f0f8afaea9fef8adb80879034af7e2f4e4dfb8 100644 (file)
--- a/source/gameengine/Physics/Bullet/SConscript
+++ b/source/gameengine/Physics/Bullet/SConscript
@@ -32,4 +32,4 @@ if env['WITH_BF_CXX_GUARDEDALLOC']:
 if env['WITH_BF_BULLET']:
     defs.append('USE_BULLET')
 
-env.BlenderLib ( 'bf_bullet', Split(sources), Split(incs), defs, libtype=['core','player'], priority=[350,50], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_phys_bullet', Split(sources), Split(incs), defs, libtype=['core','player'], priority=[350,50], cxx_compileflags=env['BGE_CXXFLAGS'])

diff --git a/source/gameengine/Physics/Dummy/CMakeLists.txt b/source/gameengine/Physics/Dummy/CMakeLists.txt
index 501fbcd94de92f08b8c2dab832dbcb6dcd145786..387fa9e7f8d3a050434389cb414d52c254596df7 100644 (file)
--- a/source/gameengine/Physics/Dummy/CMakeLists.txt
+++ b/source/gameengine/Physics/Dummy/CMakeLists.txt
@@ -33,4 +33,4 @@ SET(SRC
        DummyPhysicsEnvironment.cpp
 )
 
-BLENDERLIB(bf_dummy "${SRC}" "${INC}")
+BLENDERLIB(ge_phys_dummy "${SRC}" "${INC}")

diff --git a/source/gameengine/Physics/Dummy/SConscript b/source/gameengine/Physics/Dummy/SConscript
index 496092133c3056acc452f04345e8817df04af478..13d1a893823cb5079543089607110fa66e86ee25 100644 (file)
--- a/source/gameengine/Physics/Dummy/SConscript
+++ b/source/gameengine/Physics/Dummy/SConscript
@@ -11,4 +11,4 @@ if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')
     incs += ' #intern/guardedalloc'
 
-env.BlenderLib ( 'bf_dummy', Split(sources), Split(incs), defs, libtype=['core','player'], priority=[350,60] )
+env.BlenderLib ( 'ge_phys_dummy', Split(sources), Split(incs), defs, libtype=['core','player'], priority=[350,60] )

diff --git a/source/gameengine/Physics/common/CMakeLists.txt b/source/gameengine/Physics/common/CMakeLists.txt
index f67de0f77d02d67ba9f805430d7695883995a7ae..0710ba3e2c6e7f6c72f2c96ee2441a29ade19ae2 100644 (file)
--- a/source/gameengine/Physics/common/CMakeLists.txt
+++ b/source/gameengine/Physics/common/CMakeLists.txt
@@ -38,4 +38,4 @@ SET(SRC
        PHY_IVehicle.cpp
 )
 
-BLENDERLIB(bf_common "${SRC}" "${INC}")
+BLENDERLIB(ge_phys_common "${SRC}" "${INC}")

diff --git a/source/gameengine/Physics/common/SConscript b/source/gameengine/Physics/common/SConscript
index 38bb7a1130925f2adac12cb3032681d740749fbe..abff3e33121efaba4531208f74bed53838969f55 100644 (file)
--- a/source/gameengine/Physics/common/SConscript
+++ b/source/gameengine/Physics/common/SConscript
@@ -11,4 +11,4 @@ if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')
     incs += ' #intern/guardedalloc'
 
-env.BlenderLib ( 'bf_physics_common', Split(sources), Split(incs), defs, libtype=['core','player'], priority=[360,55], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_phys_common', Split(sources), Split(incs), defs, libtype=['core','player'], priority=[360,55], cxx_compileflags=env['BGE_CXXFLAGS'])

diff --git a/source/gameengine/Rasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/CMakeLists.txt
index 9bbf7e144d5e9c3287e68f57aa4d8f2b27dcba97..88399f9ca9df1136be16ea80dc330a2dd18aae20 100644 (file)
--- a/source/gameengine/Rasterizer/CMakeLists.txt
+++ b/source/gameengine/Rasterizer/CMakeLists.txt
@@ -53,4 +53,4 @@ SET(SRC
 
 ADD_DEFINITIONS(-DGLEW_STATIC)
 
-BLENDERLIB(bf_rasterizer "${SRC}" "${INC}")
+BLENDERLIB(ge_rasterizer "${SRC}" "${INC}")

diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
index a89faae3c73c70336e522b9000194cbf595cb1bb..36ccd79527b2e1be79d26e49a1212ee4b71172b6 100644 (file)
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
@@ -48,4 +48,4 @@ SET(SRC
 
 ADD_DEFINITIONS(-DGLEW_STATIC)
 
-BLENDERLIB(bf_oglrasterizer "${SRC}" "${INC}")
+BLENDERLIB(ge_oglrasterizer "${SRC}" "${INC}")

diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
index 8ad6a8b28a2044bafc3e7dc3d27d80fda64ec985..791478cae38dfdcf6111b2aa4faca52c83d7aa65 100644 (file)
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
@@ -13,4 +13,4 @@ incs += ' #intern/guardedalloc #source/blender/blenlib'
 if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')
 
-env.BlenderLib ( 'bf_oglrasterizer', Split(sources), Split(incs), defines = defs, libtype=['core','player'], priority=[350,75], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_oglrasterizer', Split(sources), Split(incs), defines = defs, libtype=['core','player'], priority=[350,75], cxx_compileflags=env['BGE_CXXFLAGS'])

diff --git a/source/gameengine/Rasterizer/SConscript b/source/gameengine/Rasterizer/SConscript
index 045714e80ac261243806c6786b7cdb52bc92b0bc..bff2a7e2084fe95296d319be3551418801b75865 100644 (file)
--- a/source/gameengine/Rasterizer/SConscript
+++ b/source/gameengine/Rasterizer/SConscript
@@ -15,4 +15,4 @@ if env['WITH_BF_PYTHON']:
 if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')
 
-env.BlenderLib ( 'bf_rasterizer', sources, Split(incs), defs, libtype=['core','player'], priority=[350,70], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_rasterizer', sources, Split(incs), defs, libtype=['core','player'], priority=[350,70], cxx_compileflags=env['BGE_CXXFLAGS'])

diff --git a/source/gameengine/SceneGraph/CMakeLists.txt b/source/gameengine/SceneGraph/CMakeLists.txt
index d1b207b6efa7bf5f18f2f5c6762126c0c7cf7e38..1ba1f8175cda7bce84306331020aef80c4f01c3a 100644 (file)
--- a/source/gameengine/SceneGraph/CMakeLists.txt
+++ b/source/gameengine/SceneGraph/CMakeLists.txt
@@ -38,4 +38,4 @@ SET(SRC
        SG_Tree.cpp
 )
 
-BLENDERLIB(bf_scenegraph "${SRC}" "${INC}")
+BLENDERLIB(ge_scenegraph "${SRC}" "${INC}")

diff --git a/source/gameengine/SceneGraph/SConscript b/source/gameengine/SceneGraph/SConscript
index 992a10befa2958600c48d9c70c5378cde5891a0b..b4738bd20b46a20b5a952430ad1f9a3e0a3ce768 100644 (file)
--- a/source/gameengine/SceneGraph/SConscript
+++ b/source/gameengine/SceneGraph/SConscript
@@ -12,4 +12,4 @@ if env['WITH_BF_CXX_GUARDEDALLOC']:
     defs.append('WITH_CXX_GUARDEDALLOC')
     incs += ' #intern/guardedalloc'
 
-env.BlenderLib ( 'bf_scenegraph', sources, Split(incs), defs, libtype=['core','player'], priority=[325,85], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_scenegraph', sources, Split(incs), defs, libtype=['core','player'], priority=[325,85], cxx_compileflags=env['BGE_CXXFLAGS'])

diff --git a/source/gameengine/VideoTexture/CMakeLists.txt b/source/gameengine/VideoTexture/CMakeLists.txt
index 1bde0bc8a403896bb26f35c87e210ffa62c07e7b..3ad74ef7860be2708ed7e6dba0380c3be5ac5fe6 100644 (file)
--- a/source/gameengine/VideoTexture/CMakeLists.txt
+++ b/source/gameengine/VideoTexture/CMakeLists.txt
@@ -78,4 +78,4 @@ IF(WITH_PYTHON)
        ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
-BLENDERLIB(bf_videotex "${SRC}" "${INC}")
+BLENDERLIB(ge_videotex "${SRC}" "${INC}")

diff --git a/source/gameengine/VideoTexture/SConscript b/source/gameengine/VideoTexture/SConscript
index 8a5e3726aa7db5a99bcb77b90f1c9aa0dbfde5fb..2cd143d2deb1630cbbf61cddcd68393573db543b 100644 (file)
--- a/source/gameengine/VideoTexture/SConscript
+++ b/source/gameengine/VideoTexture/SConscript
@@ -27,4 +27,4 @@ if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
     incs += ' ' + env['BF_FFMPEG_INC'] + ' ' + env['BF_PTHREADS_INC']
 
-env.BlenderLib ( 'bf_videotex', sources, Split(incs), defs, libtype=['core','player'], priority=[340,205], cxx_compileflags=env['BGE_CXXFLAGS'])
+env.BlenderLib ( 'ge_videotex', sources, Split(incs), defs, libtype=['core','player'], priority=[340,205], cxx_compileflags=env['BGE_CXXFLAGS'])

diff --git a/source/kernel/CMakeLists.txt b/source/kernel/CMakeLists.txt
index 1665a3c1525af5791a8e049c7b0c1682b41e846d..41e725906c852fdbece74df9261524ef0c9a5523 100644 (file)
--- a/source/kernel/CMakeLists.txt
+++ b/source/kernel/CMakeLists.txt
@@ -40,4 +40,4 @@ SET(SRC
        gen_system/SYS_System.cpp
 )
 
-BLENDERLIB(bf_kernel "${SRC}" "${INC}")
+BLENDERLIB(bf_gen_system "${SRC}" "${INC}")

diff --git a/source/kernel/SConscript b/source/kernel/SConscript
index 3110f46cfadf363881ae340d764037ddb5501f9c..385a3064c76e8f02c145aff657f782a03cc2d9ab 100644 (file)
--- a/source/kernel/SConscript
+++ b/source/kernel/SConscript
@@ -7,4 +7,4 @@ sources += ' gen_system/SYS_System.cpp'
 
 incs = 'gen_messaging gen_system #/intern/string #/intern/moto/include #/source/blender/blenloader '
 
-env.BlenderLib ( 'bf_kernel', Split(sources), Split(incs), [], libtype = ['core','player'], priority = [400,100] )
+env.BlenderLib ( 'bf_gen_system', Split(sources), Split(incs), [], libtype = ['core','player'], priority = [400,100] )