aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorJacek Antonelli2008-10-17 22:10:52 -0500
committerJacek Antonelli2008-10-17 22:23:57 -0500
commitd3e601b407d0e439bf810e16de1e4ffd40001aaa (patch)
tree92fb38f0551ff4d956d8c6229f8f05954be821d3 /linden
parentUse FMOD_LIBRARY variable. It's there for a reason. (diff)
downloadmeta-impy-d3e601b407d0e439bf810e16de1e4ffd40001aaa.zip
meta-impy-d3e601b407d0e439bf810e16de1e4ffd40001aaa.tar.gz
meta-impy-d3e601b407d0e439bf810e16de1e4ffd40001aaa.tar.bz2
meta-impy-d3e601b407d0e439bf810e16de1e4ffd40001aaa.tar.xz
Disable fmod by default.
You can give -DFMOD=ON at configure time to turn it on.
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/cmake/FMOD.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/cmake/FMOD.cmake b/linden/indra/cmake/FMOD.cmake
index 759b8f1..e9f483a 100644
--- a/linden/indra/cmake/FMOD.cmake
+++ b/linden/indra/cmake/FMOD.cmake
@@ -7,6 +7,7 @@ if(INSTALL_PROPRIETARY)
7 use_prebuilt_binary(fmod) 7 use_prebuilt_binary(fmod)
8endif(INSTALL_PROPRIETARY) 8endif(INSTALL_PROPRIETARY)
9 9
10if (FMOD)
10find_library(FMOD_LIBRARY_RELEASE 11find_library(FMOD_LIBRARY_RELEASE
11 NAMES fmod fmodvc fmod-3.75 12 NAMES fmod fmodvc fmod-3.75
12 PATHS 13 PATHS
@@ -18,6 +19,7 @@ find_library(FMOD_LIBRARY_DEBUG
18 PATHS 19 PATHS
19 ${ARCH_PREBUILT_DIRS_DEBUG} 20 ${ARCH_PREBUILT_DIRS_DEBUG}
20 ) 21 )
22endif (FMOD)
21 23
22if (FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG) 24if (FMOD_LIBRARY_RELEASE AND FMOD_LIBRARY_DEBUG)
23 set(FMOD_LIBRARY 25 set(FMOD_LIBRARY