Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

OSX: make cmake and scons both compile jack and ndof with newer sdk's

Browse Source
This commit is contained in:
Jens Verwiebe
2012-12-12 19:54:14 +00:00
parent fc65922124
commit 8af6721eb5
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -1522,7 +1522,7 @@ elseif(APPLE)
if(WITH_INPUT_NDOF) if(WITH_INPUT_NDOF)
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -F/Library/Frameworks -weak_framework 3DconnexionClient") 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()
endif() endif()

5
SConstruct
View File

@@ -294,7 +294,8 @@ if env['OURPLATFORM']=='darwin':
print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors ! print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors !
env['WITH_BF_3DMOUSE'] = 0 env['WITH_BF_3DMOUSE'] = 0
else: 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 # for now, Mac builders must download and install the JackOSX framework
# necessary header file lives here when installed: # 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 ! print "JackOSX install not found, disabling WITH_BF_JACK" # avoid build errors !
env['WITH_BF_JACK'] = 0 env['WITH_BF_JACK'] = 0
else: 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: if env['WITH_BF_CYCLES_OSL'] == 1:
OSX_OSL_LIBPATH = Dir(env.subst(env['BF_OSL_LIBPATH'])).abspath OSX_OSL_LIBPATH = Dir(env.subst(env['BF_OSL_LIBPATH'])).abspath

2
build_files/scons/config/darwin-config.py
View File

@@ -165,7 +165,7 @@ BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
WITH_BF_JACK = True WITH_BF_JACK = True
BF_JACK = '/Library/Frameworks/Jackmp.framework' BF_JACK = '/Library/Frameworks/Jackmp.framework'
BF_JACK_INC = '${BF_JACK}/headers' BF_JACK_INC = '${BF_JACK}/headers'
BF_JACK_LIB = 'jack' #BF_JACK_LIB = 'jack' # not used due framework
BF_JACK_LIBPATH = '${BF_JACK}' BF_JACK_LIBPATH = '${BF_JACK}'
WITH_BF_SNDFILE = True WITH_BF_SNDFILE = True

2
intern/ghost/SConscript
View File

@@ -93,7 +93,7 @@ else:
if env['WITH_BF_3DMOUSE']: if env['WITH_BF_3DMOUSE']:
defs.append('WITH_INPUT_NDOF') defs.append('WITH_INPUT_NDOF')
if env['OURPLATFORM']=='linux': if env['OURPLATFORM'] in ('linux','darwin'):
incs += ' ' + env['BF_3DMOUSE_INC'] incs += ' ' + env['BF_3DMOUSE_INC']
else: else:
sources.remove('intern' + os.sep + 'GHOST_NDOFManager.cpp') sources.remove('intern' + os.sep + 'GHOST_NDOFManager.cpp')

2
intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
View File

@@ -27,7 +27,7 @@
#include "GHOST_SystemCocoa.h" #include "GHOST_SystemCocoa.h"
extern "C" { extern "C" {
#include <3DconnexionClient/ConnexionClientAPI.h> #include <ConnexionClientAPI.h>
#include <stdio.h> #include <stdio.h>
} }