summaryrefslogtreecommitdiff
path: root/indra/media_plugins/base
diff options
context:
space:
mode:
authorBoroondas Gupte <hg@boroon.dasgupta.ch>2010-09-16 13:51:15 +0200
committerBoroondas Gupte <hg@boroon.dasgupta.ch>2010-09-16 13:51:15 +0200
commit970ce1e1626c205302c4085610819571c1ce79f4 (patch)
tree76884f2cca1067f0ca90a397ae75fddb257f6d6e /indra/media_plugins/base
parent1dbcc3fff79b55038178e493df0cc0c3a4d66221 (diff)
parent58c08f7c2cc33c4bf9ef688f0d4a87909ebb9250 (diff)
Merged VWR-23047 (SNOW-512, -fPIC for 64bit) and follow-ups (VWR-20911 & SNOW-748)
Diffstat (limited to 'indra/media_plugins/base')
-rw-r--r--indra/media_plugins/base/CMakeLists.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/media_plugins/base/CMakeLists.txt b/indra/media_plugins/base/CMakeLists.txt
index f8d2dabc6c..3ad94b0c64 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 WORD_SIZE EQUAL 32)
+ if(WINDOWS)
+ add_definitions(/FIXED:NO)
+ else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
+ add_definitions(-fPIC)
+ endif(WINDOWS)
+endif(NOT WORD_SIZE EQUAL 32)
+
set(media_plugin_base_SOURCE_FILES
media_plugin_base.cpp
)