diff options
| author | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-03 20:42:11 +0100 |
|---|---|---|
| committer | Erik Schilling <ablu.erikschilling@googlemail.com> | 2013-02-03 22:45:28 +0100 |
| commit | 59a7bc4694a93aae668f2d68409a420a12e8d9fb (patch) | |
| tree | f6202e913064d28aea7f63dde37ecd39050b6a96 /src/CMakeLists.txt | |
| parent | 19d932391160ac75a05cda7f657ce2a271491935 (diff) | |
| download | manaserv-59a7bc4694a93aae668f2d68409a420a12e8d9fb.tar.gz manaserv-59a7bc4694a93aae668f2d68409a420a12e8d9fb.tar.xz manaserv-59a7bc4694a93aae668f2d68409a420a12e8d9fb.zip | |
Modifications to allow crosscompiling with mingw
Reviewed-by: bjorn.
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1d06c5d..c8752fb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -37,7 +37,7 @@ IF (MINGW) "<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> -O coff -o <OBJECT> <SOURCE>") ENDIF() -SET(FLAGS "-DPACKAGE_VERSION=\\\"${VERSION}\\\"") +SET(FLAGS "${FLAGS} -DPACKAGE_VERSION=\\\"${VERSION}\\\"") SET(FLAGS "${FLAGS} -DPKG_DATADIR=\\\"${PKG_DATADIR}/\\\"") SET(FLAGS "${FLAGS} -DLOCALEDIR=\\\"${LOCALEDIR}/\\\"") @@ -94,8 +94,8 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${PHYSFS_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR} - ${SigC++_INCLUDE_DIR} - ${SigC++Config_INCLUDE_DIR} + ${SIGC++_INCLUDE_DIR} + ${SIGC++Config_INCLUDE_DIR} ) # Fix some stuff that gets not hidden by mainline modules @@ -319,7 +319,7 @@ FOREACH(program ${PROGRAMS}) ${PHYSFS_LIBRARY} ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES} - ${SigC++_LIBRARIES} + ${SIGC++_LIBRARIES} ${OPTIONAL_LIBRARIES} ${EXTRA_LIBRARIES}) INSTALL(TARGETS ${program} RUNTIME DESTINATION ${PKG_BINDIR}) |