From ef1b7a5735fea454f88f9d18cf9034279f8fb0b6 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Tue, 7 Feb 2006 21:24:36 +0000 Subject: ==SCons== + 'scons blenderplayer' builds blender AND blenderplayer now (tested on Linux only, but was only linking issue, so should work on other platforms too). NOTE: I noticed some compileflags for GE specific libs that were left out - I re-enabled them in the SConscripts, but I'm going to do a test build my- self now, so if there are problems with them on win32, I probably already know about them :) --- intern/SoundSystem/SConscript | 2 +- intern/bmfont/SConscript | 2 +- intern/decimation/SConscript | 2 +- intern/ghost/SConscript | 2 +- intern/guardedalloc/SConscript | 2 +- intern/memutil/SConscript | 2 +- intern/moto/SConscript | 2 +- intern/string/SConscript | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) (limited to 'intern') diff --git a/intern/SoundSystem/SConscript b/intern/SoundSystem/SConscript index 4089453b7f3..a9c1110c09a 100644 --- a/intern/SoundSystem/SConscript +++ b/intern/SoundSystem/SConscript @@ -13,4 +13,4 @@ if env['WITH_BF_OPENAL']: else: defs = 'NO_SOUND' -env.BlenderLib ('blender_sndsys', sources, Split(incs), Split(defs), libtype=['core','player2'], priority = [20,10] ) +env.BlenderLib ('bf_soundsystem', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [20,140] ) diff --git a/intern/bmfont/SConscript b/intern/bmfont/SConscript index 614f8ec87ea..4febe2735e7 100644 --- a/intern/bmfont/SConscript +++ b/intern/bmfont/SConscript @@ -7,4 +7,4 @@ incs = '. intern' incs += ' ' + env['BF_OPENGL_INC'] defs = '' -env.BlenderLib ('blender_BMF', sources, Split(incs), Split(defs), libtype='intern', priority = 20 ) +env.BlenderLib ('bf_bmfont', sources, Split(incs), Split(defs), libtype=['intern','player'], priority = [20, 185] ) diff --git a/intern/decimation/SConscript b/intern/decimation/SConscript index 4ba7dbdba4c..cf199fb3bc5 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 ('blender_LOD', sources, Split(incs) , [], libtype=['core','common', 'player2'], priority = [10, 20, 5] ) +env.BlenderLib ('bf_decimation', sources, Split(incs) , [], libtype=['core','common','player'], priority = [10, 20, 25] ) diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index bc050e69451..82c17017261 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -27,4 +27,4 @@ else: Exit() incs = '. ../string ' + env['BF_OPENGL_INC'] -env.BlenderLib ('blender_GHOST', sources, Split(incs), [], libtype='core', priority = 25 ) +env.BlenderLib ('bf_ghost', sources, Split(incs), [], libtype=['core','player'], priority = [25,15] ) diff --git a/intern/guardedalloc/SConscript b/intern/guardedalloc/SConscript index 62688394361..fe3abb7eaff 100644 --- a/intern/guardedalloc/SConscript +++ b/intern/guardedalloc/SConscript @@ -5,4 +5,4 @@ Import('env') sources = env.Glob('intern/*.c') incs = '.' -env.BlenderLib ('blender_guardedalloc', sources, Split(incs), [], libtype='intern', priority = 10 ) +env.BlenderLib ('bf_guardedalloc', sources, Split(incs), [], libtype=['intern', 'player'], priority = [10, 175] ) diff --git a/intern/memutil/SConscript b/intern/memutil/SConscript index 0c541108434..4528de814f3 100644 --- a/intern/memutil/SConscript +++ b/intern/memutil/SConscript @@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp') incs = '. ..' -env.BlenderLib ('blender_MEM', sources, Split(incs), [], libtype='intern', priority = 0 ) +env.BlenderLib ('bf_memutil', sources, Split(incs), [], libtype=['intern', 'player'], priority = [0, 180] ) diff --git a/intern/moto/SConscript b/intern/moto/SConscript index 44e2fae76f3..636515aa5c5 100644 --- a/intern/moto/SConscript +++ b/intern/moto/SConscript @@ -5,4 +5,4 @@ sources = env.Glob('intern/*.cpp') incs = 'include' -env.BlenderLib ('blender_MT', sources, Split(incs), [], libtype=['intern','game','game2'], priority = [15, 55,100] ) +env.BlenderLib ('bf_moto', sources, Split(incs), [], libtype=['intern','game','game2','player'], priority = [15, 55, 100, 135] ) diff --git a/intern/string/SConscript b/intern/string/SConscript index 423904ff868..7f817f82759 100644 --- a/intern/string/SConscript +++ b/intern/string/SConscript @@ -4,4 +4,4 @@ Import ('env') sources = env.Glob('intern/*.cpp') incs = '.' -env.BlenderLib ('blender_STR', sources, Split(incs), [], libtype='core', priority = 30 ) +env.BlenderLib ('bf_string', sources, Split(incs), [], libtype=['core', 'player'], priority = [30,10] ) -- cgit v1.2.3