win32/mingw/cmake: fixed compilation and linking of kvilib and kvirc.

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1854 17fca916-40b9-46aa-a4ea-0a15b648b75c

27 files changed, 100 insertions, 103 deletions

diff --git a/src/kvilib/config/kvi_settings.h b/src/kvilib/config/kvi_settings.h
index 3e6045d9b..d5070f652 100644
--- a/src/kvilib/config/kvi_settings.h
+++ b/src/kvilib/config/kvi_settings.h
@@ -57,7 +57,8 @@
 	#endif
 #else

 	#ifdef MINGW
-		#define COMPILE_ON_MINGW
+		#define COMPILE_ON_MINGW

+                #define COMPILE_NO_X
 	#endif
 
 	#ifdef Q_OS_MACX
diff --git a/src/kvilib/system/kvi_library.h b/src/kvilib/system/kvi_library.h
index 591072e54..85d544fa6 100644
--- a/src/kvilib/system/kvi_library.h
+++ b/src/kvilib/system/kvi_library.h
@@ -62,7 +62,7 @@
 
 	inline void * kvi_library_symbol(kvi_library_t lib,const char * symName)
 	{
-		return GetProcAddress(lib,symName);
+		return (void *) GetProcAddress(lib,symName);
 	};
 
 	inline const char * kvi_library_error()
diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt
index a49dd9ca0..be41215a2 100644
--- a/src/kvirc/CMakeLists.txt
+++ b/src/kvirc/CMakeLists.txt
@@ -443,7 +443,10 @@ ADD_EXECUTABLE(${KVIRC_BINARYNAME} ${kvirc_SRCS} ${kvirc_MOC_SRCS})
 
 # Link libraries
 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")

+ENDIF()
 # Installation directives
 IF(UNIX)
 	IF(APPLE)
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index 000ab37a2..3ebbd28ee 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -195,7 +195,7 @@ void KviApp::setup()
 	// Initialize the random number generator
 	::srand(::time(0));
 
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	// setup winsock.dll
 	WSADATA w;
 	WSAStartup(MAKELONG((unsigned short)2,(unsigned short)0),&w);
@@ -621,7 +621,7 @@ KviApp::~KviApp()
 	saveActions();
 	KviActionManager::done();
 
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	WSACleanup();
 #endif
 
@@ -717,7 +717,7 @@ void KviApp::loadDefaultScript()
 	getGlobalKvircDirectory(cmd,KviApp::DefScript,"default.kvs");
 	cmd.prepend("parse \"");
 	cmd.append("\"");
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	cmd.replace("\\","\\\\");
 #endif
 	KviKvsScript::run(cmd,g_pFrame->firstConsole());
diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp
index 367df2cc9..6b89bd642 100644
--- a/src/kvirc/kernel/kvi_app_fs.cpp
+++ b/src/kvirc/kernel/kvi_app_fs.cpp
@@ -264,11 +264,11 @@ void KviApp::completeDirectory(const QString &word,KviPointerList<QString> * mat
 		{
 			delete t;
 		} else {
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 			if(KviQString::equalCIN(szFile,*t,szFile.length()))
-#else //!COMPILE_ON_WINDOWS
+#else
 			if(KviQString::equalCSN(szFile,*t,szFile.length()))
-#endif //COMPILE_ON_WINDOWS
+#endif
 			{
 				t->prepend(szDir);
 				t->append(KVI_PATH_SEPARATOR_CHAR);
@@ -284,11 +284,11 @@ void KviApp::completeDirectory(const QString &word,KviPointerList<QString> * mat
 	for(it = sl.begin();it != sl.end();++it)
 	{
 		QString * t = new QString(*it);
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 			if(KviQString::equalCIN(szFile,*t,szFile.length()))
-#else //!COMPILE_ON_WINDOWS
+#else
 			if(KviQString::equalCSN(szFile,*t,szFile.length()))
-#endif //COMPILE_ON_WINDOWS
+#endif
 		{
 			t->prepend(szDir);
 			matches->append(t);
diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp
index f0380bf4e..3b6612c80 100644
--- a/src/kvirc/kernel/kvi_app_setup.cpp
+++ b/src/kvirc/kernel/kvi_app_setup.cpp
@@ -39,9 +39,11 @@
 #include "kvi_sourcesdate.h"
 #include "kvi_iconmanager.h"
 #include "kvi_config.h"
-
-#ifndef COMPILE_ON_WINDOWS
-
+

+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)

+	#include <shlwapi.h>
+	#include <windows.h> // at least for GetModuleFileName and *PrivateProfileString
+#else
 	#include <stdlib.h> // for getenv()
 	#include <unistd.h> // for symlink() <-- unused ?
 
@@ -50,13 +52,7 @@
 		#include <KConfigGroup>
 //		#include <kstddirs.h>
 	#endif
-
-#else
-
-	#include <shlwapi.h>
-	#include <windows.h> // at least for GetModuleFileName and *PrivateProfileString
-
-#endif //COMPILE_ON_WINDOWS
+#endif
 
 #include <QTextCodec>
 #include <QFile>
@@ -103,7 +99,7 @@ bool KviApp::checkLocalKvircDirectory(const QString szDir)
 
 bool KviApp::checkFileAssociations()
 {
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 #define QUERY_BUFFER 2048
 	char* buffer;
 	DWORD len = QUERY_BUFFER;
@@ -255,7 +251,7 @@ bool KviApp::checkFileAssociations()
 
 bool KviApp::checkUriAssociations(const char * proto)
 {
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 #define QUERY_BUFFER 2048
 	char* buffer;
 	DWORD len = QUERY_BUFFER;
@@ -350,7 +346,7 @@ bool KviApp::checkUriAssociations(const char * proto)
 
 void KviApp::setupUriAssociations(const char * proto)
 {
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	HKEY hKey;
 	DWORD err;
 
@@ -388,7 +384,7 @@ void KviApp::setupUriAssociations(const char * proto)
 
 void KviApp::setupFileAssociations()
 {
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	HKEY hKey;
 	DWORD err;
 
@@ -491,8 +487,8 @@ void KviApp::setupFileAssociations()
 //#ifdef BRAIN_DAMAGED_AUTHOR_PARANOIA
 //#define I_DO_NOT_WANT_TO_HEAR_IT_ANYMORE_THAT_KVIRC_CAN_NOT_FIND_THE_BASE_PIXMAPS
 
-// search paths for Unix-like platforms
-#ifndef COMPILE_ON_WINDOWS
+// search paths for Unix-like platforms

+#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
 	const char * usualKvircGlobalPrePath[]=
 	{
 		"/usr/local",       "/opt/kde",       "/usr",
@@ -514,7 +510,7 @@ void KviApp::setupFileAssociations()
 		"/kvirc/share/",            0
 	};
 
-#endif //!COMPILE_ON_WINDOWS
+#endif
 
 //#endif //BRAIN_DAMAGED_AUTHOR_PARANOIA
 
@@ -528,7 +524,7 @@ void KviApp::findGlobalKvircDirectory()
 	if(checkGlobalKvircDirectory(m_szGlobalKvircDir))return;
 #endif //GLOBAL_KVIRC_DIR
 
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 
 	m_szGlobalKvircDir = applicationDirPath();
 	KviFileUtils::adjustFilePath(m_szGlobalKvircDir);
@@ -538,7 +534,7 @@ void KviApp::findGlobalKvircDirectory()
 			"The usual path for this directory is c:\\kvirc\\" KVI_VERSION_BRANCH "\\.\n"\
 			"I have tried %Q, but it seemed to fail\n" \
 			"Trying to run anyway...\n",&m_szGlobalKvircDir);
-#else // !COMPILE_ON_WINDOWS
+#else
 
 	// Since I had many problems with it
 	// because of strange distributions or KDEDIRS
@@ -633,7 +629,7 @@ void KviApp::findGlobalKvircDirectory()
 				"shipped with the kvirc source dirstribution.\n"\
 				"Trying to run anyway...\n");
 	#endif //!COMPILE_ON_MAC
-#endif //!COMPILE_ON_WINDOWS
+#endif
 }
 
 
@@ -663,7 +659,7 @@ bool KviApp::findLocalKvircDirectory()
 	}
 #endif //COMPILE_KDE_SUPPORT
 
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	if(KviFileUtils::fileExists(g_pApp->applicationDirPath()+KVI_PATH_SEPARATOR_CHAR+"portable")) {
 		m_szLocalKvircDir=g_pApp->applicationDirPath()+KVI_PATH_SEPARATOR_CHAR+"Settings";
 		if(checkLocalKvircDirectory(m_szLocalKvircDir)) return true;
@@ -735,7 +731,7 @@ void KviApp::setupBegin()
 	QString szSetupLib;
 	getGlobalKvircDirectory(szSetupLib,KviApp::Modules);
 	KviQString::ensureLastCharIs(szSetupLib,KVI_PATH_SEPARATOR_CHAR);
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	szSetupLib.append("kvisetup.dll");
 #else
 	szSetupLib.append("libkvisetup.so");
@@ -746,7 +742,7 @@ void KviApp::setupBegin()
 		KviMessageBox::warning(__tr2qs("Ops...it looks like I can't load modules on this sytem.\n" \
 			"I have been looking for the %s library but I haven't been able to load it\n" \
 			"due to the following error: \"%s\"\nAborting."),szSetupLib.toUtf8().data(),kvi_library_error());
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 		ExitProcess(-1);
 #else
 		::exit(-1);
@@ -759,7 +755,7 @@ void KviApp::setupBegin()
 		KviMessageBox::warning(__tr2qs("Ops...it looks like you have a broken distribution.\n" \
 			"The setup module does not export the \"setup_begin\" function.\n" \
 			"Aborting!"));
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 		ExitProcess(-1);
 #else
 		::exit(-1);
@@ -771,11 +767,11 @@ void KviApp::setupBegin()
 	if(!bRet)
 	{
 		KviMessageBox::warning(__tr2qs("Setup aborted"));
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 		ExitProcess(-1);
-#else //!COMPILE_ON_WINDOWS
+#else
 		::exit(-1);
-#endif //!COMPILE_ON_WINDOWS
+#endif
 	}
 
 	// Now save it
@@ -810,7 +806,7 @@ void KviApp::setupFinish()
 void KviApp::saveKvircDirectory()
 {
 /*
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	#warning you must change back hardcoded 4.0 to VERSION_BRANCH
 	KviStr szKey(KviStr::Format,"LocalKvircDirectory%s",VERSION_BRANCH);
 	KviStr szKey(KviStr::Format,"LocalKvircDirectory%s",4.0);
diff --git a/src/kvirc/kernel/kvi_ipc.cpp b/src/kvirc/kernel/kvi_ipc.cpp
index cd0781b07..1f487ba59 100644
--- a/src/kvirc/kernel/kvi_ipc.cpp
+++ b/src/kvirc/kernel/kvi_ipc.cpp
@@ -34,7 +34,7 @@
 	#include "kvi_app.h"
 	#include "kvi_qstring.h"
 
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 
 	static HWND kvi_win_findIpcSentinel()
 	{
@@ -46,7 +46,7 @@
 		return hWnd;
 	}
 
-#else //!COMPILE_ON_WINDOWS
+#else
 
 	#ifdef COMPILE_X11_SUPPORT
 		#include <X11/Xatom.h>
@@ -124,14 +124,14 @@
 		}
 	#endif //!COMPILE_NO_X
 
-#endif //!COMPILE_ON_WINDOWS
+#endif
 
 
 	#define KVI_WINDOWS_IPC_MESSAGE 0x2FACE5
 
 	bool kvi_sendIpcMessage(const char * message)
 	{
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 		HWND hSentinel = kvi_win_findIpcSentinel();
 		if(hSentinel != NULL)
 		{
@@ -144,7 +144,7 @@
 			::SendMessageTimeout(hSentinel,WM_COPYDATA,(WPARAM)NULL,(LPARAM)&cpd,SMTO_BLOCK,1000,&dwResult);
 			return true;
 		}
-#else //!COMPILE_ON_WINDOWS
+#else
 	#ifdef COMPILE_X11_SUPPORT
 
 		kvi_ipcLoadAtoms();
@@ -169,7 +169,7 @@
 			return true;
 		}
 	#endif //!COMPILE_NO_X
-#endif //!COMPILE_ON_WINDOWS
+#endif
 		return false;
 	}
 
@@ -185,9 +185,9 @@
 	: QWidget(0)
 	{
 		setObjectName("kvirc4_ipc_sentinel");
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 		setWindowTitle("kvirc4_ipc_sentinel");
-#else //!COMPILE_ON_WINDOWS
+#else
 	#ifdef COMPILE_X11_SUPPORT
 		kvi_ipcLoadAtoms();
 
@@ -196,7 +196,7 @@
 
 		kvi_ipcSetRemoteCommand(winId(),"");
 	#endif //!COMPILE_NO_X
-#endif //!COMPILE_ON_WINDOWS
+#endif
 
 		move(-50,-50);
 		resize(1,1);
@@ -208,7 +208,7 @@
 	{
 	}
 
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 
 	bool KviIpcSentinel::winEvent(MSG * msg)
 	{
@@ -228,7 +228,7 @@
 		return false;
 	}
 
-#else //!COMPILE_ON_WINDOWS
+#else
 	#ifdef COMPILE_X11_SUPPORT
 		bool KviIpcSentinel::x11Event(XEvent *e)
 		{
@@ -259,7 +259,7 @@
 			return false;
 		}
 	#endif //!COMPILE_NO_X
-#endif //!COMPILE_ON_WINDOWS
+#endif
 	#ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 		#include "kvi_ipc.moc"
 	#endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/kvirc/kernel/kvi_ipc.h b/src/kvirc/kernel/kvi_ipc.h
index da566d4ca..82d9c7b51 100644
--- a/src/kvirc/kernel/kvi_ipc.h
+++ b/src/kvirc/kernel/kvi_ipc.h
@@ -33,15 +33,15 @@
 
 	#include <QWidget>
 
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
  #include <winsock2.h>
 	#include <windows.h>
-#else //!COMPILE_ON_WINDOWS
+#else
 	#ifdef COMPILE_X11_SUPPORT
 		#include <qcoreevent.h>
 		#include "kvi_xlib.h" // for XEvent
 	#endif //!COMPILE_X11_SUPPORT
-#endif //!COMPILE_ON_WINDOWS
+#endif
 
 	//////////////////////////////////////////////////////////////////////
 	// class KviIpcSentinel
@@ -55,17 +55,14 @@
 		KviIpcSentinel();
 		~KviIpcSentinel();
 	protected: // protected members
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 		virtual bool winEvent(MSG * msg);
-#else //!COMPILE_ON_WINDOWS
+#else
 	#ifdef COMPILE_X11_SUPPORT
 		virtual bool x11Event(XEvent *e);
 	#endif //!COMPILE_X11_SUPPORT
-#endif //!COMPILE_ON_WINDOWS
+#endif
 	};
-
 #endif //!COMPILE_NO_IPC
 
-
-
 #endif //_KVI_IPC_H_
diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/kvi_ircsocket.cpp
index 41967ac2e..8d84b5a36 100644
--- a/src/kvirc/kernel/kvi_ircsocket.cpp
+++ b/src/kvirc/kernel/kvi_ircsocket.cpp
@@ -50,7 +50,7 @@
 #include <QTimer>
 #include <QSocketNotifier>
 
-#ifndef COMPILE_ON_WINDOWS
+#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
 	#include <unistd.h> //for gettimeofday()
 #endif
 //#include <fcntl.h>
@@ -1585,7 +1585,7 @@ void KviIrcSocket::handleInvalidSocketRead(int readedLength)
 	} else {
 		//check for transmission errors
 		int err = kvi_socket_error();
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 		if((err != EAGAIN) && (err != EINTR) && (err != WSAEWOULDBLOCK))
 #else
 		if((err != EAGAIN) && (err != EINTR))
@@ -1781,7 +1781,7 @@ void KviIrcSocket::flushSendQueue()
 handle_system_error:
 			// Oops...error ?
 			int err = kvi_socket_error();
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 			if((err == EAGAIN) || (err == EINTR) || (err == WSAEWOULDBLOCK))
 #else
 			if((err == EAGAIN)||(err == EINTR))
diff --git a/src/kvirc/kernel/kvi_main.cpp b/src/kvirc/kernel/kvi_main.cpp
index bf929851c..9743facda 100644
--- a/src/kvirc/kernel/kvi_main.cpp
+++ b/src/kvirc/kernel/kvi_main.cpp
@@ -90,7 +90,7 @@ int parseArgs(ParseArgs * a)
 
 			KviQString::appendFormatted(szMessage,"Home page: http://www.kvirc.net/\n");
 
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 			MessageBox(0,szMessage.toLocal8Bit().data(),"KVIrc",0);
 #else
 			debug(szMessage.toLocal8Bit().data());
@@ -138,7 +138,7 @@ int parseArgs(ParseArgs * a)
 			KviQString::appendFormatted(szMessage,"  [ircurl]     : URL in the following form:\n");
 			KviQString::appendFormatted(szMessage,"                 irc[6]://<server>[:<port>][/<channel>[?<pass>]]\n");
 
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 			MessageBox(0,szMessage.toLocal8Bit().data(),"KVIrc",0);
 #else
 			debug(szMessage.toLocal8Bit().data());
@@ -339,7 +339,7 @@ int main(int argc,char ** argv)
 			to start.
 			A weak file locking mechanism should be used too...
 
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	QString szLock = convertSeparators(cleanDirPath(QDir::homeDirPath() + "/.kvirc.lock"));
 #else
 	QString szLock = convertSeparators(cleanDirPath(QDir::homeDirPath() + "/.kvirc.lock"));
diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
index 8163793be..849dc6785 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/kvi_options.cpp
@@ -168,14 +168,14 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]=
 	BOOL_OPTION("AutoAcceptDccVoice", false, KviOption_sectFlagDcc),
 	BOOL_OPTION("CreateMinimizedDccVoice", false, KviOption_sectFlagDcc),
 	BOOL_OPTION("CreateMinimizedDccVoiceWhenAutoAccepted",true,KviOption_sectFlagDcc),
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	BOOL_OPTION("UseIdentService",true,KviOption_sectFlagConnection | KviOption_resetRestartIdentd),
 #else
 	BOOL_OPTION("UseIdentService",false,KviOption_sectFlagConnection | KviOption_resetRestartIdentd),
 #endif
 	BOOL_OPTION("ShowTipAtStartup",false,KviOption_sectFlagFrame),
 	BOOL_OPTION("IdentdEnableIpV6",false,KviOption_sectFlagConnection | KviOption_resetRestartIdentd),
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	BOOL_OPTION("IdentdIpV6ContainsIpV4",false,KviOption_sectFlagConnection | KviOption_resetRestartIdentd),
 #else
 	BOOL_OPTION("IdentdIpV6ContainsIpV4",true,KviOption_sectFlagConnection | KviOption_resetRestartIdentd),
@@ -313,7 +313,7 @@ KviBoolOption g_boolOptionsTable[KVI_NUM_BOOL_OPTIONS]=
 
 // FIXME: #warning "Remove the unused string options here!"
 
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	#define RUN_THE_BROWSER "run \"cmd.exe /c start \\\"\\\" \\\"$0\\\"\""
 #else
 	#ifdef COMPILE_KDE_SUPPORT
@@ -633,7 +633,7 @@ KviUIntOption g_uintOptionsTable[KVI_NUM_UINT_OPTIONS]=
 
 KviFontOption g_fontOptionsTable[KVI_NUM_FONT_OPTIONS]=
 {
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	FONT_OPTION("IrcView","Arial",9,KviOption_sectFlagIrcView | KviOption_resetUpdateGui),
 	FONT_OPTION("Input","Arial",12,KviOption_sectFlagInput | KviOption_resetUpdateGui),
 	FONT_OPTION("UserListView","Arial",9,KviOption_sectFlagUserListView | KviOption_resetUpdateGui),
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
index bd14c761c..aa39604db 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
@@ -794,7 +794,7 @@ namespace KviKvsCoreFunctions
 
 		KviStr tmpFormat("");
 		
-		#ifdef COMPILE_ON_WINDOWS
+		#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 			QString szAllowedCharacters;
 			//windows version of strftime()
 			//kvirc crashes if other then these characters get an % character in front of them
@@ -807,7 +807,7 @@ namespace KviKvsCoreFunctions
 			while(c->unicode())
 			{
 				//Check for right Characters
-				#ifdef COMPILE_ON_WINDOWS
+				#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 					if (szAllowedCharacters.indexOf((char)(c->unicode()),0,Qt::CaseSensitive) >= 0)	tmpFormat += '%';
 				#else
 					if (c->isLetter()) tmpFormat += '%';
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
index 12b491d91..cacc46748 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
@@ -312,7 +312,7 @@ namespace KviKvsCoreSimpleCommands
 	
 		if((uVolume > 100) || (uVolume < 1))uVolume = 100;
 
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 		Beep(pitch,duration);
 #else
 	#ifdef COMPILE_X11_SUPPORT
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
index e06d457bc..a5656f100 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
@@ -389,7 +389,7 @@ namespace KviKvsCoreSimpleCommands
 		{
 			szCommand = KVI_OPTION_STRING(KviOption_stringUrlMailtoCommand);
 		}
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 		if(KVI_OPTION_BOOL(KviOption_boolUseSystemUrlHandlers))
 		{
 			ShellExecute(NULL, "open", szUrl.toLocal8Bit().data(),
@@ -410,7 +410,7 @@ namespace KviKvsCoreSimpleCommands
 					KVSCSC_pContext->warning(__tr2qs("The commandline for this url type seems to be broken (%Q)"),&szUrl);
 		
 			} else KVSCSC_pContext->warning(__tr2qs("No commandline specified for this type of url (%Q)"),&szUrl);
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 		}
 #endif
 
diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.cpp b/src/kvirc/kvs/kvi_kvs_processmanager.cpp
index 22d46c1fc..196020b85 100644
--- a/src/kvirc/kvs/kvi_kvs_processmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_processmanager.cpp
@@ -73,7 +73,7 @@ bool KviKvsProcessAsyncOperation::start()
 		QString szShell = m_pData->szShell;
 		if(szShell.isEmpty())
 		{
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 			// [01:26:00] <PragmaOff> btw, what is qt_winunicode ?
 			// [01:26:12] <kode54> Qt export specific to win32
 			// [01:26:27] <kode54> bool which indicates whether system is Unicode (NT) or not
diff --git a/src/kvirc/module/kvi_module.h b/src/kvirc/module/kvi_module.h
index 3f5ba2ad2..67352d3d6 100644
--- a/src/kvirc/module/kvi_module.h
+++ b/src/kvirc/module/kvi_module.h
@@ -41,7 +41,7 @@
 #endif
 
 
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	#define KVIMODULEEXPORT extern "C" __declspec(dllexport)
 	#define KVIMODULEEXPORTDATA KVIMODULEEXPORT
 	#define KVIMODULEEXPORTFUNC KVIMODULEEXPORT
diff --git a/src/kvirc/module/kvi_modulemanager.cpp b/src/kvirc/module/kvi_modulemanager.cpp
index 5eb32fd39..34f21c470 100644
--- a/src/kvirc/module/kvi_modulemanager.cpp
+++ b/src/kvirc/module/kvi_modulemanager.cpp
@@ -92,7 +92,7 @@ void KviModuleManager::loadModulesByCaps(const QString &caps)
 void KviModuleManager::completeModuleNames(const QString &path,const QString &word,KviPointerList<QString> * matches)
 {
 	QDir d(path);
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	d.setNameFilters(QStringList("kvi*.dll"));
 #else
 	d.setNameFilters(QStringList("libkvi*.so"));
@@ -167,7 +167,7 @@ bool KviModuleManager::loadModule(const QString &modName)
 	}
 	QString tmp;
 	QString szName;
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	KviQString::appendFormatted(szName,"kvi%Q.dll",&modName);
 #else
 	KviQString::appendFormatted(szName,"libkvi%Q.so",&modName);
diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp
index 0a25bf1ca..ea9e62bbe 100644
--- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
+++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp
@@ -1146,7 +1146,7 @@ void KviServerParser::parseCtcpRequestVersion(KviCtcpMessage *msg)
 
 			szVersion = "KVIrc " KVI_VERSION QT4_TAG " '" KVI_RELEASE_NAME "' " KVI_SOURCES_DATE " - build ";
 			szVersion += KviBuildInfo::buildDate();
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 			szVersion.append(QString(" - %1").arg(KviOsInfo::version()));
 #else
 			szVersion.append(QString(" - %1 (%2)").arg(KviOsInfo::name()).arg(KviOsInfo::release()));
diff --git a/src/kvirc/ui/kvi_console.h b/src/kvirc/ui/kvi_console.h
index dda9e3f8f..3ad12aca4 100644
--- a/src/kvirc/ui/kvi_console.h
+++ b/src/kvirc/ui/kvi_console.h
@@ -46,13 +46,13 @@ class KviIrcUserEntry;
 class KviIrcServer;
 class KviIrcNetwork;
 class KviProxy;
-#ifndef COMPILE_ON_WINDOWS
-	class KviChannel;
-	class KviQuery;
-#else
+#ifdef COMPILE_ON_WINDOWS

 	// windoze wants it to compile QList<KviChannel> and QList<KviQuery>
 	#include "kvi_channel.h"
 	#include "kvi_query.h"
+#else

+	class KviChannel;
+	class KviQuery;
 #endif
 class KviUserListView;
 class KviNotifyListManager;
diff --git a/src/kvirc/ui/kvi_filedialog.cpp b/src/kvirc/ui/kvi_filedialog.cpp
index 38d6b6bb8..95e4e852c 100644
--- a/src/kvirc/ui/kvi_filedialog.cpp
+++ b/src/kvirc/ui/kvi_filedialog.cpp
@@ -74,7 +74,7 @@ void KviFileDialog::goHome()
 
 bool KviFileDialog::askForOpenFileName(QString &buffer,const QString &caption,const QString &initial,const QString &filter,bool showHidden, bool showNative,QWidget* parent)
 {
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	if(showNative)
 	{
 		buffer=QFileDialog::getOpenFileName(initial,filter,parent,"open_file_name_dialog",caption);
@@ -101,7 +101,7 @@ bool KviFileDialog::askForOpenFileName(QString &buffer,const QString &caption,co
 
 bool KviFileDialog::askForSaveFileName(QString &buffer,const QString & caption,const QString &initial,const QString &filter,bool showHidden,bool bConfirmOverwrite,bool showNative,QWidget* parent)
 {
-	#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	if (showNative)
 	{
 		while (1)
@@ -125,7 +125,7 @@ bool KviFileDialog::askForSaveFileName(QString &buffer,const QString & caption,c
 
 
 	}
-	#endif
+#endif
 
 
 	KviFileDialog * d = new KviFileDialog(initial,filter,parent,"save_file_name_dialog",true);
@@ -173,7 +173,7 @@ bool KviFileDialog::askForSaveFileName(QString &buffer,const QString & caption,c
 
 bool KviFileDialog::askForDirectoryName(QString &buffer,const QString & caption,const QString & initial,const char * filter,bool showHidden,bool showNative,QWidget* parent)
 {
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	if(showNative)
 	{
 		buffer = QFileDialog::getExistingDirectory(initial,parent,"open_file_name_dialog",caption);
@@ -208,14 +208,14 @@ bool KviFileDialog::askForDirectoryName(QString &buffer,const QString & caption,
 
 bool KviFileDialog::askForOpenFileNames(QStringList &buffer,const QString & caption,const QString & initial,const char * filter,bool showHidden,bool showNative,QWidget* parent)
 {
-	#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	if (showNative)
 	{
 		buffer=QFileDialog::getOpenFileNames(filter,initial,parent,"open_file_name_dialog",caption);
 		return (buffer.count()>0);
 	}
 
-	#endif
+#endif
 	KviFileDialog * d = new KviFileDialog(initial,filter ? QString(filter) : QString::null,parent,"open_file_names_dialog",true);
 	d->setWindowTitle(caption);
 	// See line 190
diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp
index e2ddefebb..f56b20d96 100644
--- a/src/kvirc/ui/kvi_input.cpp
+++ b/src/kvirc/ui/kvi_input.cpp
@@ -257,7 +257,7 @@ void KviInputEditor::dropEvent(QDropEvent *e)
 			{
 				QUrl url = *it;
 				QString path = url.path();
-#ifndef COMPILE_ON_WINDOWS
+#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
 				if(path.length() > 0)
 				{
 					if(path[0] != QChar('/'))path.prepend("/"); //HACK HACK HACK for Qt bug (?!?)
diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
index 4f1173f42..fe121ae0e 100644
--- a/src/kvirc/ui/kvi_ircview.cpp
+++ b/src/kvirc/ui/kvi_ircview.cpp
@@ -496,7 +496,7 @@ void KviIrcView::dropEvent(QDropEvent *e)
 				QUrl url = *it;
 				QString path = url.path();
 				//QString tmp = *it; //wow :)
-				#ifndef COMPILE_ON_WINDOWS
+				#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
 					//if(tmp[0] != '/')tmp.prepend("/"); //HACK HACK HACK for Qt bug (?!?)
 					if(path[0] != '/')path.prepend("/"); //HACK HACK HACK for Qt bug (?!?)
 				#endif
@@ -3301,7 +3301,7 @@ no_selection_paint:
 			int iH = lineWrapsHeight + m_iFontLineSpacing;
 
 			// workaround to fix "Warning:QPainter::setCompositionMode: PorterDuff modes not supported on device on win"
-			#ifdef COMPILE_ON_WINDOWS
+			#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 			pa.fillRect(0,curBottomCoord - iH,widgetWidth,iH + (m_iFontDescent << 1),QBrush(QColor(0,0,0,200)));
 			#else
 			pa.setCompositionMode(QPainter::CompositionMode_SourceOut);
diff --git a/src/kvirc/ui/kvi_ircviewtools.cpp b/src/kvirc/ui/kvi_ircviewtools.cpp
index 8a3d4e705..6d0efbb15 100644
--- a/src/kvirc/ui/kvi_ircviewtools.cpp
+++ b/src/kvirc/ui/kvi_ircviewtools.cpp
@@ -297,7 +297,7 @@ void KviIrcViewToolWidget::filterSave()
 
 void KviIrcViewToolWidget::forceRepaint()
 {
-	#ifdef COMPILE_ON_WINDOWS
+	#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 		m_pIrcView->repaint();
 	#else
 		m_pIrcView->paintEvent(0);
diff --git a/src/kvirc/ui/kvi_listview.cpp b/src/kvirc/ui/kvi_listview.cpp
index b3fd39d57..08f4e9bc6 100644
--- a/src/kvirc/ui/kvi_listview.cpp
+++ b/src/kvirc/ui/kvi_listview.cpp
@@ -189,7 +189,7 @@ void KviListView::resizeEvent(QResizeEvent * e)
 	repaintContents(); // force a full repaint (otherwise qt does not honor static background here)
 }
 
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 
 void KviListView::focusInEvent(QFocusEvent * e)
 {
diff --git a/src/kvirc/ui/kvi_listview.h b/src/kvirc/ui/kvi_listview.h
index ee194d48d..442f26b30 100644
--- a/src/kvirc/ui/kvi_listview.h
+++ b/src/kvirc/ui/kvi_listview.h
@@ -49,7 +49,7 @@ protected:
 	virtual void paintEmptyArea(QPainter * p, const QRect & rect );
 	virtual void drawContentsOffset(QPainter * p,int ox,int oy,int cx,int cy,int cw,int ch);
 	virtual void resizeEvent(QResizeEvent * e);
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	virtual void focusInEvent(QFocusEvent * e);
 	virtual void focusOutEvent(QFocusEvent * e);
 #endif
diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp
index cf6be87cb..4d16fdb3a 100644
--- a/src/kvirc/ui/kvi_statusbarapplet.cpp
+++ b/src/kvirc/ui/kvi_statusbarapplet.cpp
@@ -135,12 +135,12 @@ void KviStatusBarApplet::paintEvent(QPaintEvent * e)
 	{
 		QPainter p(this);
 	// workaround to fix "Warning:QPainter::setCompositionMode: PorterDuff modes not supported on device on win"
-		#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 			QPalette pal=palette();
 			QColor col=pal.highlight().color();
 			col.setAlpha(127);
 			p.fillRect(rect(),QBrush(col));
-		#else
+#else
 			
 		p.setCompositionMode(QPainter::CompositionMode_SourceOut);
 		p.fillRect(rect(),Qt::black);
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index 8613bc4f7..7f07c7e41 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -80,9 +80,9 @@
 	#include <kdeversion.h>
 #endif
 
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS)
 	#include <windows.h>
-#endif
+#endif

 
 KVIRC_API KviWindow * g_pActiveWindow = 0;
 
@@ -225,7 +225,7 @@ void KviWindow::demandAttention()
 	if(mdiParent())
 	{
 		if(frame()->isActiveWindow())return;
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS)
 		FLASHWINFO fwi;
 		fwi.cbSize = sizeof(fwi);
 		fwi.hwnd = (HWND)(frame()->winId());
@@ -242,7 +242,7 @@ void KviWindow::demandAttention()
 #endif
 	} else {
 		if(isActiveWindow())return;
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS)
 		FLASHWINFO fwi;
 		fwi.cbSize = sizeof(fwi);
 		fwi.hwnd = (HWND)winId();