diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-01-08 20:32:38 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-01-08 20:32:38 +0300 |
| commit | 8269b89c15d5b8c96ce3bda93cf940f014a94ae5 (patch) | |
| tree | b0db37ac65fb842307242727a6b163b326201e28 | |
| parent | 8d9a7941da8f41fe37243f988fdd13c34d44dd73 (diff) | |
* fix linking order for l00nix
| -rw-r--r-- | intern/SoundSystem/SConscript | 2 | ||||
| -rw-r--r-- | intern/ghost/SConscript | 4 | ||||
| -rw-r--r-- | intern/string/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/editors/screen/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/SConscript | 2 |
5 files changed, 7 insertions, 5 deletions
diff --git a/intern/SoundSystem/SConscript b/intern/SoundSystem/SConscript index 97a34326008..54fc13293eb 100644 --- a/intern/SoundSystem/SConscript +++ b/intern/SoundSystem/SConscript @@ -13,4 +13,4 @@ if env['WITH_BF_OPENAL']: else: defs = 'NO_SOUND' -env.BlenderLib ('bf_soundsystem', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [30,135] ) +env.BlenderLib ('bf_soundsystem', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [25,135] ) diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 7e00a75c876..bca9d715324 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -27,6 +27,8 @@ else: Exit() 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','player'], priority = [40,5] ) + +env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['core','intern','player'], priority = [40,44,5] ) diff --git a/intern/string/SConscript b/intern/string/SConscript index 06d74afd647..292ddf5aa63 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', 'player'], priority = [50,0] ) +env.BlenderLib ('bf_string', sources, Split(incs), [], libtype=['core', 'common','player'], priority = [50,19,0] ) diff --git a/source/blender/editors/screen/SConscript b/source/blender/editors/screen/SConscript index 786caa1a143..8ca512fedc1 100644 --- a/source/blender/editors/screen/SConscript +++ b/source/blender/editors/screen/SConscript @@ -7,4 +7,4 @@ incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../blenloader ../../windowmanager ../../python' incs += ' #/intern/guardedalloc' -env.BlenderLib ( 'bf_editors_screen', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] ) +env.BlenderLib ( 'bf_editors_screen', sources, Split(incs), [], libtype=['core','intern'], priority=[30, 35] ) diff --git a/source/blender/editors/space_view3d/SConscript b/source/blender/editors/space_view3d/SConscript index 14586dec7fe..6e6c9fdc29d 100644 --- a/source/blender/editors/space_view3d/SConscript +++ b/source/blender/editors/space_view3d/SConscript @@ -6,4 +6,4 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' #/intern/guardedalloc' -env.BlenderLib ( 'bf_editors_space_view3d', sources, Split(incs), [], libtype=['core','intern'], priority=[25, 35] ) +env.BlenderLib ( 'bf_editors_space_view3d', sources, Split(incs), [], libtype=['core','intern'], priority=[35, 40] ) |