Changeset 7143 for code/branches/presentation3/src/external

Timestamp:

Jun 10, 2010, 1:44:21 PM (15 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/external

Files:

• ceguilua/CMakeLists.txt (modified) (1 diff)
• ogreceguirenderer/CMakeLists.txt (modified) (1 diff)
• ois/CMakeLists.txt (modified) (1 diff)
• tolua/CMakeLists.txt (modified) (1 diff)

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