From a9610d45b679f5eeeed994ddc425b110429e9de1 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Tue, 27 Oct 2009 14:11:28 +0000 Subject: [PATCH] r24111 broke the build on non-osx systems. --- intern/ghost/SConscript | 46 +++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 22 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') -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') -elif window_system == 'darwin': - 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 + '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') +elif window_system == 'darwin': + 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') 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] )