diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2011-08-02 08:28:05 +0400 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2011-08-02 08:28:05 +0400 |
| commit | 56918978b725ef529ad332db7acdd0682ea17ea7 (patch) | |
| tree | 669cc7fd644d26caab1d1010e41d0e79afc54c26 /build_files | |
| parent | db494472ac02ff73dbc0984940e7758321e5642d (diff) | |
| parent | dc2609da3d08ff2dde1747201ef4e0ebb17d5bd9 (diff) | |
3D mouse support from merwin-spacenav branch
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/macros.cmake | 7 | ||||
| -rw-r--r-- | build_files/scons/config/darwin-config.py | 7 | ||||
| -rw-r--r-- | build_files/scons/config/linux2-config.py | 6 |
3 files changed, 19 insertions, 1 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 34301458a06..3de9db6dac9 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -193,6 +193,9 @@ macro(SETUP_LIBDIRS) if(WITH_MEM_JEMALLOC) link_directories(${JEMALLOC_LIBPATH}) endif() + if(WITH_NDOF) + link_directories(${NDOF_LIBPATH}) + endif() if(WIN32 AND NOT UNIX) link_directories(${PTHREADS_LIBPATH}) @@ -314,6 +317,10 @@ macro(setup_liblinks if(WITH_MEM_JEMALLOC) target_link_libraries(${target} ${JEMALLOC_LIBRARIES}) endif() + if(WITH_NDOF) + target_link_libraries(${target} ${NDOF_LIBRARY}) + endif() + if(WIN32 AND NOT UNIX) target_link_libraries(${target} ${PTHREADS_LIBRARIES}) endif() diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 0c51476a6d0..4a4bc4acd67 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -264,7 +264,9 @@ if MACOSX_ARCHITECTURE == 'i386': BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse'] elif MACOSX_ARCHITECTURE == 'x86_64': BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-msse2'] - + +# SpaceNavigator and related 3D mice +WITH_BF_3DMOUSE = True ############################################################################# ################### various compile settings and flags ################## @@ -294,6 +296,9 @@ if WITH_BF_QUICKTIME == True: else: PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime'] +if WITH_BF_3DMOUSE: + 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 LLIBS = ['stdc++', 'SystemStubs'] diff --git a/build_files/scons/config/linux2-config.py b/build_files/scons/config/linux2-config.py index 328cd4cdb28..6fb9090b022 100644 --- a/build_files/scons/config/linux2-config.py +++ b/build_files/scons/config/linux2-config.py @@ -192,6 +192,10 @@ WITH_BF_OPENMP = True WITH_BF_RAYOPTIMIZATION = True BF_RAYOPTIMIZATION_SSE_FLAGS = ['-msse','-pthread'] +#SpaceNavigator and friends +WITH_BF_3DMOUSE = True +BF_3DMOUSE_LIB = 'spnav' + ## CC = 'gcc' CXX = 'g++' @@ -223,6 +227,8 @@ CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare'] ##FIX_STUBS_WARNINGS = -Wno-unused LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++'] +if WITH_BF_3DMOUSE: + LLIBS = LLIBS + [BF_3DMOUSE_LIB]; ##LOPTS = --dynamic ##DYNLDFLAGS = -shared $(LDFLAGS) |