diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-08-25 08:30:47 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-08-25 08:30:47 +0400 |
commit | 4b40d73bfbd5ff67db727746b992a66c910a9cac (patch) | |
tree | d0b34dbad815103c815b041d4dc9051e0e7a4800 /intern | |
parent | b54d16858f54452361921629a150b5115235c5fa (diff) |
rename most scons build targets to match cmake
Diffstat (limited to 'intern')
-rw-r--r-- | intern/audaspace/SConscript | 2 | ||||
-rw-r--r-- | intern/boolop/SConscript | 4 | ||||
-rw-r--r-- | intern/bsp/SConscript | 2 | ||||
-rw-r--r-- | intern/container/SConscript | 2 | ||||
-rw-r--r-- | intern/decimation/SConscript | 2 | ||||
-rw-r--r-- | intern/elbeem/SConscript | 2 | ||||
-rw-r--r-- | intern/ghost/SConscript | 2 | ||||
-rw-r--r-- | intern/guardedalloc/SConscript | 2 | ||||
-rw-r--r-- | intern/iksolver/SConscript | 2 | ||||
-rw-r--r-- | intern/itasc/SConscript | 2 | ||||
-rw-r--r-- | intern/memutil/SConscript | 2 | ||||
-rw-r--r-- | intern/moto/SConscript | 2 | ||||
-rw-r--r-- | intern/opennl/SConscript | 4 | ||||
-rw-r--r-- | intern/smoke/SConscript | 2 | ||||
-rw-r--r-- | intern/string/SConscript | 2 |
15 files changed, 17 insertions, 17 deletions
diff --git a/intern/audaspace/SConscript b/intern/audaspace/SConscript index 9b9862d15a2..045ae5dc83b 100644 --- a/intern/audaspace/SConscript +++ b/intern/audaspace/SConscript @@ -45,4 +45,4 @@ else: 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] ) diff --git a/intern/boolop/SConscript b/intern/boolop/SConscript index 6a85b2d69be..5cf32862f96 100644 --- a/intern/boolop/SConscript +++ b/intern/boolop/SConscript @@ -8,7 +8,7 @@ incs += ' ../../source/blender/makesdna ../../intern/guardedalloc' 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 ) diff --git a/intern/bsp/SConscript b/intern/bsp/SConscript index ff5a213d7b8..705c31193f3 100644 --- a/intern/bsp/SConscript +++ b/intern/bsp/SConscript @@ -5,5 +5,5 @@ sources = env.Glob('intern/*.cpp') 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 ) diff --git a/intern/container/SConscript b/intern/container/SConscript index d05104da562..2d93e90b555 100644 --- a/intern/container/SConscript +++ b/intern/container/SConscript @@ -4,4 +4,4 @@ Import ('env') 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 ) diff --git a/intern/decimation/SConscript b/intern/decimation/SConscript index 2dd86c44cf1..2fc7781bd59 100644 --- a/intern/decimation/SConscript +++ b/intern/decimation/SConscript @@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp') 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] ) diff --git a/intern/elbeem/SConscript b/intern/elbeem/SConscript index f0417f74001..9c035c0c285 100644 --- a/intern/elbeem/SConscript +++ b/intern/elbeem/SConscript @@ -19,4 +19,4 @@ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): 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 ) diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 9ecd61857ce..2e2e19bf01f 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -60,4 +60,4 @@ if env['BF_GHOST_DEBUG']: 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 diff --git a/intern/guardedalloc/SConscript b/intern/guardedalloc/SConscript index 2ee0f84b464..0c9c7d13608 100644 --- a/intern/guardedalloc/SConscript +++ b/intern/guardedalloc/SConscript @@ -5,4 +5,4 @@ Import('env') 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] ) diff --git a/intern/iksolver/SConscript b/intern/iksolver/SConscript index 7adb2d50893..bdf7cd350ff 100644 --- a/intern/iksolver/SConscript +++ b/intern/iksolver/SConscript @@ -5,5 +5,5 @@ sources = env.Glob('intern/*.cpp') 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] ) diff --git a/intern/itasc/SConscript b/intern/itasc/SConscript index 9e11b6c7119..5fa4246d711 100644 --- a/intern/itasc/SConscript +++ b/intern/itasc/SConscript @@ -7,5 +7,5 @@ sources += env.Glob('kdl/utilities/*.cpp') 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] ) diff --git a/intern/memutil/SConscript b/intern/memutil/SConscript index 318d4a3997e..c9a03982615 100644 --- a/intern/memutil/SConscript +++ b/intern/memutil/SConscript @@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp') 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] ) diff --git a/intern/moto/SConscript b/intern/moto/SConscript index d9bbafe4623..ba257a33b14 100644 --- a/intern/moto/SConscript +++ b/intern/moto/SConscript @@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp') 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] ) diff --git a/intern/opennl/SConscript b/intern/opennl/SConscript index f68810d2f16..ff66b4ad6e1 100644 --- a/intern/opennl/SConscript +++ b/intern/opennl/SConscript @@ -6,7 +6,7 @@ sources = env.Glob('intern/*.c') + env.Glob('superlu/*.c') 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] ) diff --git a/intern/smoke/SConscript b/intern/smoke/SConscript index 2fc8798fc78..fa32c5f36c3 100644 --- a/intern/smoke/SConscript +++ b/intern/smoke/SConscript @@ -19,4 +19,4 @@ if env['WITH_BF_FFTW3']: 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] ) diff --git a/intern/string/SConscript b/intern/string/SConscript index 4aca220183c..f8342bf12c2 100644 --- a/intern/string/SConscript +++ b/intern/string/SConscript @@ -4,4 +4,4 @@ Import ('env') 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] ) |