diff options
author | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-08 00:24:36 +0300 |
---|---|---|
committer | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-08 00:24:36 +0300 |
commit | ef1b7a5735fea454f88f9d18cf9034279f8fb0b6 (patch) | |
tree | 8606ed6ca4eeee76c1cd1840c06fcaf09519f311 /source/blender | |
parent | b11c92c66e437166197fed77be698392f941b3a5 (diff) |
==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 :)
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/avi/SConscript | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/SConscript | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/bad_level_call_stubs/SConscript | 2 | ||||
-rw-r--r-- | source/blender/blenlib/SConscript | 2 | ||||
-rw-r--r-- | source/blender/blenloader/SConscript | 2 | ||||
-rw-r--r-- | source/blender/blenpluginapi/SConscript | 2 | ||||
-rw-r--r-- | source/blender/ftfont/SConscript | 3 | ||||
-rw-r--r-- | source/blender/imbuf/SConscript | 2 | ||||
-rw-r--r-- | source/blender/imbuf/intern/openexr/SConscript | 3 | ||||
-rw-r--r-- | source/blender/makesdna/SConscript | 2 | ||||
-rw-r--r-- | source/blender/readblenfile/SConscript | 2 | ||||
-rw-r--r-- | source/blender/yafray/SConscript | 2 |
12 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/avi/SConscript b/source/blender/avi/SConscript index 6c2faa5329d..91239c66ead 100644 --- a/source/blender/avi/SConscript +++ b/source/blender/avi/SConscript @@ -7,4 +7,4 @@ sources = env.Glob('intern/*.c') incs = '. #/intern/guardedalloc' incs += ' ' + env['BF_JPEG_INC'] -env.BlenderLib ('blender_avi', sources, Split(incs), [], libtype='core', priority = 90 ) +env.BlenderLib ('bf_avi', sources, Split(incs), [], libtype=['core','player'], priority = [90, 50] ) diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index a5128a33c3e..aed4ad6ed4c 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -32,4 +32,4 @@ defs += ' WITH_CCGSUBSURF' if env['WITH_BF_PLAYER']: SConscript(['bad_level_call_stubs/SConscript']) -env.BlenderLib ( libname = 'blenkernel', sources = sources, includes = Split(incs), defines = Split(defs), libtype='core', priority = 65 ) +env.BlenderLib ( libname = 'bf_blenkernel', sources = sources, includes = Split(incs), defines = Split(defs), libtype=['core','player'], priority = [65, 20] ) diff --git a/source/blender/blenkernel/bad_level_call_stubs/SConscript b/source/blender/blenkernel/bad_level_call_stubs/SConscript index cfe53fd8ab4..955a989c9f9 100644 --- a/source/blender/blenkernel/bad_level_call_stubs/SConscript +++ b/source/blender/blenkernel/bad_level_call_stubs/SConscript @@ -11,4 +11,4 @@ defs = '' if env['WITH_BF_INTERNATIONAL']: defs += 'WITH_FREETYPE2' -env.BlenderLib ('blenkernel_blc', sources = Split(sources), includes=Split(incs), defines=Split(defs), libtype='player2',priority=0 ) +env.BlenderLib ('blenkernel_blc', sources = Split(sources), includes=Split(incs), defines=Split(defs), libtype='player',priority=225 ) diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index 8b9d0bcbf1b..53231e60d8f 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -12,4 +12,4 @@ defs = '' if env['WITH_BF_INTERNATIONAL'] == 1: defs = 'WITH_FREETYPE2' -env.BlenderLib ( 'blender_blenlib', sources, Split(incs), Split(defs), libtype='core', priority = 85 ) +env.BlenderLib ( 'bf_blenlib', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [85,195] ) diff --git a/source/blender/blenloader/SConscript b/source/blender/blenloader/SConscript index 33e30e56793..a5096cefdcd 100644 --- a/source/blender/blenloader/SConscript +++ b/source/blender/blenloader/SConscript @@ -10,4 +10,4 @@ incs += ' ../render/extern/include' incs += ' ' + env['BF_ZLIB_INC'] -env.BlenderLib ( 'blender_blenloader', sources, Split(incs), [], libtype='core', priority = 70 ) +env.BlenderLib ( 'bf_blenloader', sources, Split(incs), [], libtype=['core','player'], priority = [70, 30] ) diff --git a/source/blender/blenpluginapi/SConscript b/source/blender/blenpluginapi/SConscript index f1ba8b3af74..d17a35e933e 100644 --- a/source/blender/blenpluginapi/SConscript +++ b/source/blender/blenpluginapi/SConscript @@ -11,4 +11,4 @@ if env['WITH_BF_QUICKTIME'] == 1: defs.append('WITH_QUICKTIME') incs += ' ' + env['BF_QUICKTIME_INC'] -env.BlenderLib ( libname = 'blender_blenpluginapi', sources = sources, includes = Split(incs), defines = defs, libtype='core', priority = 75 ) +env.BlenderLib ( libname = 'bf_blenpluginapi', sources = sources, includes = Split(incs), defines = defs, libtype=['core', 'player'], priority = [75, 35] ) diff --git a/source/blender/ftfont/SConscript b/source/blender/ftfont/SConscript index 9d9da82fac2..cf6805d6bb3 100644 --- a/source/blender/ftfont/SConscript +++ b/source/blender/ftfont/SConscript @@ -12,4 +12,5 @@ incs += ' ' + env['BF_GETTEXT_INC'] defs = 'FTGL_STATIC_LIBRARY' if sys.platform == 'win32': defs += ' _WIN32 USE_GETTEXT_DLL' -env.BlenderLib ( 'blender_FTF', sources, Split(incs), Split(defs), libtype='international', priority=0 ) + +env.BlenderLib ( 'bf_ftfont', sources, Split(incs), Split(defs), libtype=['international','player'], priority=[0, 205] ) diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript index 7d0afa3f0e5..93041ab97cf 100644 --- a/source/blender/imbuf/SConscript +++ b/source/blender/imbuf/SConscript @@ -23,4 +23,4 @@ if env['WITH_BF_QUICKTIME']==1: incs += ' ' + env['BF_QUICKTIME_INC'] defs.append('WITH_QUICKTIME') -env.BlenderLib ( libname = 'blender_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype='core', priority = 80 ) +env.BlenderLib ( libname = 'bf_imbuf', sources = sources, includes = Split(incs), defines = defs, libtype=['core','player'], priority = [80, 40] ) diff --git a/source/blender/imbuf/intern/openexr/SConscript b/source/blender/imbuf/intern/openexr/SConscript index ec7b9b3518d..a710e26ad5d 100644 --- a/source/blender/imbuf/intern/openexr/SConscript +++ b/source/blender/imbuf/intern/openexr/SConscript @@ -13,5 +13,4 @@ incs += Split(env['BF_OPENEXR_INC']) defs = [] -#openexr_env.Library (target='#'+user_options_dict['BUILD_DIR']+'/lib/blender_openexr', source=source_files) -env.BlenderLib ('blender_openexr', source_files, incs, defs, libtype='core', priority = 90) +env.BlenderLib ('bf_openexr', source_files, incs, defs, libtype=['core','player'], priority = [90, 200]) diff --git a/source/blender/makesdna/SConscript b/source/blender/makesdna/SConscript index 3978f8bbf48..d67be4955c4 100644 --- a/source/blender/makesdna/SConscript +++ b/source/blender/makesdna/SConscript @@ -8,4 +8,4 @@ objs.append (o) incs = '#/intern/guardedalloc' -env.BlenderLib ( 'blender_makesdna', objs, Split(incs), [], libtype='common', priority = 10 ) +env.BlenderLib ( 'bf_dna', objs, Split(incs), [], libtype=['common','player'], priority = [10, 215] ) diff --git a/source/blender/readblenfile/SConscript b/source/blender/readblenfile/SConscript index 901871ad298..31ca25eedd7 100644 --- a/source/blender/readblenfile/SConscript +++ b/source/blender/readblenfile/SConscript @@ -5,4 +5,4 @@ sources = env.Glob('intern/*.c') incs = '. ../blenloader ../blenloader/intern ../blenkernel ../blenlib ../makesdna ../../kernel/gen_messaging' -env.BlenderLib ( 'blender_readblenfile', sources, Split(incs), [], libtype='common', priority = 0 ) +env.BlenderLib ( 'bf_readblenfile', sources, Split(incs), [], libtype=['common','player'], priority = [0, 220] ) diff --git a/source/blender/yafray/SConscript b/source/blender/yafray/SConscript index 8da3b16fbfe..dd744f92d39 100644 --- a/source/blender/yafray/SConscript +++ b/source/blender/yafray/SConscript @@ -6,4 +6,4 @@ sources = env.Glob('intern/*.cpp') incs = '#/intern/guardedalloc ../blenlib ../makesdna ../blenkernel' incs += ' ../imbuf ../include ../render/extern/include ../render/intern/include' -env.BlenderLib ( 'blender_yafray', sources, Split(incs), [], libtype='blender', priority=5 ) +env.BlenderLib ( 'bf_yafray', sources, Split(incs), [], libtype=['blender','player'], priority=[5, 190] ) |