From 9eb1b263129e4cfe220d838db7d42a7d5b2316b2 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 12 Jul 2011 18:39:46 +0000 Subject: Fix for recent GHOST SDL commit. SCons rules haven't been changed to deal with new option. --- intern/ghost/SConscript | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'intern/ghost/SConscript') diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index b67545f216a..ccfaa4814bc 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -14,11 +14,23 @@ if window_system == 'darwin': pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_SystemPaths', 'GHOST_Window', 'GHOST_DropTarget'] defs=['_USE_MATH_DEFINES'] -if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'irix6', 'aix4', 'aix5'): +incs = '. ../string #extern/glew/include #source/blender/imbuf #source/blender/makesdna ' + env['BF_OPENGL_INC'] + +if env['WITH_GHOST_SDL']: + for f in pf: + try: + sources.remove('intern' + os.sep + f + 'Carbon.cpp') + sources.remove('intern' + os.sep + f + 'Win32.cpp') + sources.remove('intern' + os.sep + f + 'X11.cpp') + except ValueError: + pass + incs += ' ' + env['BF_SDL_INC'] +elif window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'irix6', 'aix4', 'aix5'): for f in pf: try: sources.remove('intern' + os.sep + f + 'Win32.cpp') sources.remove('intern' + os.sep + f + 'Carbon.cpp') + sources.remove('intern' + os.sep + f + 'SDL.cpp') except ValueError: pass defs += ['PREFIX=\\"/usr/local/\\"'] # XXX, make an option @@ -29,6 +41,7 @@ elif window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64 try: sources.remove('intern' + os.sep + f + 'X11.cpp') sources.remove('intern' + os.sep + f + 'Carbon.cpp') + sources.remove('intern' + os.sep + f + 'SDL.cpp') except ValueError: pass elif window_system == 'darwin': @@ -42,6 +55,7 @@ elif window_system == 'darwin': sources.remove('intern' + os.sep + f + 'Win32.cpp') sources.remove('intern' + os.sep + f + 'X11.cpp') sources.remove('intern' + os.sep + f + 'Carbon.cpp') + sources.remove('intern' + os.sep + f + 'SDL.cpp') except ValueError: pass else: @@ -50,6 +64,7 @@ elif window_system == 'darwin': 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 + 'SDL.cpp') except ValueError: pass @@ -60,7 +75,6 @@ else: if env['BF_GHOST_DEBUG']: defs.append('BF_GHOST_DEBUG') -incs = '. ../string #extern/glew/include #source/blender/imbuf #source/blender/makesdna ' + env['BF_OPENGL_INC'] if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'): incs = env['BF_WINTAB_INC'] + ' ' + incs -- cgit v1.2.3 From 44e45e54c51e2f54c89b173e8844a99ce7f5de75 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 13 Jul 2011 06:04:54 +0000 Subject: - don't build ghost's event printer unless ghost debug is enabled. - use char rather then STR_String for the event printer. - added option to build WITH_GHOST_DEBUG for cmake - renamed WITH_SDL_GHOST --> WITH_GHOST_SDL --- intern/ghost/SConscript | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'intern/ghost/SConscript') diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index ccfaa4814bc..c65ec58a97b 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -25,6 +25,7 @@ if env['WITH_GHOST_SDL']: except ValueError: pass incs += ' ' + env['BF_SDL_INC'] + defs += ['WITH_GHOST_SDL'] elif window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'irix6', 'aix4', 'aix5'): for f in pf: try: @@ -73,7 +74,9 @@ else: Exit() if env['BF_GHOST_DEBUG']: - defs.append('BF_GHOST_DEBUG') + defs.append('WITH_GHOST_DEBUG') +else: + sources.remove('intern' + os.sep + 'GHOST_EventPrinter.cpp') if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross', 'win64-vc'): incs = env['BF_WINTAB_INC'] + ' ' + incs -- cgit v1.2.3