diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-04-24 14:51:14 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-04-24 14:51:14 +0100 |
| commit | 0439690efd5f31c779c55e25fc3ecea260eced63 (patch) | |
| tree | 90ae622e1b13ca3accdfb8f65ad190b020748e85 | |
| parent | c48e7478068f7e28f25ff06902922c9997df6f53 (diff) | |
| parent | c99904585be0cd6f6a239c3181fa3339a070ba14 (diff) | |
Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk
| -rw-r--r-- | indra/llaudio/CMakeLists.txt | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt index bfa2c34c12..e869b9717c 100644 --- a/indra/llaudio/CMakeLists.txt +++ b/indra/llaudio/CMakeLists.txt @@ -57,13 +57,11 @@ if (FMOD) llstreamingaudio_fmod.h ) - if (LINUX) - if (${CXX_VERSION_NUMBER} GREATER 419) - set_source_files_properties(llaudioengine_fmod.cpp - llstreamingaudio_fmod.cpp - COMPILE_FLAGS -Wno-write-strings) - endif (${CXX_VERSION_NUMBER} GREATER 419) - endif (LINUX) + if (LINUX OR DARWIN) + set_source_files_properties(llaudioengine_fmod.cpp + llstreamingaudio_fmod.cpp + COMPILE_FLAGS -Wno-write-strings) + endif (LINUX OR DARWIN) endif (FMOD) if (OPENAL) |