Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

* fix linking order for l00nix

Browse Source
This commit is contained in:
Nathan Letwory
2008-01-08 17:32:38 +00:00
parent 8d9a7941da
commit 8269b89c15
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/SoundSystem/SConscript
View File

@@ -13,4 +13,4 @@ if env['WITH_BF_OPENAL']:
else: else:
defs = 'NO_SOUND' 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] )

4
intern/ghost/SConscript
View File

@@ -27,6 +27,8 @@ else:
Exit() Exit()
incs = '. ../string ' + env['BF_OPENGL_INC'] incs = '. ../string ' + env['BF_OPENGL_INC']
if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross'): if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross'):
incs = env['BF_WINTAB_INC'] + ' ' + incs 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] )

2
intern/string/SConscript
View File

@@ -4,4 +4,4 @@ Import ('env')
sources = env.Glob('intern/*.cpp') sources = env.Glob('intern/*.cpp')
incs = '.' 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] )

2
source/blender/editors/screen/SConscript
View File

@@ -7,4 +7,4 @@ incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
incs += ' ../../blenloader ../../windowmanager ../../python' incs += ' ../../blenloader ../../windowmanager ../../python'
incs += ' #/intern/guardedalloc' 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] )

2
source/blender/editors/space_view3d/SConscript
View File

@@ -6,4 +6,4 @@ sources = env.Glob('*.c')
incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf'
incs += ' #/intern/guardedalloc' 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] )