[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24113] trunk/blender/intern/ghost/ SConscript: r24111 broke the build on non-osx systems.

[Nathan Letwory]

Revision: 24113
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24113
Author:   jesterking
Date:     2009-10-27 15:11:28 +0100 (Tue, 27 Oct 2009)

Log Message:
-----------
r24111 broke the build on non-osx systems.

Modified Paths:
--------------
    trunk/blender/intern/ghost/SConscript

Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript	2009-10-27 13:46:02 UTC (rev 24112)
+++ trunk/blender/intern/ghost/SConscript	2009-10-27 14:11:28 UTC (rev 24113)
@@ -6,7 +6,9 @@
 
 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 @@
 
 #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] )