diff options
| author | Thomas Dinges <blender@dingto.org> | 2011-08-08 02:48:04 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2011-08-08 02:48:04 +0400 |
| commit | fad243a4bfd0414b0f8656c570c23ba72012cd40 (patch) | |
| tree | cf0a6e0b91799b0cb93a3d86d1ab32ede3631ed9 | |
| parent | 28ae6d85fee9ec32c7a16b9fa004ba6fef3d84f8 (diff) | |
Mac Compile fix for ndof, by jensverwiebe. Thanks!
| -rw-r--r-- | SConstruct | 4 | ||||
| -rw-r--r-- | build_files/scons/config/darwin-config.py | 8 | ||||
| -rw-r--r-- | build_files/scons/tools/btools.py | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index b35f3fdbf7b..7b25f744103 100644 --- a/SConstruct +++ b/SConstruct @@ -265,9 +265,11 @@ if env['OURPLATFORM']=='darwin': # for now, Mac builders must download and install the driver framework from 3Dconnexion # necessary header file lives here when installed: # /Library/Frameworks/3DconnexionClient.framework/Versions/Current/Headers/ConnexionClientAPI.h - if not os.path.exists('/Library/Frameworks/3DconnexionClient.framework'): + if env['WITH_BF_3DMOUSE'] == 1 and not os.path.exists('/Library/Frameworks/3DconnexionClient.framework'): print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors ! env['WITH_BF_3DMOUSE'] = 0 + env['FOUND_NDOF_DRIVERS'] = 0 + if env['WITH_BF_OPENMP'] == 1: if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 0c851e43825..29695896921 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -1,7 +1,9 @@ # # Note : if you want to alter this file -# setup a user-config.py in main directory -# and set the wanted values there +# copy it as a whole in the upper folder +# as user-config.py +# dont create a new file with only some +# vars changed. import commands @@ -313,7 +315,7 @@ if WITH_BF_QUICKTIME: else: PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime'] -if WITH_BF_3DMOUSE: +if FOUND_NDOF_DRIVERS: PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS + ['-weak_framework','3DconnexionClient'] #note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4 diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 25e0582c536..aac16555df9 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -136,7 +136,7 @@ def validate_arguments(args, bc): 'BF_NO_ELBEEM', 'WITH_BF_CXX_GUARDEDALLOC', 'WITH_BF_JEMALLOC', 'WITH_BF_STATICJEMALLOC', 'BF_JEMALLOC', 'BF_JEMALLOC_INC', 'BF_JEMALLOC_LIBPATH', 'BF_JEMALLOC_LIB', 'BF_JEMALLOC_LIB_STATIC', - 'BUILDBOT_BRANCH', 'WITH_BF_3DMOUSE', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC' + 'BUILDBOT_BRANCH', 'WITH_BF_3DMOUSE', 'FOUND_NDOF_DRIVERS', 'WITH_BF_STATIC3DMOUSE', 'BF_3DMOUSE', 'BF_3DMOUSE_INC', 'BF_3DMOUSE_LIB', 'BF_3DMOUSE_LIBPATH', 'BF_3DMOUSE_LIB_STATIC' ] # Have options here that scons expects to be lists @@ -439,6 +439,7 @@ def read_opts(env, cfg, args): (BoolVariable('WITH_BF_NOBLENDER', 'Do not build blender if true', False)), (BoolVariable('WITH_BF_3DMOUSE', 'Build blender with support of 3D mouses', False)), + (BoolVariable('FOUND_NDOF_DRIVERS', 'We detected NDOF libs or framework', False)), (BoolVariable('WITH_BF_STATIC3DMOUSE', 'Staticly link to 3d mouse library', False)), ('BF_3DMOUSE', '3d mouse library base path', ''), ('BF_3DMOUSE_INC', '3d mouse library include path', ''), |