diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2008-01-08 12:47:44 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2008-01-08 12:47:44 +0300 |
| commit | 15da2232f7aa0f11a89e48f41f5730ddc8bb1b10 (patch) | |
| tree | c6ed3ab740269771e8ffa8f04fd57f1c9a345455 /intern/ghost | |
| parent | c344021b838a6fb2cbcc68b296144a734f74260f (diff) | |
* tweak linking priorities - should help for GCC users
* some lib renaming
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/SConscript | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 40968e816a9..7e00a75c876 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -11,22 +11,22 @@ sources = env.Glob('intern/*.cpp') pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_Window'] if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd6'): - for f in pf: - sources.remove('intern' + os.sep + f + 'Win32.cpp') - sources.remove('intern' + os.sep + f + 'Carbon.cpp') + for f in pf: + sources.remove('intern' + os.sep + f + 'Win32.cpp') + sources.remove('intern' + os.sep + f + 'Carbon.cpp') elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross'): - for f in pf: - sources.remove('intern' + os.sep + f + 'X11.cpp') - sources.remove('intern' + os.sep + f + 'Carbon.cpp') + for f in pf: + sources.remove('intern' + os.sep + f + 'X11.cpp') + sources.remove('intern' + os.sep + f + 'Carbon.cpp') elif window_system == 'darwin': - for f in pf: - sources.remove('intern' + os.sep + f + 'Win32.cpp') - sources.remove('intern' + os.sep + f + 'X11.cpp') + for f in pf: + sources.remove('intern' + os.sep + f + 'Win32.cpp') + sources.remove('intern' + os.sep + f + 'X11.cpp') else: - print "Unknown window system specified." - Exit() + print "Unknown window system specified." + 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 = [25,15] ) + incs = env['BF_WINTAB_INC'] + ' ' + incs +env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['core','player'], priority = [40,5] ) |