Changeset 7143 for code/branches/presentation3/src

Timestamp:

Jun 10, 2010, 1:44:21 PM (14 years ago)

Author:

rgrieder

Message:

Static linking to the libraries in src/external should work now (at least on Windows with MSVC).
There are no STATIC/SHARED options anymore. Instead all of our own libraries get linked dynamically anyway because it simply doesn't work otherwise (there is really no way to link them statically).
The linking behaviour for external libraries can be changed with the CMake cache variable ORXONOX_EXTERNAL_LINK_MODE, but it defaults to SHARED.
Also, I had to revert the DEFINE_SYMBOL changes.

Location:

code/branches/presentation3/src

Files:

• CMakeLists.txt (modified) (2 diffs)
• OrxonoxConfig.cmake (modified) (1 diff)
• external/ceguilua/CMakeLists.txt (modified) (1 diff)
• external/ogreceguirenderer/CMakeLists.txt (modified) (1 diff)
• external/ois/CMakeLists.txt (modified) (1 diff)
• external/tolua/CMakeLists.txt (modified) (1 diff)

code/branches/presentation3/src/CMakeLists.txt

@@ -31 +31 @@
 INCLUDE(OrxonoxConfig.cmake)
 
-################ Library Defines ################
+####### Library Behaviour (dependencies) ########
 
 # Disable Boost auto linking completely
@@ -46 +46 @@
 ADD_COMPILER_FLAGS("-DSTATIC_BUILD"       WIN32 NOT LINK_TCL_DYNAMIC)
 
+######### Library Behaviour (external) ##########
+
 # Use TinyXML++
 ADD_COMPILER_FLAGS("-DTIXML_USE_TICPP")
+
+# Default linking for externals is SHARED
+SET(ORXONOX_EXTERNAL_LINK_MODE SHARED CACHE STRING "Link mode for external libraries that we build ourselves. Note: on Windows, some libraries cannot be linked shared.")
+
+IF(ORXONOX_EXTERNAL_LINK_MODE STREQUAL "SHARED")
+  SET(_external_shared_link TRUE)
+ELSE()
+  SET(_external_shared_link FALSE)
+ENDIF()
+# If no defines are specified, these libs get linked dynamically
+ADD_COMPILER_FLAGS("-DCEGUILUA_STATIC"             WIN32 NOT _external_shared_link)
+ADD_COMPILER_FLAGS("-DOGRE_GUIRENDERER_STATIC_LIB" WIN32 NOT _external_shared_link)
+ADD_COMPILER_FLAGS("-DOIS_STATIC_LIB"              WIN32 NOT _external_shared_link)
+ADD_COMPILER_FLAGS("-DTOLUA_STATIC_BUILD"          WIN32 NOT _external_shared_link)
 
 ############## Include Directories ##############

code/branches/presentation3/src/OrxonoxConfig.cmake

@@ -27 +27 @@
 
 #################### Options ####################
-
-# Default linking is SHARED
-SET(ORXONOX_DEFAULT_LINK SHARED)
 
 # Use, i.e. don't skip the full RPATH for the build tree

code/branches/presentation3/src/external/ceguilua/CMakeLists.txt

@@ -75 +75 @@
   NO_SOURCE_GROUPS
   DEFINE_SYMBOL
-    shared "CEGUILUA_EXPORTS" static "CEGUILUA_STATIC"
+    "CEGUILUA_EXPORTS"
   VERSION
     ${CEGUI_VERSION}

code/branches/presentation3/src/external/ogreceguirenderer/CMakeLists.txt

@@ -32 +32 @@
 ORXONOX_ADD_LIBRARY(ogreceguirenderer_orxonox
   ORXONOX_EXTERNAL
+  DEFINE_SYMBOL
+    "OGRE_GUIRENDERER_EXPORTS"
+  VERSION
+    1.4.9
   LINK_LIBRARIES
     ${OGRE_LIBRARY}
     ${CEGUI_LIBRARY}
-  DEFINE_SYMBOL
-    shared "OGRE_GUIRENDERER_EXPORTS" static "OGRE_GUIRENDERER_STATIC_LIB"
-  VERSION
-    1.4.9
   SOURCE_FILES
     ${OCR_FILES}

code/branches/presentation3/src/external/ois/CMakeLists.txt

@@ -57 +57 @@
   ORXONOX_EXTERNAL
   DEFINE_SYMBOL
-    shared "OIS_NONCLIENT_BUILD" static "OIS_STATIC_LIB"
+    "OIS_NONCLIENT_BUILD"
   VERSION
     1.2

code/branches/presentation3/src/external/tolua/CMakeLists.txt

@@ -35 +35 @@
   ORXONOX_EXTERNAL
   DEFINE_SYMBOL
-    shared "TOLUA_SHARED_BUILD" static "TOLUA_STATIC_BUILD"
+    "TOLUA_SHARED_BUILD"
   VERSION
     1.0.92