- remove -Wl,--no-undefined "handling" as this is not something we should "just do" (also, it broke append libs statements in a way i was too stupid to figure out) if we ever run into this again, try to fix it at its origin (which should be possible)

- remove winmm hack now that append libs works
- fix some win32 ifs in cmakelists files which should be mingw (check if this stuff is still needed when i get my mingw toolchain up)

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

5 files changed, 11 insertions, 13 deletions

diff --git a/src/kvilib/CMakeLists.txt b/src/kvilib/CMakeLists.txt
index f7e2882bb..7620e56c4 100644
--- a/src/kvilib/CMakeLists.txt
+++ b/src/kvilib/CMakeLists.txt
@@ -126,13 +126,11 @@ endif()
 
 #we need this defined when mingw will compile moc files
 if(WIN32)
-        add_definitions(-D__KVILIB__)
+	add_definitions(-D__KVILIB__)
 endif()
 
 if(MSVC)
-	# THIS IS A DIRTY HACK: add winmm.lib for kvisnd. (maybe also needed for mingw?) perl does add a bunch of crap unconditionally, including winmm
-	# TODO: fix it properly at some point: APPEND LIBS does not seem to work at all for modules(?)
-	list(APPEND LIBS wsock32.lib ws2_32.lib winmm.lib)
+	list(APPEND LIBS wsock32.lib ws2_32.lib)
 endif()
 
 add_library(${KVILIB_BINARYNAME} SHARED ${kvilib_SRCS} ${kvilib_MOC_SRCS})
diff --git a/src/modules/dcc/CMakeLists.txt b/src/modules/dcc/CMakeLists.txt
index 84abb0ccd..f45d3334c 100644
--- a/src/modules/dcc/CMakeLists.txt
+++ b/src/modules/dcc/CMakeLists.txt
@@ -30,9 +30,9 @@ set(files
 	kvi_dccfiletransfericons.png
 )
 
-if(WIN32)
+if(MINGW)
 	list(APPEND LIBS -lws2_32)
-endif()
+endif(MINGW)
 
 set(kvi_module_name kvidcc)
 include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
diff --git a/src/modules/ident/CMakeLists.txt b/src/modules/ident/CMakeLists.txt
index 228d9a842..369d4a617 100644
--- a/src/modules/ident/CMakeLists.txt
+++ b/src/modules/ident/CMakeLists.txt
@@ -4,9 +4,9 @@ set(kviident_SRCS
 	libkviident.cpp
 )
 
-if(WIN32)
-	set(LIBS ${LIBS} -lws2_32)
-endif(WIN32)
+if(MINGW)
+	list(APPEND LIBS -lws2_32)
+endif(MINGW)
 
 set(kvi_module_name kviident)
 include(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
diff --git a/src/modules/objects/CMakeLists.txt b/src/modules/objects/CMakeLists.txt
index 0f324e93b..7d8625372 100644
--- a/src/modules/objects/CMakeLists.txt
+++ b/src/modules/objects/CMakeLists.txt
@@ -3,9 +3,9 @@
 # From qmake
 #QT += xml
 
-if(WIN32)
+if(MINGW)
 	list(APPEND LIBS -lws2_32)
-endif()
+endif(MINGW)
 
 
 
diff --git a/src/modules/setup/CMakeLists.txt b/src/modules/setup/CMakeLists.txt
index 41729eb33..32f63246d 100644
--- a/src/modules/setup/CMakeLists.txt
+++ b/src/modules/setup/CMakeLists.txt
@@ -1,8 +1,8 @@
 # CMakeLists for src/modules/setup
 
-if(WIN32)
+if(MINGW)
 	list(APPEND LIBS -lole32 -luuid)
-endif()
+endif(MINGW)