[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52944] trunk/blender: OSX: make cmake and scons both compile jack and ndof with newer sdk's

[jens verwiebe]

Revision: 52944
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52944
Author:   jensverwiebe
Date:     2012-12-12 19:54:14 +0000 (Wed, 12 Dec 2012)
Log Message:
-----------
OSX: make cmake and scons both compile jack and ndof with newer sdk's

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/SConstruct
    trunk/blender/build_files/scons/config/darwin-config.py
    trunk/blender/intern/ghost/SConscript
    trunk/blender/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2012-12-12 19:20:36 UTC (rev 52943)
+++ trunk/blender/CMakeLists.txt	2012-12-12 19:54:14 UTC (rev 52944)
@@ -1522,7 +1522,7 @@
 
 			if(WITH_INPUT_NDOF)
 				set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -F/Library/Frameworks -weak_framework 3DconnexionClient")
-				set(NDOF_INCLUDE_DIRS /Library/Frameworks/3DconnexionClient.framework )
+				set(NDOF_INCLUDE_DIRS /Library/Frameworks/3DconnexionClient.framework/Headers )
 			endif()
 		endif()
 

Modified: trunk/blender/SConstruct
===================================================================
--- trunk/blender/SConstruct	2012-12-12 19:20:36 UTC (rev 52943)
+++ trunk/blender/SConstruct	2012-12-12 19:54:14 UTC (rev 52944)
@@ -294,7 +294,8 @@
             print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors !
             env['WITH_BF_3DMOUSE'] = 0
         else:
-            env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','3DconnexionClient'])
+            env.Append(LINKFLAGS=['-F/Library/Frameworks','-Xlinker','-weak_framework','-Xlinker','3DconnexionClient'])
+            env['BF_3DMOUSE_INC'] = '/Library/Frameworks/3DconnexionClient.framework/Headers'
 
     # for now, Mac builders must download and install the JackOSX framework 
     # necessary header file lives here when installed:
@@ -304,7 +305,7 @@
             print "JackOSX install not found, disabling WITH_BF_JACK" # avoid build errors !
             env['WITH_BF_JACK'] = 0
         else:
-            env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','Jackmp'])
+            env.Append(LINKFLAGS=['-L/Library/Frameworks','-Xlinker','-weak_framework','-Xlinker','Jackmp'])
 
     if env['WITH_BF_CYCLES_OSL'] == 1:	
         OSX_OSL_LIBPATH = Dir(env.subst(env['BF_OSL_LIBPATH'])).abspath

Modified: trunk/blender/build_files/scons/config/darwin-config.py
===================================================================
--- trunk/blender/build_files/scons/config/darwin-config.py	2012-12-12 19:20:36 UTC (rev 52943)
+++ trunk/blender/build_files/scons/config/darwin-config.py	2012-12-12 19:54:14 UTC (rev 52944)
@@ -165,7 +165,7 @@
 WITH_BF_JACK = True
 BF_JACK = '/Library/Frameworks/Jackmp.framework'
 BF_JACK_INC = '${BF_JACK}/headers'
-BF_JACK_LIB = 'jack'
+#BF_JACK_LIB = 'jack' # not used due framework
 BF_JACK_LIBPATH = '${BF_JACK}'
 
 WITH_BF_SNDFILE = True

Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript	2012-12-12 19:20:36 UTC (rev 52943)
+++ trunk/blender/intern/ghost/SConscript	2012-12-12 19:54:14 UTC (rev 52944)
@@ -93,7 +93,7 @@
 if env['WITH_BF_3DMOUSE']:
     defs.append('WITH_INPUT_NDOF')
 
-    if env['OURPLATFORM']=='linux':
+    if env['OURPLATFORM'] in ('linux','darwin'):
         incs += ' ' + env['BF_3DMOUSE_INC']
 else:
     sources.remove('intern' + os.sep + 'GHOST_NDOFManager.cpp')

Modified: trunk/blender/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm	2012-12-12 19:20:36 UTC (rev 52943)
+++ trunk/blender/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm	2012-12-12 19:54:14 UTC (rev 52944)
@@ -27,7 +27,7 @@
 #include "GHOST_SystemCocoa.h"
 
 extern "C" {
-	#include <3DconnexionClient/ConnexionClientAPI.h>
+	#include <ConnexionClientAPI.h>
 	#include <stdio.h>
 	}