summaryrefslogtreecommitdiff
path: root/indra/llplugin
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2010-10-11 08:59:19 -0400
committerOz Linden <oz@lindenlab.com>2010-10-11 08:59:19 -0400
commite2e70577f90d9551f4afe637bfd486654d778e5e (patch)
tree831de0c3fa62bc84d7e67f8c5041976efb60d84d /indra/llplugin
parentecbc00351aed97cfe2f87267789732ff00c2333b (diff)
parentbb74487c859acccb8f88002630606419761136e4 (diff)
merged fix for STORM-222
Diffstat (limited to 'indra/llplugin')
-rw-r--r--indra/llplugin/CMakeLists.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt
index fdd510b389..d3a73058c4 100644
--- a/indra/llplugin/CMakeLists.txt
+++ b/indra/llplugin/CMakeLists.txt
@@ -51,6 +51,14 @@ set(llplugin_HEADER_FILES
set_source_files_properties(${llplugin_HEADER_FILES}
PROPERTIES HEADER_FILE_ONLY TRUE)
+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)
+
list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES})
add_library (llplugin ${llplugin_SOURCE_FILES})