diff options
| author | Adam Moss <moss@lindenlab.com> | 2008-11-12 20:28:24 +0000 |
|---|---|---|
| committer | Adam Moss <moss@lindenlab.com> | 2008-11-12 20:28:24 +0000 |
| commit | a879e13055f0bb759ee12e708184e95d8bd9be30 (patch) | |
| tree | d659c3f71dea7a4f213e9d855f331dc5af56c63a /indra/cmake | |
| parent | f89f19990cbb9f3f2e7473ac6c159098bdfabec7 (diff) | |
svn merge -c102054
svn+ssh://svn.lindenlab.com/svn/linden/branches/moss/morejoy-2-r102015
QAR-1016 joystick+spacenav improvements MERGE
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/NDOF.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/cmake/NDOF.cmake b/indra/cmake/NDOF.cmake index 3f715a2312..dad74e99b1 100644 --- a/indra/cmake/NDOF.cmake +++ b/indra/cmake/NDOF.cmake @@ -3,12 +3,12 @@ include(Prebuilt) use_prebuilt_binary(ndofdev) -if (WINDOWS OR DARWIN) +if (WINDOWS OR DARWIN OR LINUX) add_definitions(-DLIB_NDOF=1) -endif (WINDOWS OR DARWIN) +endif (WINDOWS OR DARWIN OR LINUX) if (WINDOWS) set(NDOF_LIBRARY libndofdev) -elseif (DARWIN) +elseif (DARWIN OR LINUX) set(NDOF_LIBRARY ndofdev) endif (WINDOWS) |