OSX: make cmake and scons both compile jack and ndof with newer sdk's
authorJens Verwiebe <info@jensverwiebe.de>
Wed, 12 Dec 2012 19:54:14 +0000 (19:54 +0000)
committerJens Verwiebe <info@jensverwiebe.de>
Wed, 12 Dec 2012 19:54:14 +0000 (19:54 +0000)
CMakeLists.txt
SConstruct
build_files/scons/config/darwin-config.py
intern/ghost/SConscript
intern/ghost/intern/GHOST_NDOFManagerCocoa.mm

index 7433d72..9b9fafd 100644 (file)
@@ -1522,7 +1522,7 @@ elseif(APPLE)
 
                        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()
 
index c2bae04..34d1742 100644 (file)
@@ -294,7 +294,8 @@ if env['OURPLATFORM']=='darwin':
             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 @@ if env['OURPLATFORM']=='darwin':
             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
index 252a1b1..207ddd3 100644 (file)
@@ -165,7 +165,7 @@ BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
 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
index 44882a6..96d9cfb 100644 (file)
@@ -93,7 +93,7 @@ else:
 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')
index d29dd4d..0d009e1 100644 (file)
@@ -27,7 +27,7 @@
 #include "GHOST_SystemCocoa.h"
 
 extern "C" {
-       #include <3DconnexionClient/ConnexionClientAPI.h>
+       #include <ConnexionClientAPI.h>
        #include <stdio.h>
        }