NDOF related edits

- fix for building without NDOF on X11
- quiet some warnings
This commit is contained in:
Campbell Barton
2011-08-02 05:52:27 +00:00
parent 8f3016098d
commit fcd7d2b486
9 changed files with 52 additions and 16 deletions

View File

@@ -179,7 +179,7 @@ option(WITH_LZO "Enable fast LZO compression (used for pointcache)" ON
option(WITH_LZMA "Enable best LZMA compression, (used for pointcache)" ON)
# Misc
option(WITH_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON)
option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON)
if(UNIX AND NOT APPLE)
option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON)
@@ -453,7 +453,7 @@ if(UNIX AND NOT APPLE)
endif()
endif()
if (WITH_NDOF)
if (WITH_INPUT_NDOF)
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
set(NDOF /usr)
set(NDOF_INC ${NDOF}/include)
@@ -1039,7 +1039,7 @@ elseif(APPLE)
set(TIFF_LIBPATH ${TIFF}/lib)
endif()
if (WITH_NDOF)
if (WITH_INPUT_NDOF)
# linker needs "-weak_framework 3DconnexionClient"
endif()