diff options
| author |  Fabio Bas | 2008-05-28 14:12:04 +0000 |
|---|---|---|
| committer | Fabio Bas | 2008-05-28 14:12:04 +0000 |
| commit | fcd99675ce751f1aaea2dd962f3caaba40aa6ade (patch) | |
| tree | ce9e3fddd74cb3374af7f7174cbdc337578d63bf /src/kvilib | |
| parent | another compilation fix (diff) | |
| download | KVIrc-fcd99675ce751f1aaea2dd962f3caaba40aa6ade.tar.gz KVIrc-fcd99675ce751f1aaea2dd962f3caaba40aa6ade.tar.bz2 KVIrc-fcd99675ce751f1aaea2dd962f3caaba40aa6ade.zip | |
Fixed kvilib and kvirc compilation/linking under mingw32; now kvirc-mingw runs :)
(still todo: modules and install rules)
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1862 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/kvilib')
| -rw-r--r-- | src/kvilib/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/kvilib/config/kvi_settings.h | 21 | ||||
| -rw-r--r-- | src/kvilib/core/kvi_malloc.h | 2 | ||||
| -rw-r--r-- | src/kvilib/core/kvi_memmove.h | 2 | ||||
| -rw-r--r-- | src/kvilib/ext/kvi_crypt.cpp | 2 |
5 files changed, 26 insertions, 8 deletions
diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt index 451a6566e..911bfe6cd 100644 --- a/src/kvilib/CMakeLists.txt +++ b/src/kvilib/CMakeLists.txt @@ -209,10 +209,15 @@ IF(WANT_COEXISTENCE) ELSE() SET(KVILIB_BINARYNAME kvilib) ENDIF() +
+#we need this defined when mingw will compile moc files
+IF(MINGW)
+ ADD_DEFINITIONS(-D__KVILIB__)
+ENDIF()
ADD_LIBRARY(${KVILIB_BINARYNAME} SHARED ${kvilib_SRCS} ${kvilib_MOC_SRCS}) TARGET_LINK_LIBRARIES(${KVILIB_BINARYNAME} ${LIBS}) - +
# Installation directives SET_TARGET_PROPERTIES(${KVILIB_BINARYNAME} PROPERTIES VERSION ${VERSION_RELEASE} SOVERSION ${VERSION_MAJOR}) IF(UNIX) diff --git a/src/kvilib/config/kvi_settings.h b/src/kvilib/config/kvi_settings.h index d5070f652..44726054c 100644 --- a/src/kvilib/config/kvi_settings.h +++ b/src/kvilib/config/kvi_settings.h @@ -58,7 +58,23 @@ #else
#ifdef MINGW #define COMPILE_ON_MINGW
- #define COMPILE_NO_X + #define COMPILE_NO_X
+ #define COMPILE_WITH_SYSTEM_MEMMOVE
+
+ #ifdef __KVILIB__ + #define KVILIB_API __declspec(dllexport) + #else + #define KVILIB_API __declspec(dllimport) + #endif +
+ #ifdef __KVIRC__ + #define KVIRC_API __declspec(dllexport) + #else + #define KVIRC_API __declspec(dllimport) + #endif + #else
+ #define KVILIB_API + #define KVIRC_API #endif #ifdef Q_OS_MACX @@ -92,9 +108,6 @@ #endif #endif - #define KVILIB_API - #define KVIRC_API - #endif #ifndef COMPILE_USE_QT4 diff --git a/src/kvilib/core/kvi_malloc.h b/src/kvilib/core/kvi_malloc.h index 09f187bdb..0ce3c3e5c 100644 --- a/src/kvilib/core/kvi_malloc.h +++ b/src/kvilib/core/kvi_malloc.h @@ -35,7 +35,7 @@ #ifdef COMPILE_MEMORY_PROFILE - #ifdef COMPILE_ON_WINDOWS + #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #error "This stuff should be never compiled on Windows" #endif diff --git a/src/kvilib/core/kvi_memmove.h b/src/kvilib/core/kvi_memmove.h index 71877a102..e220808d1 100644 --- a/src/kvilib/core/kvi_memmove.h +++ b/src/kvilib/core/kvi_memmove.h @@ -46,7 +46,7 @@ #else - #ifdef COMPILE_ON_WINDOWS + #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #error "This stuff should be never compiled on Windows" #endif diff --git a/src/kvilib/ext/kvi_crypt.cpp b/src/kvilib/ext/kvi_crypt.cpp index 53679f062..3dd689daa 100644 --- a/src/kvilib/ext/kvi_crypt.cpp +++ b/src/kvilib/ext/kvi_crypt.cpp @@ -27,7 +27,7 @@ #include "kvi_crypt.h" #include "kvi_locale.h" -#ifdef COMPILE_ON_WINDOWS +#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW) #include "kvi_malloc.h" #endif |