diff options
| author |  Fabio Bas | 2008-05-28 15:03:06 +0000 |
|---|---|---|
| committer | Fabio Bas | 2008-05-28 15:03:06 +0000 |
| commit | 15143e16538fdfa31dff1ff9b3d566decd3eec34 (patch) | |
| tree | ceb03c94edcdcf62408217f765d82e19c6a4d54c | |
| parent | Fixed kvilib and kvirc compilation/linking under mingw32; now kvirc-mingw run... (diff) | |
| download | KVIrc-15143e16538fdfa31dff1ff9b3d566decd3eec34.tar.gz KVIrc-15143e16538fdfa31dff1ff9b3d566decd3eec34.tar.bz2 KVIrc-15143e16538fdfa31dff1ff9b3d566decd3eec34.zip | |
mingw32: added proper rules to permit modules compilation/linking
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1863 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | cmake/module.rules.txt | 12 | ||||
| -rw-r--r-- | src/kvirc/CMakeLists.txt | 1 |
2 files changed, 11 insertions, 2 deletions
diff --git a/cmake/module.rules.txt b/cmake/module.rules.txt index 97fe637ae..655fd2c8b 100644 --- a/cmake/module.rules.txt +++ b/cmake/module.rules.txt @@ -1,12 +1,20 @@ # Template rules for modules IF(WANT_COEXISTENCE) + SET(KVIRC_BINARYNAME ${PACKAGE}${VERSION_MAJOR}) SET(KVILIB_BINARYNAME kvilib${VERSION_MAJOR}) ELSE() + SET(KVIRC_BINARYNAME ${PACKAGE}) SET(KVILIB_BINARYNAME kvilib) ENDIF() -ADD_LIBRARY(${kvi_module_name} MODULE ${${kvi_module_name}_SRCS} ${${kvi_module_name}_MOC_SRCS}) -TARGET_LINK_LIBRARIES(${kvi_module_name} ${KVILIB_BINARYNAME} ${LIBS}) +ADD_LIBRARY(${kvi_module_name} MODULE ${${kvi_module_name}_SRCS} ${${kvi_module_name}_MOC_SRCS})
+
+IF(MINGW)
+ SET_TARGET_PROPERTIES(${kvi_module_name} PROPERTIES LINK_FLAGS "-Wl,--enable-auto-import,--enable-runtime-pseudo-reloc")
+ TARGET_LINK_LIBRARIES(${kvi_module_name} ${KVILIB_BINARYNAME} ${KVIRC_BINARYNAME} ${LIBS})
+ELSE()
+ TARGET_LINK_LIBRARIES(${kvi_module_name} ${KVILIB_BINARYNAME} ${LIBS})
+ENDIF()
IF(UNIX) IF(APPLE) diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt index 0a5160af6..9fad70441 100644 --- a/src/kvirc/CMakeLists.txt +++ b/src/kvirc/CMakeLists.txt @@ -451,6 +451,7 @@ TARGET_LINK_LIBRARIES(${KVIRC_BINARYNAME} ${KVILIB_BINARYNAME} ${LIBS}) IF(MINGW)
SET_TARGET_PROPERTIES(${KVIRC_BINARYNAME} PROPERTIES LINK_FLAGS "-Wl,--enable-auto-import,--enable-runtime-pseudo-reloc")
+ SET_TARGET_PROPERTIES(${KVIRC_BINARYNAME} PROPERTIES ENABLE_EXPORTS ON)
ENDIF()
# Installation directives |