2.5 / SCons

I did a very drastic cleanup for the different libgroups, there's now only a few left. It compiled with scons/msvc, will be testing in a bit on linux, too.
If you get any problems, please reply to this commit message on the taskforce ML.

8 files changed, 10 insertions, 10 deletions

diff --git a/intern/SoundSystem/SConscript b/intern/SoundSystem/SConscript
index 2be20a24042..256b7904a0f 100644
--- a/intern/SoundSystem/SConscript
+++ b/intern/SoundSystem/SConscript
@@ -17,4 +17,4 @@ else:
 if not env['WITH_BF_SDL']:
 	defs += ' DISABLE_SDL'
 
-env.BlenderLib ('bf_soundsystem', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [25,135] )
+env.BlenderLib ('bf_soundsystem', sources, Split(incs), Split(defs), libtype=['intern','player'], priority = [25,135] )
diff --git a/intern/boolop/SConscript b/intern/boolop/SConscript
index a3f3c0b6433..6a85b2d69be 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=['common','intern'], priority = [5,50] )
+    env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='intern', priority = 5 )
 else:
-    env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='common', priority = 5 )
+    env.BlenderLib ('blender_bop', sources, Split(incs) , [], libtype='intern', priority = 5 )
 
diff --git a/intern/decimation/SConscript b/intern/decimation/SConscript
index 2dd2ac38498..55de37f3c69 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','common','player'], priority = [10, 20, 20] )
+env.BlenderLib ('bf_decimation', sources, Split(incs) , [], libtype=['intern', 'player'], priority = [10, 20] )
diff --git a/intern/elbeem/SConscript b/intern/elbeem/SConscript
index dc8d84ef5a0..92e80c36cea 100644
--- a/intern/elbeem/SConscript
+++ b/intern/elbeem/SConscript
@@ -15,4 +15,4 @@ if env['OURPLATFORM']=='win32-vc':
 incs = env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] 
 incs += ' extern '
 
-env.BlenderLib ('bf_elbeem', sources, Split(incs), Split(defs), libtype='blender', priority=0 )
+env.BlenderLib ('bf_elbeem', sources, Split(incs), Split(defs), libtype='intern', priority=0 )
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript
index ad6b4ff51ba..dc442b3bb54 100644
--- a/intern/ghost/SConscript
+++ b/intern/ghost/SConscript
@@ -29,4 +29,4 @@ else:
 incs = '. ../string ' + env['BF_OPENGL_INC']
 if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross'):
     incs = env['BF_WINTAB_INC'] + ' ' + incs
-env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['core','intern','player'], priority = [40,44,5] ) 
+env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['intern'], priority = [40] ) 
diff --git a/intern/moto/SConscript b/intern/moto/SConscript
index 4152633e393..5af9566c896 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','game','game2','player'], priority = [15, 55, 60, 130] )
+env.BlenderLib ('bf_moto', sources, Split(incs), [], libtype=['intern', 'player'], priority = [15, 130] )
diff --git a/intern/opennl/SConscript b/intern/opennl/SConscript
index e5f5d12c7d7..8cd5f9c1548 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','player'], priority=[1,80,22] )
+    env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['intern','player'], priority=[80,22] )
 else:
-    env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['core','player'], priority=[65,22] )
+    env.BlenderLib ('blender_ONL', sources, Split(incs), [], libtype=['intern','player'], priority=[65,22] )
 
diff --git a/intern/string/SConscript b/intern/string/SConscript
index 292ddf5aa63..8973ac88a66 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=['core', 'common','player'], priority = [50,19,0] )
+env.BlenderLib ('bf_string', sources, Split(incs), [], libtype=['intern'], priority = [50] )