diff options
| -rw-r--r-- | config/darwin-config.py | 22 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 1 |
2 files changed, 13 insertions, 10 deletions
diff --git a/config/darwin-config.py b/config/darwin-config.py index 03cc4eb1f8c..249598e8a47 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -31,30 +31,32 @@ elif cmd_res[0]=='9': 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 ################## ############################################################################# diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index c7127e26a4a..5e504f0d6ab 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -914,6 +914,7 @@ GHOST_TSuccess GHOST_SystemCocoa::handleDraggingEvent(GHOST_TEventType eventType switch (draggedObjectType) { case GHOST_kDragnDropTypeBitmap: //TODO: implement bitmap conversion to a blender friendly format + return GHOST_kFailure; break; case GHOST_kDragnDropTypeFilenames: droppedArray = (NSArray*)data; |