diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-15 13:13:24 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-06-15 13:13:24 +0100 |
| commit | 2fc77b8ee8184fe10c9f4da6ad79d80e89dc8a6b (patch) | |
| tree | f2a1098ba8e556a9b2b91b80daffa4304b40dfb2 | |
| parent | c21c192d0c65e0e9b506e08a918d700a1e400725 (diff) | |
VWR-19683 llmediaimplgstreamervidplug gcc 4.4 build errors
| -rw-r--r-- | doc/contributions.txt | 2 | ||||
| -rw-r--r-- | indra/media_plugins/gstreamer010/CMakeLists.txt | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index a74cf32afa..8c6bd5e0fe 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -185,6 +185,8 @@ Dale Glass VWR-2502 VWR-1358 VWR-2041 +Drew Dri + VWR-19683 Drewan Keats VWR-28 VWR-248 diff --git a/indra/media_plugins/gstreamer010/CMakeLists.txt b/indra/media_plugins/gstreamer010/CMakeLists.txt index 3b73e04786..9f0ff654fc 100644 --- a/indra/media_plugins/gstreamer010/CMakeLists.txt +++ b/indra/media_plugins/gstreamer010/CMakeLists.txt @@ -42,12 +42,12 @@ set(media_plugin_gstreamer010_HEADER_FILES llmediaimplgstreamertriviallogging.h ) -if (${CXX_VERSION_NUMBER} MATCHES "4[23].") +if (${CXX_VERSION_NUMBER} MATCHES "4[23456789].") # Work around a bad interaction between broken gstreamer headers and - # g++ 4.3's increased strictness. + # g++ >= 4.2's increased strictness. set_source_files_properties(llmediaimplgstreamervidplug.cpp PROPERTIES COMPILE_FLAGS -Wno-write-strings) -endif (${CXX_VERSION_NUMBER} MATCHES "4[23].") +endif (${CXX_VERSION_NUMBER} MATCHES "4[23456789].") add_library(media_plugin_gstreamer010 SHARED |