[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61129] trunk/blender/intern/ghost/ SConscript: OSX: more carbon removal cleanups

[jens verwiebe]

Revision: 61129
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61129
Author:   jensverwiebe
Date:     2013-11-05 13:50:53 +0000 (Tue, 05 Nov 2013)
Log Message:
-----------
OSX: more carbon removal cleanups

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

Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript	2013-11-05 13:35:49 UTC (rev 61128)
+++ trunk/blender/intern/ghost/SConscript	2013-11-05 13:50:53 UTC (rev 61129)
@@ -96,27 +96,17 @@
         except ValueError:
             pass
 elif window_system == 'darwin':
-    if env['WITH_GHOST_COCOA']:
-        if env['WITH_BF_QUICKTIME']:
-            defs.append('WITH_QUICKTIME')
-        if env['USE_QTKIT']:
-            defs.append('USE_QTKIT')
-        for f in pf:
-            try:
-                sources.remove('intern' + os.sep + f + 'Win32.cpp')
-                sources.remove('intern' + os.sep + f + 'X11.cpp')
-                sources.remove('intern' + os.sep + f + 'SDL.cpp')
-            except ValueError:
-                pass
-    else:
-        for f in pf:
-            try:
-                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
+	if env['WITH_BF_QUICKTIME']:
+		defs.append('WITH_QUICKTIME')
+	if env['USE_QTKIT']:
+		defs.append('USE_QTKIT')
+	for f in pf:
+		try:
+			sources.remove('intern' + os.sep + f + 'Win32.cpp')
+			sources.remove('intern' + os.sep + f + 'X11.cpp')
+			sources.remove('intern' + os.sep + f + 'SDL.cpp')
+		except ValueError:
+			pass
 
 else:
     print "Unknown window system specified."
@@ -151,7 +141,7 @@
 if window_system in ('win32-vc', 'win64-vc'):
     env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15]) #, cc_compileflags=env['CCFLAGS'].append('/WX') )
 
-elif env['WITH_GHOST_COCOA']:	 # always use default-Apple-gcc for objC language, for gnu-compilers do not support it fully yet
+elif window_system == 'darwin':	 # always use default-Apple-gcc for objC language, for gnu-compilers do not support it fully yet
     env.BlenderLib ('bf_intern_ghost', sources, Split(incs), defines=defs, libtype=['intern','player'], priority = [40,15], cc_compilerchange='/usr/bin/gcc', cxx_compilerchange='/usr/bin/g++' )
     print "GHOST COCOA WILL BE COMPILED WITH APPLE GCC"
     if env['WITH_BF_3DMOUSE']: