diff options
author | Jacek Antonelli | 2009-01-13 00:19:34 -0600 |
---|---|---|
committer | Jacek Antonelli | 2009-01-13 00:19:34 -0600 |
commit | 106b2a600c59404ef6bb95b77f8bbf271b659baa (patch) | |
tree | 4f9394f0ca34003347de3dffff40efd8a3a43c6c /linden/indra/cmake/NDOF.cmake | |
parent | Merge 1.1.0 alpha into quickfilter (diff) | |
parent | Merge commit 'mccabe/1.1.0a-gstreamer' into 1.1.0a (diff) | |
download | meta-impy-106b2a600c59404ef6bb95b77f8bbf271b659baa.zip meta-impy-106b2a600c59404ef6bb95b77f8bbf271b659baa.tar.gz meta-impy-106b2a600c59404ef6bb95b77f8bbf271b659baa.tar.bz2 meta-impy-106b2a600c59404ef6bb95b77f8bbf271b659baa.tar.xz |
Merge branch '1.1.0a-gstreamer' into next
Diffstat (limited to 'linden/indra/cmake/NDOF.cmake')
-rw-r--r-- | linden/indra/cmake/NDOF.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/cmake/NDOF.cmake b/linden/indra/cmake/NDOF.cmake index 3f715a2..dad74e9 100644 --- a/linden/indra/cmake/NDOF.cmake +++ b/linden/indra/cmake/NDOF.cmake | |||
@@ -3,12 +3,12 @@ include(Prebuilt) | |||
3 | 3 | ||
4 | use_prebuilt_binary(ndofdev) | 4 | use_prebuilt_binary(ndofdev) |
5 | 5 | ||
6 | if (WINDOWS OR DARWIN) | 6 | if (WINDOWS OR DARWIN OR LINUX) |
7 | add_definitions(-DLIB_NDOF=1) | 7 | add_definitions(-DLIB_NDOF=1) |
8 | endif (WINDOWS OR DARWIN) | 8 | endif (WINDOWS OR DARWIN OR LINUX) |
9 | 9 | ||
10 | if (WINDOWS) | 10 | if (WINDOWS) |
11 | set(NDOF_LIBRARY libndofdev) | 11 | set(NDOF_LIBRARY libndofdev) |
12 | elseif (DARWIN) | 12 | elseif (DARWIN OR LINUX) |
13 | set(NDOF_LIBRARY ndofdev) | 13 | set(NDOF_LIBRARY ndofdev) |
14 | endif (WINDOWS) | 14 | endif (WINDOWS) |