IMP-692: SNOW-713: Global objects in libllcommon duplicated in plugins

See http://jira.secondlife.com/browse/SNOW-713

This patch makes llcommon shared. It contains the following snowglobe
(SVN) changesets: 3478, 3479, 3480, 3481, 3482, 3485, 3496, 3498, 3500,
3519 and 3531, plus the fix for all rejects. Note that changes
to scripts/automated_build_scripts/opensrc-build.sh (changesets 3500
and 3625) were ignored as we don't have scripts/automated_build_scripts.

1 files changed, 3 insertions, 20 deletions

diff --git a/linden/indra/llcommon/CMakeLists.txt b/linden/indra/llcommon/CMakeLists.txt
index 7d001ae..5d590a9 100644
--- a/linden/indra/llcommon/CMakeLists.txt
+++ b/linden/indra/llcommon/CMakeLists.txt
@@ -4,6 +4,7 @@ project(llcommon)
 
 include(00-Common)
 include(LLCommon)
+include(Linking)
 
 include_directories(
     ${EXPAT_INCLUDE_DIRS}
@@ -192,31 +193,13 @@ set_source_files_properties(${llcommon_HEADER_FILES}
 
 list(APPEND llcommon_SOURCE_FILES ${llcommon_HEADER_FILES})
 
-add_library (llcommon ${llcommon_SOURCE_FILES})
+add_library (llcommon SHARED ${llcommon_SOURCE_FILES})
 target_link_libraries(
     llcommon
     ${APRUTIL_LIBRARIES}
     ${APR_LIBRARIES}
     ${EXPAT_LIBRARIES}
     ${ZLIB_LIBRARIES}
+    ${WINDOWS_LIBRARIES}
     )
 
-if(HAVE_64_BIT)
-        add_library (llcommonPIC ${llcommon_SOURCE_FILES})
-        add_dependencies(llcommonPIC prepare)
-
-        if(WINDOWS)
-                add_definitions(/FIXED:NO)
-        else(WINDOWS) # not windows therefore gcc LINUX and DARWIN
-                add_definitions(-fPIC)
-        endif(WINDOWS)
-        
-        target_link_libraries(
-                llcommonPIC
-                ${APRUTIL_LIBRARIES}
-                ${APR_LIBRARIES}
-                ${EXPAT_LIBRARIES}
-                ${ZLIB_LIBRARIES}
-                )
-endif(HAVE_64_BIT)
-