Added new define CAELUM_STATIC which will disable all dllexport for the caelum project. Made sure the define is set for both openmw and caelum.

CMakeLists.txt

@@ -232,6 +232,9 @@ add_subdirectory( extern/mygui_3.0.1 )
 # MyGUI: extern/mygui_3.0.0/
 add_definitions(-DMYGUI_STATIC)
 
+# Caelum: extern/caelum/
+add_definitions(-DCAELUM_STATIC)
+
 # Specify build paths
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${OpenMW_BINARY_DIR}")

extern/caelum/CMakeLists.txt

@@ -4,7 +4,7 @@ IF(MSVC)
     add_definitions("-D_SCL_SECURE_NO_WARNINGS /wd4305 /wd4244" )
 ENDIF(MSVC)
 
-ADD_DEFINITIONS(-DCAELUM_LIB)
+ADD_DEFINITIONS(-DCAELUM_STATIC)
 INCLUDE_DIRECTORIES( 
     ${CMAKE_HOME_DIRECTORY}/extern/caelum/include 
     ${OGRE_INCLUDE_DIR}/Ogre

extern/caelum/include/CaelumPrerequisites.h

@@ -32,7 +32,10 @@ along with Caelum. If not, see <http://www.gnu.org/licenses/>.
 
 // Define the dll export qualifier if compiling for Windows
 #if OGRE_PLATFORM == OGRE_PLATFORM_WIN32
-	#ifdef CAELUM_LIB
+	#ifdef CAELUM_STATIC
+        // Don't use dll export qualifier when built as a static lib
+		#define CAELUM_EXPORT
+	#elif CAELUM_LIB
 		#define CAELUM_EXPORT __declspec (dllexport)
 	#else
 		#ifdef __MINGW32__