diff options
| author | Boroondas Gupte (daggyfied changeset by Techwolf Lupindo, original fix by Robin Cornelius) <hg@boroon.dasgupta.ch> | 2010-09-16 13:26:45 +0200 |
|---|---|---|
| committer | Boroondas Gupte (daggyfied changeset by Techwolf Lupindo, original fix by Robin Cornelius) <hg@boroon.dasgupta.ch> | 2010-09-16 13:26:45 +0200 |
| commit | 88e7a631b3e4c3d63aa80fe9b3e7f2595d3f45f8 (patch) | |
| tree | 8697a88d56b141c843312d956f268b8d6329a867 /indra/media_plugins | |
| parent | 18bdeb3d0e5ef4e5b014b41a8003569061e00910 (diff) | |
SNOW-512/SNOW-287: Build of LLPlugin fails on 64bit linux due to non PIC code linking into the DSO
Formatting, cleanup, and one minor change by Techwolf Lupindo.
Minor change was a move of the hunk in
indra/media_plugins/webkit/CmakeLists.txt to same area as the other plugins CmakeLists.txt files.
daggyfied version of https://bitbucket.org/Techwolf/viewer-development/changeset/00bd21962052
Diffstat (limited to 'indra/media_plugins')
| -rw-r--r-- | indra/media_plugins/base/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | indra/media_plugins/example/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | indra/media_plugins/gstreamer010/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | indra/media_plugins/webkit/CMakeLists.txt | 8 |
4 files changed, 32 insertions, 0 deletions
diff --git a/indra/media_plugins/base/CMakeLists.txt b/indra/media_plugins/base/CMakeLists.txt index f8d2dabc6c..16fd024139 100644 --- a/indra/media_plugins/base/CMakeLists.txt +++ b/indra/media_plugins/base/CMakeLists.txt @@ -25,6 +25,14 @@ include_directories( ### media_plugin_base +if(NOT CMAKE_SIZEOF_VOID_P MATCHES 4) + if(WINDOWS) + add_definitions(/FIXED:NO) + else(WINDOWS) # not windows therefore gcc LINUX and DARWIN + add_definitions(-fPIC) + endif(WINDOWS) +endif (NOT CMAKE_SIZEOF_VOID_P MATCHES 4) + set(media_plugin_base_SOURCE_FILES media_plugin_base.cpp ) diff --git a/indra/media_plugins/example/CMakeLists.txt b/indra/media_plugins/example/CMakeLists.txt index 4d82f2747c..7e4cdb0daf 100644 --- a/indra/media_plugins/example/CMakeLists.txt +++ b/indra/media_plugins/example/CMakeLists.txt @@ -29,6 +29,14 @@ include_directories( ### media_plugin_example +if(NOT CMAKE_SIZEOF_VOID_P MATCHES 4) + if(WINDOWS) + add_definitions(/FIXED:NO) + else(WINDOWS) # not windows therefore gcc LINUX and DARWIN + add_definitions(-fPIC) + endif(WINDOWS) +endif (NOT CMAKE_SIZEOF_VOID_P MATCHES 4) + set(media_plugin_example_SOURCE_FILES media_plugin_example.cpp ) diff --git a/indra/media_plugins/gstreamer010/CMakeLists.txt b/indra/media_plugins/gstreamer010/CMakeLists.txt index 3b73e04786..d6d697ba81 100644 --- a/indra/media_plugins/gstreamer010/CMakeLists.txt +++ b/indra/media_plugins/gstreamer010/CMakeLists.txt @@ -30,6 +30,14 @@ include_directories( ### media_plugin_gstreamer010 +if(NOT CMAKE_SIZEOF_VOID_P MATCHES 4) + if(WINDOWS) + add_definitions(/FIXED:NO) + else(WINDOWS) # not windows therefore gcc LINUX and DARWIN + add_definitions(-fPIC) + endif(WINDOWS) +endif (NOT CMAKE_SIZEOF_VOID_P MATCHES 4) + set(media_plugin_gstreamer010_SOURCE_FILES media_plugin_gstreamer010.cpp llmediaimplgstreamer_syms.cpp diff --git a/indra/media_plugins/webkit/CMakeLists.txt b/indra/media_plugins/webkit/CMakeLists.txt index 5bccd589d8..2073ee00de 100644 --- a/indra/media_plugins/webkit/CMakeLists.txt +++ b/indra/media_plugins/webkit/CMakeLists.txt @@ -29,6 +29,14 @@ include_directories( ### media_plugin_webkit +if(NOT CMAKE_SIZEOF_VOID_P MATCHES 4) + if(WINDOWS) + add_definitions(/FIXED:NO) + else(WINDOWS) # not windows therefore gcc LINUX and DARWIN + add_definitions(-fPIC) + endif(WINDOWS) +endif (NOT CMAKE_SIZEOF_VOID_P MATCHES 4) + set(media_plugin_webkit_SOURCE_FILES media_plugin_webkit.cpp ) |