[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24557] trunk/blender: - scons fix for 10. 4 build (use the 10.4 libs dir)

[Damien Plisson]

Revision: 24557
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24557
Author:   damien78
Date:     2009-11-14 14:01:14 +0100 (Sat, 14 Nov 2009)

Log Message:
-----------
- scons fix for 10.4 build (use the 10.4 libs dir)
- warning fix in ghost/cocoa

Modified Paths:
--------------
    trunk/blender/config/darwin-config.py
    trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm

Modified: trunk/blender/config/darwin-config.py
===================================================================
--- trunk/blender/config/darwin-config.py	2009-11-14 08:50:02 UTC (rev 24556)
+++ trunk/blender/config/darwin-config.py	2009-11-14 13:01:14 UTC (rev 24557)
@@ -31,30 +31,32 @@
 elif cmd_res[0]=='10':
 	MAC_CUR_VER='10.6'
 
-if MACOSX_ARCHITECTURE == 'ppc':
-	LCGDIR = '#../lib/darwin-6.1-powerpc'
-else :
-	LCGDIR = '#../lib/darwin-9.x.universal'
-LIBDIR = '${LCGDIR}'
-
 BF_PYTHON_VERSION = '3.1'
 
-if MACOSX_ARCHITECTURE == 'ppc' and BF_PYTHON_VERSION == '2.3':
+# Default target OSX settings per architecture
+# Can be customized
+
+if MACOSX_ARCHITECTURE == 'ppc':
 	MAC_MIN_VERS = '10.3'
 	MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
-	CC = 'gcc'
-	CXX = 'g++'
-elif MACOSX_ARCHITECTURE == 'i386' or MACOSX_ARCHITECTURE == 'ppc':
+	LCGDIR = '#../lib/darwin-6.1-powerpc'
+	CC = 'gcc-3.3'
+	CXX = 'g++-3.3'
+elif MACOSX_ARCHITECTURE == 'i386':
 	MAC_MIN_VERS = '10.4'
 	MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
+	LCGDIR = '#../lib/darwin-8.x.i386'
 	CC = 'gcc-4.0'
 	CXX = 'g++-4.0'
 else :
 	MAC_MIN_VERS = '10.5'
 	MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk'
+	LCGDIR = '#../lib/darwin-9.x.universal'
 	CC = 'gcc-4.2'
 	CXX = 'g++-4.2'
 
+LIBDIR = '${LCGDIR}'
+
 #############################################################################
 ###################          Dependency settings           ##################
 #############################################################################

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2009-11-14 08:50:02 UTC (rev 24556)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2009-11-14 13:01:14 UTC (rev 24557)
@@ -914,6 +914,7 @@
 			switch (draggedObjectType) {
 				case GHOST_kDragnDropTypeBitmap:
 					//TODO: implement bitmap conversion to a blender friendly format
+					return GHOST_kFailure;
 					break;
 				case GHOST_kDragnDropTypeFilenames:
 					droppedArray = (NSArray*)data;