teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

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.

Browse source
This commit is contained in:
Jan Borsodi 2010-09-14 12:34:02 +02:00
parent 4416e71a0a
commit e34b86e5c2
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

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

2
extern/caelum/CMakeLists.txt vendored
View file

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

5
extern/caelum/include/CaelumPrerequisites.h vendored
View file

@ -32,7 +32,10 @@ along with Caelum. If not, see <http://www.gnu.org/licenses/>.
// Define the dll export qualifier if compiling for Windows // Define the dll export qualifier if compiling for Windows
#if OGRE_PLATFORM == OGRE_PLATFORM_WIN32 #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) #define CAELUM_EXPORT __declspec (dllexport)
#else #else
#ifdef __MINGW32__ #ifdef __MINGW32__