[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25059] trunk/blender/intern/ghost/ SConscript: * make sure we don't choke on what we don't have :?\194?\176

Nathan Letwory jesterking at letwory.net
Wed Dec 2 02:12:23 CET 2009


Revision: 25059
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25059
Author:   jesterking
Date:     2009-12-02 02:12:22 +0100 (Wed, 02 Dec 2009)

Log Message:
-----------
* make sure we don't choke on what we don't have :?\194?\176

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

Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript	2009-12-02 01:05:37 UTC (rev 25058)
+++ trunk/blender/intern/ghost/SConscript	2009-12-02 01:12:22 UTC (rev 25059)
@@ -15,23 +15,35 @@
 
 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')
+		try:
+			sources.remove('intern' + os.sep + f + 'Win32.cpp')
+			sources.remove('intern' + os.sep + f + 'Carbon.cpp')
+		except ValueError:
+			pass
 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')
+		try:
+			sources.remove('intern' + os.sep + f + 'X11.cpp')
+			sources.remove('intern' + os.sep + f + 'Carbon.cpp')
+		except ValueError:
+			pass
 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')
+			try:
+				sources.remove('intern' + os.sep + f + 'Win32.cpp')
+				sources.remove('intern' + os.sep + f + 'X11.cpp')
+				sources.remove('intern' + os.sep + f + 'Carbon.cpp')
+			except ValueError:
+				pass
 	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')
+			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')
+			except ValueError:
+				pass
 
 else:
 	print "Unknown window system specified."





More information about the Bf-blender-cvs mailing list