diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-10-27 17:11:28 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-10-27 17:11:28 +0300 |
| commit | a9610d45b679f5eeeed994ddc425b110429e9de1 (patch) | |
| tree | 2dacfa084768955b1122d6813533ea081e153153 /intern/ghost/SConscript | |
| parent | b66046339b832272f27b0612b0f77e6ef37124e0 (diff) | |
r24111 broke the build on non-osx systems.
Diffstat (limited to 'intern/ghost/SConscript')
| -rw-r--r-- | intern/ghost/SConscript | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index 95399227c99..20190f90366 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -6,7 +6,9 @@ Import ('env') window_system = env['OURPLATFORM'] -sources = env.Glob('intern/*.cpp') + env.Glob('intern/*.mm') +sources = env.Glob('intern/*.cpp') +if window_system == 'darwin': + sources += env.Glob('intern/*.mm') if env['WITH_GHOST_COCOA'] == True: env.Append(CFLAGS=['-DGHOST_COCOA']) @@ -15,37 +17,37 @@ if env['WITH_GHOST_COCOA'] == True: #defs = '' #if env['WITH_GHOST_COCOA']: -# defs += 'GHOST_COCOA' +# defs += 'GHOST_COCOA' # maybe we need it later pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_Window'] if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd6', 'irix6'): - 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', 'win64-vc'): - 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': - if env['WITH_GHOST_COCOA']: + if env['WITH_GHOST_COCOA']: for f in pf: - sources.remove('intern' + os.sep + f + 'Win32.cpp') - sources.remove('intern' + os.sep + f + 'X11.cpp') - sources.remove('intern' + os.sep + f + 'Carbon.cpp') - else: - for f in pf: - sources.remove('intern' + os.sep + f + 'Win32.cpp') - sources.remove('intern' + os.sep + f + 'X11.cpp') - sources.remove('intern' + os.sep + f + 'Cocoa.mm') + sources.remove('intern' + os.sep + f + 'Win32.cpp') + sources.remove('intern' + os.sep + f + 'X11.cpp') + sources.remove('intern' + os.sep + f + 'Carbon.cpp') + else: + for f in pf: + sources.remove('intern' + os.sep + f + 'Win32.cpp') + sources.remove('intern' + os.sep + f + 'X11.cpp') + sources.remove('intern' + os.sep + f + 'Cocoa.mm') 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', 'win64-vc'): - incs = env['BF_WINTAB_INC'] + ' ' + incs + incs = env['BF_WINTAB_INC'] + ' ' + incs env.BlenderLib ('bf_ghost', sources, Split(incs), defines=['_USE_MATH_DEFINES'], libtype=['intern','player'], priority = [40,15] ) |