fixed modules compilation (except rinjdael); first preliminary installation rules

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

6 files changed, 13 insertions, 9 deletions

diff --git a/src/kvilib/system/kvi_env.cpp b/src/kvilib/system/kvi_env.cpp
index e7a69a27a..383c170fb 100644
--- a/src/kvilib/system/kvi_env.cpp
+++ b/src/kvilib/system/kvi_env.cpp
@@ -30,7 +30,7 @@
 #include "kvi_malloc.h"
 #include "kvi_memmove.h"
 
-#ifndef COMPILE_ON_WINDOWS
+#if !defined(COMPILE_ON_WINDOWS) && ! defined(COMPILE_ON_MINGW)
 
 bool kvi_setenv(const char * name,const char * value)
 {
diff --git a/src/kvilib/system/kvi_env.h b/src/kvilib/system/kvi_env.h
index d5c9c1d98..dad84fe0e 100644
--- a/src/kvilib/system/kvi_env.h
+++ b/src/kvilib/system/kvi_env.h
@@ -26,7 +26,7 @@
 //=============================================================================
 
 //=============================================================================
-// Enviroinement function wrappers
+// Environment function wrappers
 //=============================================================================
 
 #include "kvi_settings.h"
@@ -44,7 +44,7 @@ inline char * kvi_getenv(const char * name)
 #endif
 }
 
-#ifdef COMPILE_ON_WINDOWS
+#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	#define kvi_setenv(__name,__value) SetEnvironmentVariable(__name,__value)
 	#define kvi_unsetenv(__name) SetEnvironmentVariable(__name,NULL)
 #else
diff --git a/src/kvirc/CMakeLists.txt b/src/kvirc/CMakeLists.txt
index ceb9983b4..7423fa051 100644
--- a/src/kvirc/CMakeLists.txt
+++ b/src/kvirc/CMakeLists.txt
@@ -462,5 +462,5 @@ IF(UNIX)
 		INSTALL(TARGETS ${KVIRC_BINARYNAME} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 	ENDIF()
 ELSEIF(WIN32)
-	INSTALL(TARGETS ${KVIRC_BINARYNAME} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/release)
+	INSTALL(TARGETS ${KVIRC_BINARYNAME} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX})
 ENDIF()
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index 1d6712de3..92c8cc453 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -32,7 +32,7 @@ SUBDIRS(
 	notifier
 	objects options
 	popupeditor
-	raweditor regchan reguser rijndael
+	raweditor regchan reguser
 	setup sharedfile sharedfileswindow snd
 	socketspy spaste str system
 	texticons term theme tip tmphighlight toolbar toolbareditor trayicon
@@ -48,3 +48,10 @@ SUBDIRS(
 	# forgotten ?
 	# offer
 )
+

+# this is currently broken on MINGW because of some virtual functions

+# messing up linker's brain

+

+IF(NOT MINGW)

+        ADD_SUBDIRECTORY( rijndael )
+ENDIF()
\ No newline at end of file
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index 70cde0697..200b4c25e 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -1002,7 +1002,7 @@ void KviSetupWizard::accept()
 
 		g_szChoosenIncomingDirectory = szDir;
 	
-#if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
+#if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
 		// Make local->global link
 		QString localPath = QString("%1/global").arg(g_pApp->m_szLocalKvircDir);
 		unlink(QTextCodec::codecForLocale()->fromUnicode(localPath).data());
diff --git a/src/modules/str/CMakeLists.txt b/src/modules/str/CMakeLists.txt
index 6f94807c6..35d13ea8a 100644
--- a/src/modules/str/CMakeLists.txt
+++ b/src/modules/str/CMakeLists.txt
@@ -4,9 +4,6 @@ IF(UNIX)
 	IF(APPLE)
 		LIST(APPEND LIBS -lssl -lcrypto)
 	ENDIF()
-ELSE()
-	# Assume windows
-	LIST(APPEND LIBS -leay32 -lssleay32)
 ENDIF()
 
 SET(kvistr_SRCS