[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31567] trunk/blender: rename most scons build targets to match cmake

Campbell Barton ideasman42 at gmail.com
Wed Aug 25 06:30:49 CEST 2010


Revision: 31567
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31567
Author:   campbellbarton
Date:     2010-08-25 06:30:47 +0200 (Wed, 25 Aug 2010)

Log Message:
-----------
rename most scons build targets to match cmake

Modified Paths:
--------------
    trunk/blender/extern/lzma/SConscript
    trunk/blender/extern/lzo/SConscript
    trunk/blender/intern/audaspace/SConscript
    trunk/blender/intern/boolop/SConscript
    trunk/blender/intern/bsp/SConscript
    trunk/blender/intern/container/SConscript
    trunk/blender/intern/decimation/SConscript
    trunk/blender/intern/elbeem/SConscript
    trunk/blender/intern/ghost/SConscript
    trunk/blender/intern/guardedalloc/SConscript
    trunk/blender/intern/iksolver/SConscript
    trunk/blender/intern/itasc/SConscript
    trunk/blender/intern/memutil/SConscript
    trunk/blender/intern/moto/SConscript
    trunk/blender/intern/opennl/SConscript
    trunk/blender/intern/smoke/SConscript
    trunk/blender/intern/string/SConscript
    trunk/blender/source/blender/makesdna/intern/SConscript
    trunk/blender/source/blender/makesrna/intern/SConscript
    trunk/blender/source/blender/modifiers/SConscript
    trunk/blender/source/blender/python/SConscript

Modified: trunk/blender/extern/lzma/SConscript
===================================================================
--- trunk/blender/extern/lzma/SConscript	2010-08-25 04:03:38 UTC (rev 31566)
+++ trunk/blender/extern/lzma/SConscript	2010-08-25 04:30:47 UTC (rev 31567)
@@ -6,4 +6,4 @@
 defs = ''
 incs = ' . ' 
 
-env.BlenderLib ('bf_lzma', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )
+env.BlenderLib ('extern_lzma', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )

Modified: trunk/blender/extern/lzo/SConscript
===================================================================
--- trunk/blender/extern/lzo/SConscript	2010-08-25 04:03:38 UTC (rev 31566)
+++ trunk/blender/extern/lzo/SConscript	2010-08-25 04:30:47 UTC (rev 31567)
@@ -6,4 +6,4 @@
 defs = ''
 incs = ' include ' 
 
-env.BlenderLib ('bf_minilzo', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )
+env.BlenderLib ('extern_minilzo', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )

Modified: trunk/blender/intern/audaspace/SConscript
===================================================================
--- trunk/blender/intern/audaspace/SConscript	2010-08-25 04:03:38 UTC (rev 31566)
+++ trunk/blender/intern/audaspace/SConscript	2010-08-25 04:30:47 UTC (rev 31567)
@@ -45,4 +45,4 @@
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
     incs += ' ' + env['BF_PTHREADS_INC']
 
-env.BlenderLib ('bf_audaspace', sources, Split(incs), defs, libtype=['intern','player'], priority = [25,215] )
+env.BlenderLib ('bf_intern_audaspace', sources, Split(incs), defs, libtype=['intern','player'], priority = [25,215] )

Modified: trunk/blender/intern/boolop/SConscript
===================================================================
--- trunk/blender/intern/boolop/SConscript	2010-08-25 04:03:38 UTC (rev 31566)
+++ trunk/blender/intern/boolop/SConscript	2010-08-25 04:30:47 UTC (rev 31567)
@@ -8,7 +8,7 @@
 incs += ' ../../source/blender/blenlib'
 
 if (env['OURPLATFORM'] == 'win32-mingw'):
-    env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='intern', priority = 5 )
+    env.BlenderLib ('bf_intern_bop', sources, Split(incs) , [], libtype='intern', priority = 5 )
 else:
-    env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='intern', priority = 5 )
+    env.BlenderLib ('bf_intern_bop', sources, Split(incs) , [], libtype='intern', priority = 5 )
 

Modified: trunk/blender/intern/bsp/SConscript
===================================================================
--- trunk/blender/intern/bsp/SConscript	2010-08-25 04:03:38 UTC (rev 31566)
+++ trunk/blender/intern/bsp/SConscript	2010-08-25 04:30:47 UTC (rev 31567)
@@ -5,5 +5,5 @@
 
 incs = 'intern ../container ../moto/include ../memutil'
 
-env.BlenderLib ('blender_BSP', sources, Split(incs), [], libtype='core', priority=200 )
+env.BlenderLib ('bf_intern_bsp', sources, Split(incs), [], libtype='core', priority=200 )
 

Modified: trunk/blender/intern/container/SConscript
===================================================================
--- trunk/blender/intern/container/SConscript	2010-08-25 04:03:38 UTC (rev 31566)
+++ trunk/blender/intern/container/SConscript	2010-08-25 04:30:47 UTC (rev 31567)
@@ -4,4 +4,4 @@
 sources = env.Glob('intern/*.cpp')
 incs = '.'
 
-env.BlenderLib ('blender_CTR', sources, Split(incs) , [], libtype='intern', priority = 10 )
+env.BlenderLib ('bf_intern_ctr', sources, Split(incs) , [], libtype='intern', priority = 10 )

Modified: trunk/blender/intern/decimation/SConscript
===================================================================
--- trunk/blender/intern/decimation/SConscript	2010-08-25 04:03:38 UTC (rev 31566)
+++ trunk/blender/intern/decimation/SConscript	2010-08-25 04:30:47 UTC (rev 31567)
@@ -5,4 +5,4 @@
 
 incs = '. ../moto/include ../container ../memutil'
 
-env.BlenderLib ('bf_decimation', sources, Split(incs) , [], libtype=['core'], priority = [200] )
+env.BlenderLib ('bf_intern_decimate', sources, Split(incs) , [], libtype=['core'], priority = [200] )

Modified: trunk/blender/intern/elbeem/SConscript
===================================================================
--- trunk/blender/intern/elbeem/SConscript	2010-08-25 04:03:38 UTC (rev 31566)
+++ trunk/blender/intern/elbeem/SConscript	2010-08-25 04:30:47 UTC (rev 31567)
@@ -19,4 +19,4 @@
 incs += ' ' + env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] 
 incs += ' extern '
 
-env.BlenderLib ('bf_elbeem', sources, Split(incs), Split(defs), libtype='intern', priority=0 )
+env.BlenderLib ('bf_intern_elbeem', sources, Split(incs), Split(defs), libtype='intern', priority=0 )

Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript	2010-08-25 04:03:38 UTC (rev 31566)
+++ trunk/blender/intern/ghost/SConscript	2010-08-25 04:30:47 UTC (rev 31567)
@@ -60,4 +60,4 @@
 incs = '. ../string #extern/glew/include #source/blender/imbuf #source/blender/makesdna ' + env['BF_OPENGL_INC']
 if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'):
 	incs = env['BF_WINTAB_INC'] + ' ' + incs
-env.BlenderLib ('bf_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15] ) 
\ No newline at end of file
+env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15] ) 
\ No newline at end of file

Modified: trunk/blender/intern/guardedalloc/SConscript
===================================================================
--- trunk/blender/intern/guardedalloc/SConscript	2010-08-25 04:03:38 UTC (rev 31566)
+++ trunk/blender/intern/guardedalloc/SConscript	2010-08-25 04:30:47 UTC (rev 31567)
@@ -5,4 +5,4 @@
 sources = env.Glob('intern/*.c')
 incs = '.'
 
-env.BlenderLib ('bf_guardedalloc', sources, Split(incs), defines=[], libtype=['intern','player'], priority = [5,150] )
+env.BlenderLib ('bf_intern_guardedalloc', sources, Split(incs), defines=[], libtype=['intern','player'], priority = [5,150] )

Modified: trunk/blender/intern/iksolver/SConscript
===================================================================
--- trunk/blender/intern/iksolver/SConscript	2010-08-25 04:03:38 UTC (rev 31566)
+++ trunk/blender/intern/iksolver/SConscript	2010-08-25 04:30:47 UTC (rev 31567)
@@ -5,5 +5,5 @@
 
 incs = 'intern ../moto/include ../memutil'
 
-env.BlenderLib ('bf_IK', sources, Split(incs), [], libtype=['intern','player'], priority=[100,90] )
+env.BlenderLib ('bf_intern_ik', sources, Split(incs), [], libtype=['intern','player'], priority=[100,90] )
 

Modified: trunk/blender/intern/itasc/SConscript
===================================================================
--- trunk/blender/intern/itasc/SConscript	2010-08-25 04:03:38 UTC (rev 31566)
+++ trunk/blender/intern/itasc/SConscript	2010-08-25 04:30:47 UTC (rev 31567)
@@ -7,5 +7,5 @@
 
 incs = '. ../../extern/Eigen2'
 
-env.BlenderLib ('bf_ITASC', sources, Split(incs), [], libtype=['intern','player'], priority=[20,100] )
+env.BlenderLib ('bf_intern_itasc', sources, Split(incs), [], libtype=['intern','player'], priority=[20,100] )
 

Modified: trunk/blender/intern/memutil/SConscript
===================================================================
--- trunk/blender/intern/memutil/SConscript	2010-08-25 04:03:38 UTC (rev 31566)
+++ trunk/blender/intern/memutil/SConscript	2010-08-25 04:30:47 UTC (rev 31567)
@@ -5,4 +5,4 @@
 
 incs = '. ..'
 
-env.BlenderLib ('bf_memutil', sources, Split(incs), [], libtype=['intern','player'], priority = [0,155] )
+env.BlenderLib ('bf_intern_memutil', sources, Split(incs), [], libtype=['intern','player'], priority = [0,155] )

Modified: trunk/blender/intern/moto/SConscript
===================================================================
--- trunk/blender/intern/moto/SConscript	2010-08-25 04:03:38 UTC (rev 31566)
+++ trunk/blender/intern/moto/SConscript	2010-08-25 04:30:47 UTC (rev 31567)
@@ -5,4 +5,4 @@
 
 incs = 'include'
 
-env.BlenderLib ('bf_moto', sources, Split(incs), [], libtype=['intern','player'], priority = [130,95] )
+env.BlenderLib ('bf_intern_moto', sources, Split(incs), [], libtype=['intern','player'], priority = [130,95] )

Modified: trunk/blender/intern/opennl/SConscript
===================================================================
--- trunk/blender/intern/opennl/SConscript	2010-08-25 04:03:38 UTC (rev 31566)
+++ trunk/blender/intern/opennl/SConscript	2010-08-25 04:30:47 UTC (rev 31567)
@@ -6,7 +6,7 @@
 incs = 'extern superlu'
 
 if (env['OURPLATFORM'] == 'win32-mingw'):
-    env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['core','intern'], priority=[1,80] )
+    env.BlenderLib ('bf_intern_opennl', sources, Split(incs), [], libtype=['core','intern'], priority=[1,80] )
 else:
-    env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['core'], priority=[55] )
+    env.BlenderLib ('bf_intern_opennl', sources, Split(incs), [], libtype=['core'], priority=[55] )
 

Modified: trunk/blender/intern/smoke/SConscript
===================================================================
--- trunk/blender/intern/smoke/SConscript	2010-08-25 04:03:38 UTC (rev 31566)
+++ trunk/blender/intern/smoke/SConscript	2010-08-25 04:30:47 UTC (rev 31567)
@@ -19,4 +19,4 @@
     defs += ' FFTW3=1'
     incs += env['BF_FFTW3_INC'] 
 
-env.BlenderLib ('bf_smoke', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )
+env.BlenderLib ('bf_intern_smoke', sources, Split(incs), Split(defs), libtype=['intern'], priority=[40] )

Modified: trunk/blender/intern/string/SConscript
===================================================================
--- trunk/blender/intern/string/SConscript	2010-08-25 04:03:38 UTC (rev 31566)
+++ trunk/blender/intern/string/SConscript	2010-08-25 04:30:47 UTC (rev 31567)
@@ -4,4 +4,4 @@
 sources = env.Glob('intern/*.cpp')
 incs = '.'
 
-env.BlenderLib ('bf_string', sources, Split(incs), [], libtype=['intern','player'], priority = [50,10] )
+env.BlenderLib ('bf_intern_string', sources, Split(incs), [], libtype=['intern','player'], priority = [50,10] )

Modified: trunk/blender/source/blender/makesdna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesdna/intern/SConscript	2010-08-25 04:03:38 UTC (rev 31566)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list