[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51968] trunk/blender: OSX: some more version target cleanups and corrections

[jens verwiebe]

Revision: 51968
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51968
Author:   jensverwiebe
Date:     2012-11-07 10:43:31 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
OSX: some more version target cleanups and corrections

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
    trunk/blender/source/blender/quicktime/quicktime_export.h

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-11-07 10:18:11 UTC (rev 51967)
+++ trunk/blender/CMakeLists.txt	2012-11-07 10:43:31 UTC (rev 51968)
@@ -291,7 +291,7 @@
 	message(STATUS "Detected system-version: " ${OSX_SYSTEM})
 	
 	if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-			set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE) # 10.5 is our minimum target, if you have higher sdk, weak linking happens
+			set(CMAKE_OSX_DEPLOYMENT_TARGET "10.6" CACHE STRING "" FORCE) # 10.6 is our minimum target, if you have higher sdk, weak linking happens - with 10.5 we have a still not solved problems, build those with 10.5.sdk !!!
 	endif()
 
 	if(${CMAKE_GENERATOR} MATCHES "Xcode")

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2012-11-07 10:18:11 UTC (rev 51967)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2012-11-07 10:43:31 UTC (rev 51968)
@@ -423,7 +423,7 @@
 
 
 #pragma mark defines for 10.6 api not documented in 10.5
-#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_5 and 0
+#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
 enum {
 	/* The following event types are available on some hardware on 10.5.2 and later */
 	NSEventTypeGesture          = 29,
@@ -435,12 +435,10 @@
 };
 
 @interface NSEvent(GestureEvents)
-/* This message is valid for events of type NSEventTypeMagnify, on 10.5.2 or later */
-#if MAC_OS_X_VERSION_MIN_REQUIRED <= MAC_OS_X_VERSION_10_4
 - (float)magnification;       // change in magnification.
 #else
-- (CGFloat)magnification;       // change in magnification.
-#endif
+ at interface NSEvent(GestureEvents)
+- (CGFloat)magnification;       // change in magnification on 10.5.2 or later.
 @end 
 
 #endif

Modified: trunk/blender/source/blender/quicktime/quicktime_export.h
===================================================================
--- trunk/blender/source/blender/quicktime/quicktime_export.h	2012-11-07 10:18:11 UTC (rev 51967)
+++ trunk/blender/source/blender/quicktime/quicktime_export.h	2012-11-07 10:43:31 UTC (rev 51968)
@@ -87,8 +87,8 @@
 
 
 
-#if (defined(USE_QTKIT) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_6 && __LP64__)
-//Include the quicktime codec types constants that are missing in QTKitDefines.h in 10.6 / 64bit
+#if (defined(USE_QTKIT) && MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_5 && __LP64__)
+//Include the quicktime codec types constants that are missing in QTKitDefines.h
 enum {
 	kRawCodecType						= 'raw ',
 	kCinepakCodecType 					= 'cvid',