diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-04-24 14:50:33 +0100 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-04-24 14:50:33 +0100 |
| commit | c99904585be0cd6f6a239c3181fa3339a070ba14 (patch) | |
| tree | 82fe933ed1266b318c41b4dcea3ace47abe71043 | |
| parent | e82ed4e8761be902cf3a4d80c337e0cd44d41b17 (diff) | |
EXT-7005 : Kill unhelpful 'Deprecated conversion from string to char *' warnings from fmod_errors.h when building with GCC >=4.2 on Darwin
Apply -Wno-write-strings compile flag to llaudioengine_fmod.cpp and llstreamingaudio_fmod.cpp on Darwin as it was on Linux (Amen).
Removed unnecessary check for GCC >= 4.2 when applying this flag, as CXX_VERSION_NUMBER it used is only being generated in 00-Common.cmake on Linux at the moment and 4.0 understands -Wno-write-strings anyway.
| -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) |