62 files changed, 864 insertions, 272 deletions
diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt
index e118f6a0b..ecf6a906a 100644
--- a/src/modules/CMakeLists.txt
+++ b/src/modules/CMakeLists.txt
@@ -1,6 +1,6 @@
 # CMakeLists.txt for src/modules/
 IF(APPLE)
-	set(CMAKE_SHARED_LINKER_FLAGS "-single_module -undefined dynamic_lookup -multiply_defined suppress")
+	set(CMAKE_MODULE_LINKER_FLAGS "-single_module -undefined dynamic_lookup -multiply_defined suppress")
 ENDIF()
 
 INCLUDE_DIRECTORIES(
diff --git a/src/modules/about/CMakeLists.txt b/src/modules/about/CMakeLists.txt
index 798581e92..e151b22ec 100644
--- a/src/modules/about/CMakeLists.txt
+++ b/src/modules/about/CMakeLists.txt
@@ -12,9 +12,18 @@ SET(kviabout_SRCS
 QT4_WRAP_CPP(kviabout_MOC_SRCS ${kviabout_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kviabout SHARED ${kviabout_SRCS} ${kviabout_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kviaddon)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kviabout MODULE ${kviabout_SRCS} ${kviabout_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kviabout SHARED ${kviabout_SRCS} ${kviabout_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kviabout ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviabout PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
+SET_TARGET_PROPERTIES(kviabout PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
 INSTALL(TARGETS kviabout LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/action/CMakeLists.txt b/src/modules/action/CMakeLists.txt
index 86c5fcc15..32d99b8ea 100644
--- a/src/modules/action/CMakeLists.txt
+++ b/src/modules/action/CMakeLists.txt
@@ -8,9 +8,18 @@ SET(kviaction_SRCS
 QT4_WRAP_CPP(kviaction_MOC_SRCS ${kviaction_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kviaction SHARED ${kviaction_SRCS} ${kviaction_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kviaction)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kviaction MODULE ${kviaction_SRCS} ${kviaction_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kviaction SHARED ${kviaction_SRCS} ${kviaction_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kviaction ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviaction PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kviaction LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kviaction PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kviaction LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/actioneditor/CMakeLists.txt b/src/modules/actioneditor/CMakeLists.txt
index 3cd731b63..e831a31a3 100644
--- a/src/modules/actioneditor/CMakeLists.txt
+++ b/src/modules/actioneditor/CMakeLists.txt
@@ -13,9 +13,18 @@ SET(kviactioneditor_SRCS
 QT4_WRAP_CPP(kviactioneditor_MOC_SRCS ${kviactioneditor_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kviactioneditor SHARED ${kviactioneditor_SRCS} ${kviactioneditor_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kviactioneditor)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kviactioneditor MODULE ${kviactioneditor_SRCS} ${kviactioneditor_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kviactioneditor SHARED ${kviactioneditor_SRCS} ${kviactioneditor_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kviactioneditor ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviactioneditor PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kviactioneditor LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kviactioneditor PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kviactioneditor LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/addon/CMakeLists.txt b/src/modules/addon/CMakeLists.txt
index 2c710b899..aa15022a1 100644
--- a/src/modules/addon/CMakeLists.txt
+++ b/src/modules/addon/CMakeLists.txt
@@ -13,9 +13,18 @@ SET(kviaddon_SRCS
 QT4_WRAP_CPP(kviaddon_MOC_SRCS ${kviaddon_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kviaddon SHARED ${kviaddon_SRCS} ${kviaddon_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kviaddon)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kviaddon MODULE ${kviaddon_SRCS} ${kviaddon_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kviaddon SHARED ${kviaddon_SRCS} ${kviaddon_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kviaddon ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviaddon PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kviaddon LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kviaddon PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kviaddon LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/aliaseditor/CMakeLists.txt b/src/modules/aliaseditor/CMakeLists.txt
index 78c55bef2..fc15ea2b9 100644
--- a/src/modules/aliaseditor/CMakeLists.txt
+++ b/src/modules/aliaseditor/CMakeLists.txt
@@ -13,9 +13,18 @@ SET(kvialiaseditor_SRCS
 QT4_WRAP_CPP(kvialiaseditor_MOC_SRCS ${kvialiaseditor_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvialiaseditor SHARED ${kvialiaseditor_SRCS} ${kvialiaseditor_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvialiaseditor)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kviaddon MODULE ${kviaddon_SRCS} ${kviaddon_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kviaddon SHARED ${kviaddon_SRCS} ${kviaddon_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kviaddon ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvialiaseditor PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvialiaseditor LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvialiaseditor PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvialiaseditor LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/avatar/CMakeLists.txt b/src/modules/avatar/CMakeLists.txt
index 97e59ae35..8322cee79 100644
--- a/src/modules/avatar/CMakeLists.txt
+++ b/src/modules/avatar/CMakeLists.txt
@@ -12,9 +12,18 @@ SET(kviavatar_SRCS
 QT4_WRAP_CPP(kviavatar_MOC_SRCS ${kviavatar_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kviavatar SHARED ${kviavatar_SRCS} ${kviavatar_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kviavatar)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kviavatar MODULE ${kviavatar_SRCS} ${kviavatar_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kviavatar SHARED ${kviavatar_SRCS} ${kviavatar_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kviavatar ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviavatar PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kviavatar LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kviavatar PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kviavatar LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/chan/CMakeLists.txt b/src/modules/chan/CMakeLists.txt
index 58b4b764f..d8a32b02c 100644
--- a/src/modules/chan/CMakeLists.txt
+++ b/src/modules/chan/CMakeLists.txt
@@ -8,9 +8,18 @@ SET(kvichan_SRCS
 QT4_WRAP_CPP(kvichan_MOC_SRCS ${kvichan_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvichan SHARED ${kvichan_SRCS} ${kvichan_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvichan)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvichan MODULE ${kvichan_SRCS} ${kvichan_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvichan SHARED ${kvichan_SRCS} ${kvichan_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvichan ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvichan PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvichan LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvichan PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvichan LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/channelsjoin/CMakeLists.txt b/src/modules/channelsjoin/CMakeLists.txt
index a392fd19c..e5bf73b31 100644
--- a/src/modules/channelsjoin/CMakeLists.txt
+++ b/src/modules/channelsjoin/CMakeLists.txt
@@ -1,21 +1,28 @@
 # CMakeLists for src/modules/channelsjoin
 
-SET(kvichannelsjoin_MOC_HDRS
-	channelsjoinwindow.h
-)
-
 SET(kvichannelsjoin_SRCS
 	libkvichannelsjoin.cpp
 	channelsjoinwindow.cpp
 )
-
+SET(kvichannelsjoin_MOC_HDRS
+	channelsjoinwindow.h
+)
 # After this call, files will be moc'ed to moc_kvi_*.cpp
 QT4_WRAP_CPP(kvichannelsjoin_MOC_SRCS ${kvichannelsjoin_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvichannelsjoin SHARED ${kvichannelsjoin_SRCS} ${kvichannelsjoin_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvichannelsjoin)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvichannelsjoin MODULE ${kvichannelsjoin_SRCS} ${kvichannelsjoin_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvichannelsjoin SHARED ${kvichannelsjoin_SRCS} ${kvichannelsjoin_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvichannelsjoin ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvichannelsjoin PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvichannelsjoin LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvichannelsjoin PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvichannelsjoin LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/clock/CMakeLists.txt b/src/modules/clock/CMakeLists.txt
new file mode 100644
index 000000000..4a4bda797
--- /dev/null
+++ b/src/modules/clock/CMakeLists.txt
@@ -0,0 +1,29 @@
+# CMakeLists for src/modules/clock
+
+SET(kviclock_MOC_HDRS
+	libkviclock.h
+)
+
+SET(kviclock_SRCS
+	libkviclock.cpp
+)
+
+# After this call, files will be moc'ed to moc_kvi_*.cpp
+QT4_WRAP_CPP(kviclock_MOC_SRCS ${kviclock_MOC_HDRS})
+
+# Create library
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kviclock MODULE ${kviclock_SRCS} ${kviclock_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kviclock SHARED ${kviclock_SRCS} ${kviclock_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kviclock ???)
+ENDIF()
+
+# Install target
+SET_TARGET_PROPERTIES(kviclock PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kviclock LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/codetester/CMakeLists.txt b/src/modules/codetester/CMakeLists.txt
index 0ebe2e4a6..c87a76f0a 100644
--- a/src/modules/codetester/CMakeLists.txt
+++ b/src/modules/codetester/CMakeLists.txt
@@ -13,9 +13,18 @@ SET(kvicodetester_SRCS
 QT4_WRAP_CPP(kvicodetester_MOC_SRCS ${kvicodetester_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvicodetester SHARED ${kvicodetester_SRCS} ${kvicodetester_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvicodetester)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvicodetester MODULE ${kvicodetester_SRCS} ${kvicodetester_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvicodetester SHARED ${kvicodetester_SRCS} ${kvicodetester_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvicodetester ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvicodetester PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvicodetester LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvicodetester PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvicodetester LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/config/CMakeLists.txt b/src/modules/config/CMakeLists.txt
index 29819ae4a..5433f3348 100644
--- a/src/modules/config/CMakeLists.txt
+++ b/src/modules/config/CMakeLists.txt
@@ -8,9 +8,18 @@ SET(kviconfig_SRCS
 QT4_WRAP_CPP(kviconfig_MOC_SRCS ${kviconfig_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kviconfig SHARED ${kviconfig_SRCS} ${kviconfig_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kviconfig)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kviconfig MODULE ${kviconfig_SRCS} ${kviconfig_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kviconfig SHARED ${kviconfig_SRCS} ${kviconfig_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kviconfig ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviconfig PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kviconfig LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kviconfig PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kviconfig LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/context/CMakeLists.txt b/src/modules/context/CMakeLists.txt
new file mode 100644
index 000000000..1a3685beb
--- /dev/null
+++ b/src/modules/context/CMakeLists.txt
@@ -0,0 +1,25 @@
+# CMakeLists for src/modules/context
+
+SET(kvicontext_SRCS
+	libkvicontext.cpp
+)
+
+# After this call, files will be moc'ed to moc_kvi_*.cpp
+QT4_WRAP_CPP(kvicontext_MOC_SRCS ${kvicontext_MOC_HDRS})
+
+# Create library
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvicontext MODULE ${kvicontext_SRCS} ${kvicontext_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvicontext SHARED ${kvicontext_SRCS} ${kvicontext_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvicontext ???)
+ENDIF()
+
+# Install target
+SET_TARGET_PROPERTIES(kvicontext PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvicontext LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/dcc/CMakeLists.txt b/src/modules/dcc/CMakeLists.txt
index 05104fcbf..37d9b6a25 100644
--- a/src/modules/dcc/CMakeLists.txt
+++ b/src/modules/dcc/CMakeLists.txt
@@ -38,17 +38,26 @@ SET(kvidcc_SRCS
 	window.cpp
 )
 
-#IF(WIN32)
-#	SET(LIBS ${LIBS} -lws2_32)
-#ENDIF(WIN32)
+IF(WIN32)
+	LIST(APPEND LIBS -lws2_32)
+ENDIF()
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
 QT4_WRAP_CPP(kvidcc_MOC_SRCS ${kvidcc_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvidcc SHARED ${kvidcc_SRCS} ${kvidcc_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvidcc)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvidcc MODULE ${kvidcc_SRCS} ${kvidcc_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvidcc SHARED ${kvidcc_SRCS} ${kvidcc_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvidcc ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvidcc PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvidcc LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvidcc PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvidcc LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/dialog/CMakeLists.txt b/src/modules/dialog/CMakeLists.txt
index 73b95a56a..3a6ac2625 100644
--- a/src/modules/dialog/CMakeLists.txt
+++ b/src/modules/dialog/CMakeLists.txt
@@ -12,9 +12,18 @@ SET(kvidialog_SRCS
 QT4_WRAP_CPP(kvidialog_MOC_SRCS ${kvidialog_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvidialog SHARED ${kvidialog_SRCS} ${kvidialog_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvidialog)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvidialog MODULE ${kvidialog_SRCS} ${kvidialog_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvidialog SHARED ${kvidialog_SRCS} ${kvidialog_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvidialog ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvidialog PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvidialog LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvidialog PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvidialog LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/editor/CMakeLists.txt b/src/modules/editor/CMakeLists.txt
index b1b558470..463d5abc0 100644
--- a/src/modules/editor/CMakeLists.txt
+++ b/src/modules/editor/CMakeLists.txt
@@ -13,9 +13,18 @@ SET(kvieditor_SRCS
 QT4_WRAP_CPP(kvieditor_MOC_SRCS ${kvieditor_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvieditor SHARED ${kvieditor_SRCS} ${kvieditor_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvieditor)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvieditor MODULE ${kvieditor_SRCS} ${kvieditor_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvieditor SHARED ${kvieditor_SRCS} ${kvieditor_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvieditor ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvieditor PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvieditor LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvieditor PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvieditor LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/eventeditor/CMakeLists.txt b/src/modules/eventeditor/CMakeLists.txt
index 32cdac59e..cc293e09c 100644
--- a/src/modules/eventeditor/CMakeLists.txt
+++ b/src/modules/eventeditor/CMakeLists.txt
@@ -13,9 +13,18 @@ SET(kvieventeditor_SRCS
 QT4_WRAP_CPP(kvieventeditor_MOC_SRCS ${kvieventeditor_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvieventeditor SHARED ${kvieventeditor_SRCS} ${kvieventeditor_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvieventeditor)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvieventeditor MODULE ${kvieventeditor_SRCS}
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvieventeditor SHARED ${kvieventeditor_SRCS}
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvieventeditor ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvieventeditor PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvieventeditor LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvieventeditor PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvieventeditor LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/file/CMakeLists.txt b/src/modules/file/CMakeLists.txt
index c47d34e80..b264bc369 100644
--- a/src/modules/file/CMakeLists.txt
+++ b/src/modules/file/CMakeLists.txt
@@ -8,9 +8,18 @@ SET(kvifile_SRCS
 QT4_WRAP_CPP(kvifile_MOC_SRCS ${kvifile_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvifile SHARED ${kvifile_SRCS} ${kvifile_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvifile)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvifile MODULE ${kvifile_SRCS} ${kvifile_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvifile SHARED ${kvifile_SRCS} ${kvifile_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvifile ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvifile PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvifile LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvifile PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvifile LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/filetransferwindow/CMakeLists.txt b/src/modules/filetransferwindow/CMakeLists.txt
index f65fcbe8f..5b67e6bba 100644
--- a/src/modules/filetransferwindow/CMakeLists.txt
+++ b/src/modules/filetransferwindow/CMakeLists.txt
@@ -13,9 +13,18 @@ SET(kvifiletransferwindow_SRCS
 QT4_WRAP_CPP(kvifiletransferwindow_MOC_SRCS ${kvifiletransferwindow_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvifiletransferwindow SHARED ${kvifiletransferwindow_SRCS} ${kvifiletransferwindow_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvifiletransferwindow)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvifiletransferwindow MODULE ${kvifiletransferwindow_SRCS} ${kvifiletransferwindow_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvifiletransferwindow SHARED ${kvifiletransferwindow_SRCS} ${kvifiletransferwindow_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvifiletransferwindow ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvifiletransferwindow PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvifiletransferwindow LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvifiletransferwindow PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvifiletransferwindow LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/help/CMakeLists.txt b/src/modules/help/CMakeLists.txt
index 2eea87165..72fc3edc7 100644
--- a/src/modules/help/CMakeLists.txt
+++ b/src/modules/help/CMakeLists.txt
@@ -17,9 +17,18 @@ SET(kvihelp_SRCS
 QT4_WRAP_CPP(kvihelp_MOC_SRCS ${kvihelp_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvihelp SHARED ${kvihelp_SRCS} ${kvihelp_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvihelp)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvihelp MODULE ${kvihelp_SRCS} ${kvihelp_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvihelp SHARED ${kvihelp_SRCS} ${kvihelp_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvihelp ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvihelp PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvihelp LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvihelp PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvihelp LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/http/CMakeLists.txt b/src/modules/http/CMakeLists.txt
index d12d794b0..a8564b057 100644
--- a/src/modules/http/CMakeLists.txt
+++ b/src/modules/http/CMakeLists.txt
@@ -13,9 +13,18 @@ SET(kvihttp_SRCS
 QT4_WRAP_CPP(kvihttp_MOC_SRCS ${kvihttp_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvihttp SHARED ${kvihttp_SRCS} ${kvihttp_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvihttp)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvihttp MODULE ${kvihttp_SRCS} ${kvihttp_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvihttp SHARED ${kvihttp_SRCS} ${kvihttp_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvihttp ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvihttp PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvihttp LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvihttp PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvihttp LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/ident/CMakeLists.txt b/src/modules/ident/CMakeLists.txt
index a309475b0..4f3e162e0 100644
--- a/src/modules/ident/CMakeLists.txt
+++ b/src/modules/ident/CMakeLists.txt
@@ -16,9 +16,18 @@ ENDIF(WIN32)
 QT4_WRAP_CPP(kviident_MOC_SRCS ${kviident_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kviident SHARED ${kviident_SRCS} ${kviident_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kviident)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kviident MODULE ${kviident_SRCS} ${kviident_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kviident SHARED ${kviident_SRCS} ${kviident_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kviident ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviident PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kviident LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kviident PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kviident LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/iograph/CMakeLists.txt b/src/modules/iograph/CMakeLists.txt
new file mode 100644
index 000000000..b48a0fa69
--- /dev/null
+++ b/src/modules/iograph/CMakeLists.txt
@@ -0,0 +1,29 @@
+# CMakeLists for src/modules/iograph
+
+SET(kviiograph_MOC_HDRS
+	libkviiograph.h
+)
+
+SET(kviiograph_SRCS
+	libkviiograph.cpp
+)
+
+# After this call, files will be moc'ed to moc_kvi_*.cpp
+QT4_WRAP_CPP(kviiograph_MOC_SRCS ${kviiograph_MOC_HDRS})
+
+# Create library
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kviiograph MODULE ${kviiograph_SRCS} ${kviiograph_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kviiograph SHARED ${kviiograph_SRCS} ${kviiograph_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kviiograph ???)
+ENDIF()
+
+# Install target
+SET_TARGET_PROPERTIES(kviiograph PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kviiograph LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/lamerizer/CMakeLists.txt b/src/modules/lamerizer/CMakeLists.txt
index 42b7ce9c4..c7bb7c9c9 100644
--- a/src/modules/lamerizer/CMakeLists.txt
+++ b/src/modules/lamerizer/CMakeLists.txt
@@ -12,9 +12,18 @@ SET(kvilamerizer_SRCS
 QT4_WRAP_CPP(kvilamerizer_MOC_SRCS ${kvilamerizer_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvilamerizer SHARED ${kvilamerizer_SRCS} ${kvilamerizer_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvilamerizer)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvilamerizer MODULE ${kvilamerizer_SRCS} ${kvilamerizer_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvilamerizer SHARED ${kvilamerizer_SRCS} ${kvilamerizer_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvilamerizer ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvilamerizer PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvilamerizer LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvilamerizer PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvilamerizer LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/links/CMakeLists.txt b/src/modules/links/CMakeLists.txt
index 1e4c41b84..fc36084b6 100644
--- a/src/modules/links/CMakeLists.txt
+++ b/src/modules/links/CMakeLists.txt
@@ -13,9 +13,18 @@ SET(kvilinks_SRCS
 QT4_WRAP_CPP(kvilinks_MOC_SRCS ${kvilinks_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvilinks SHARED ${kvilinks_SRCS} ${kvilinks_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvilinks)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvilinks MODULE ${kvilinks_SRCS} ${kvilinks_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvilinks SHARED ${kvilinks_SRCS} ${kvilinks_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvilinks ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvilinks PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvilinks LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvilinks PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvilinks LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/list/CMakeLists.txt b/src/modules/list/CMakeLists.txt
index cccd81d7b..a4895f4fe 100644
--- a/src/modules/list/CMakeLists.txt
+++ b/src/modules/list/CMakeLists.txt
@@ -13,9 +13,18 @@ SET(kvilist_SRCS
 QT4_WRAP_CPP(kvilist_MOC_SRCS ${kvilist_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvilist SHARED ${kvilist_SRCS} ${kvilist_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvilist)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvilist MODULE ${kvilist_SRCS} ${kvilist_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvilist SHARED ${kvilist_SRCS} ${kvilist_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvilist ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvilist PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvilist LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvilist PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvilist LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/log/CMakeLists.txt b/src/modules/log/CMakeLists.txt
index 112f91c7e..586eafd8b 100644
--- a/src/modules/log/CMakeLists.txt
+++ b/src/modules/log/CMakeLists.txt
@@ -8,9 +8,18 @@ SET(kvilog_SRCS
 QT4_WRAP_CPP(kvilog_MOC_SRCS ${kvilog_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvilog SHARED ${kvilog_SRCS} ${kvilog_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvilog)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvilog MODULE ${kvilog_SRCS} ${kvilog_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvilog SHARED ${kvilog_SRCS} ${kvilog_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvilog ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvilog PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvilog LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvilog PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvilog LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/logview/CMakeLists.txt b/src/modules/logview/CMakeLists.txt
index 862cc1f9c..1425054b4 100644
--- a/src/modules/logview/CMakeLists.txt
+++ b/src/modules/logview/CMakeLists.txt
@@ -15,9 +15,18 @@ SET(kvilogview_SRCS
 QT4_WRAP_CPP(kvilogview_MOC_SRCS ${kvilogview_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvilogview SHARED ${kvilogview_SRCS} ${kvilogview_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvilogview)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvilogview MODULE ${kvilogview_SRCS} ${kvilogview_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvilogview SHARED ${kvilogview_SRCS} ${kvilogview_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvilogview ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvilogview PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvilogview LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvilogview PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvilogview LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/mask/CMakeLists.txt b/src/modules/mask/CMakeLists.txt
index d474fba42..6b1c49d46 100644
--- a/src/modules/mask/CMakeLists.txt
+++ b/src/modules/mask/CMakeLists.txt
@@ -5,9 +5,18 @@ SET(kvimask_SRCS
 )
 
 # Create library
-ADD_LIBRARY(kvimask SHARED ${kvimask_SRCS} ${kvimask_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvimask)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvimask MODULE ${kvimask_SRCS} ${kvimask_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvimask SHARED ${kvimask_SRCS} ${kvimask_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvimask ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvimask PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvimask LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvimask PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvimask LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/math/CMakeLists.txt b/src/modules/math/CMakeLists.txt
index 067972873..fa952d9a0 100644
--- a/src/modules/math/CMakeLists.txt
+++ b/src/modules/math/CMakeLists.txt
@@ -8,9 +8,18 @@ SET(kvimath_SRCS
 QT4_WRAP_CPP(kvimath_MOC_SRCS ${kvimath_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvimath SHARED ${kvimath_SRCS} ${kvimath_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvimath)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvimath MODULE ${kvimath_SRCS} ${kvimath_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvimath SHARED ${kvimath_SRCS} ${kvimath_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvimath ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvimath PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvimath LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvimath PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvimath LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/mediaplayer/CMakeLists.txt b/src/modules/mediaplayer/CMakeLists.txt
index a54af27ab..b0683006c 100644
--- a/src/modules/mediaplayer/CMakeLists.txt
+++ b/src/modules/mediaplayer/CMakeLists.txt
@@ -29,9 +29,18 @@ SET(kvimediaplayer_SRCS
 QT4_WRAP_CPP(kvimediaplayer_MOC_SRCS ${kvimediaplayer_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvimediaplayer SHARED ${kvimediaplayer_SRCS} ${kvimediaplayer_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kviaddon)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvimediaplayer MODULE ${kvimediaplayer_SRCS}
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvimediaplayer SHARED ${kvimediaplayer_SRCS}
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvimediaplayer ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvimediaplayer PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvimediaplayer LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvimediaplayer PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvimediaplayer LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/mircimport/CMakeLists.txt b/src/modules/mircimport/CMakeLists.txt
index 2d16450f6..a710dc926 100644
--- a/src/modules/mircimport/CMakeLists.txt
+++ b/src/modules/mircimport/CMakeLists.txt
@@ -12,9 +12,18 @@ SET(kvimircimport_SRCS
 QT4_WRAP_CPP(kvimircimport_MOC_SRCS ${kvimircimport_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvimircimport SHARED ${kvimircimport_SRCS} ${kvimircimport_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kviaddon)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvimircimport MODULE ${kvimircimport_SRCS} ${kvimircimport_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvimircimport SHARED ${kvimircimport_SRCS} ${kvimircimport_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvimircimport ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvimircimport PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvimircimport LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvimircimport PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvimircimport LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/my/CMakeLists.txt b/src/modules/my/CMakeLists.txt
index 1457eeee3..31c172e45 100644
--- a/src/modules/my/CMakeLists.txt
+++ b/src/modules/my/CMakeLists.txt
@@ -15,9 +15,18 @@ SET(kvimy_SRCS
 QT4_WRAP_CPP(kvimy_MOC_SRCS ${kvimy_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvimy SHARED ${kvimy_SRCS} ${kvimy_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kviaddon)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvimy MODULE ${kvimy_SRCS} ${kvimy_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvimy SHARED ${kvimy_SRCS} ${kvimy_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvimy ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvimy PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvimy LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvimy PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvimy LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/notifier/CMakeLists.txt b/src/modules/notifier/CMakeLists.txt
index f568dc4a2..3b5bff757 100644
--- a/src/modules/notifier/CMakeLists.txt
+++ b/src/modules/notifier/CMakeLists.txt
@@ -24,9 +24,18 @@ SET(kvinotifier_SRCS
 QT4_WRAP_CPP(kvinotifier_MOC_SRCS ${kvinotifier_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvinotifier SHARED ${kvinotifier_SRCS} ${kvinotifier_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kviaddon)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvinotifier MODULE ${kvinotifier_SRCS} ${kvinotifier_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvinotifier SHARED ${kvinotifier_SRCS} ${kvinotifier_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvinotifier ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvinotifier PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
+SET_TARGET_PROPERTIES(kvinotifier PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
 INSTALL(TARGETS kvinotifier LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/objects/CMakeLists.txt b/src/modules/objects/CMakeLists.txt
index 54f46f5ff..8e43ade54 100644
--- a/src/modules/objects/CMakeLists.txt
+++ b/src/modules/objects/CMakeLists.txt
@@ -2,16 +2,10 @@
 
 # From qmake
 #QT += xml
-#
-#win32 {
-#	LIBS += -lws2_32
-#}
-#
-#PRECOMPILED_HEADER  = pch.h
-#
-#precompile_header:!isEmpty(PRECOMPILED_HEADER) {
-#	DEFINES += USING_PCH
-#}
+
+IF(WIN32)
+	LIST(APPEND LIBS -lws2_32)
+ENDIF()
 
 SET(kviobjects_MOC_HDRS
 	class_button.h
@@ -107,9 +101,18 @@ SET(kviobjects_SRCS
 QT4_WRAP_CPP(kviobjects_MOC_SRCS ${kviobjects_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kviobjects SHARED ${kviobjects_SRCS} ${kviobjects_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kviaddon)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kviobjects MODULE ${kviobjects_SRCS} ${kviobjects_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kviobjects SHARED ${kviobjects_SRCS} ${kviobjects_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kviobjects ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviobjects PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
+SET_TARGET_PROPERTIES(kviobjects PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
 INSTALL(TARGETS kviobjects LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/options/CMakeLists.txt b/src/modules/options/CMakeLists.txt
index 1e04768ae..523323d97 100644
--- a/src/modules/options/CMakeLists.txt
+++ b/src/modules/options/CMakeLists.txt
@@ -1,16 +1,5 @@
 # CMakeLists for src/modules/options
 
-# From qmake
-#PRECOMPILED_HEADER  = pch.h
-#
-#precompile_header:!isEmpty(PRECOMPILED_HEADER) {
-#	DEFINES += USING_PCH
-#}
-#
-#precompile_header:isEmpty(PRECOMPILED_HEADER) {
-#	DEFINES += CREATING_PCH
-#}
-
 SET(kvioptions_MOC_HDRS
 	container.h
 	dialog.h
@@ -110,9 +99,18 @@ SET(kvioptions_SRCS
 QT4_WRAP_CPP(kvioptions_MOC_SRCS ${kvioptions_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvioptions SHARED ${kvioptions_SRCS} ${kvioptions_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kviaddon)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvioptions MODULE ${kvioptions_SRCS} ${kvioptions_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvioptions SHARED ${kvioptions_SRCS} ${kvioptions_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvioptions ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvioptions PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
+SET_TARGET_PROPERTIES(kvioptions PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
 INSTALL(TARGETS kvioptions LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/perl/CMakeLists.txt b/src/modules/perl/CMakeLists.txt
index 213beaab7..5bcebd934 100644
--- a/src/modules/perl/CMakeLists.txt
+++ b/src/modules/perl/CMakeLists.txt
@@ -8,9 +8,18 @@ SET(kviperl_SRCS
 QT4_WRAP_CPP(kviperl_MOC_SRCS ${kviperl_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kviperl SHARED ${kviperl_SRCS} ${kviperl_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kviaddon)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kviperl MODULE ${kviperl_SRCS} ${kviperl_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kviperl SHARED ${kviperl_SRCS} ${kviperl_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kviperl ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviperl PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kviperl LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kviperl PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kviperl LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/perlcore/CMakeLists.txt b/src/modules/perlcore/CMakeLists.txt
index ccdfd1a89..e05173e8d 100644
--- a/src/modules/perlcore/CMakeLists.txt
+++ b/src/modules/perlcore/CMakeLists.txt
@@ -11,6 +11,15 @@
 #	LIBS += -lperl -L$(PERLDIR)/CORE/
 #}
 
+IF(UNIX)
+	IF(APPLE)
+		LIST(APPEND LIBS -lperl)
+	ENDIF()
+ELSE()
+	# Assume windows
+	LIST(APPEND LIBS -lperl58)
+ENDIF()
+
 SET(kviperlcore_MOC_HDRS
 	perlcoreinterface.h
 )
@@ -23,9 +32,18 @@ SET(kviperlcore_SRCS
 QT4_WRAP_CPP(kviperlcore_MOC_SRCS ${kviperlcore_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kviperlcore SHARED ${kviperlcore_SRCS} ${kviperlcore_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kviperlcore)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kviperlcore MODULE ${kviperlcore_SRCS} ${kviperlcore_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kviperlcore SHARED ${kviperlcore_SRCS} ${kviperlcore_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kviperlcore ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviperlcore PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kviperlcore LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kviperlcore PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kviperlcore LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/popupeditor/CMakeLists.txt b/src/modules/popupeditor/CMakeLists.txt
index 34c311946..465c4032f 100644
--- a/src/modules/popupeditor/CMakeLists.txt
+++ b/src/modules/popupeditor/CMakeLists.txt
@@ -13,9 +13,18 @@ SET(kvipopupeditor_SRCS
 QT4_WRAP_CPP(kvipopupeditor_MOC_SRCS ${kvipopupeditor_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvipopupeditor SHARED ${kvipopupeditor_SRCS} ${kvipopupeditor_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvipopupeditor)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvipopupeditor MODULE ${kvipopupeditor_SRCS} ${kvipopupeditor_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvipopupeditor SHARED ${kvipopupeditor_SRCS} ${kvipopupeditor_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvipopupeditor ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvipopupeditor PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvipopupeditor LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvipopupeditor PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvipopupeditor LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/raweditor/CMakeLists.txt b/src/modules/raweditor/CMakeLists.txt
index 6dcceb432..c4d3379e7 100644
--- a/src/modules/raweditor/CMakeLists.txt
+++ b/src/modules/raweditor/CMakeLists.txt
@@ -13,9 +13,18 @@ SET(kviraweditor_SRCS
 QT4_WRAP_CPP(kviraweditor_MOC_SRCS ${kviraweditor_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kviraweditor SHARED ${kviraweditor_SRCS} ${kviraweditor_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kviraweditor)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kviraweditor MODULE ${kviraweditor_SRCS} ${kviraweditor_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kviraweditor SHARED ${kviraweditor_SRCS} ${kviraweditor_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kviraweditor ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviraweditor PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kviraweditor LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kviraweditor PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kviraweditor LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/regchan/CMakeLists.txt b/src/modules/regchan/CMakeLists.txt
index 539ca0fee..61c7afbad 100644
--- a/src/modules/regchan/CMakeLists.txt
+++ b/src/modules/regchan/CMakeLists.txt
@@ -8,9 +8,18 @@ SET(kviregchan_SRCS
 QT4_WRAP_CPP(kviregchan_MOC_SRCS ${kviregchan_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kviregchan SHARED ${kviregchan_SRCS} ${kviregchan_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kviregchan)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kviregchan MODULE ${kviregchan_SRCS} ${kviregchan_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kviregchan SHARED ${kviregchan_SRCS} ${kviregchan_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kviregchan ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviregchan PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kviregchan LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kviregchan PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kviregchan LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/reguser/CMakeLists.txt b/src/modules/reguser/CMakeLists.txt
index bc866be12..299c16741 100644
--- a/src/modules/reguser/CMakeLists.txt
+++ b/src/modules/reguser/CMakeLists.txt
@@ -17,9 +17,18 @@ SET(kvireguser_SRCS
 QT4_WRAP_CPP(kvireguser_MOC_SRCS ${kvireguser_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvireguser SHARED ${kvireguser_SRCS} ${kvireguser_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvireguser)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvireguser MODULE ${kvireguser_SRCS} ${kvireguser_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvireguser SHARED ${kvireguser_SRCS} ${kvireguser_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvireguser ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvireguser PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvireguser LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvireguser PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvireguser LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/rijndael/CMakeLists.txt b/src/modules/rijndael/CMakeLists.txt
index 727b1bdba..2011f60fd 100644
--- a/src/modules/rijndael/CMakeLists.txt
+++ b/src/modules/rijndael/CMakeLists.txt
@@ -16,9 +16,18 @@ SET(kvirijndael_SRCS
 QT4_WRAP_CPP(kvirijndael_MOC_SRCS ${kvirijndael_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvirijndael SHARED ${kvirijndael_SRCS} ${kvirijndael_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvirijndael)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvirijndael MODULE ${kvirijndael_SRCS} ${kvirijndael_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvirijndael SHARED ${kvirijndael_SRCS} ${kvirijndael_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvirijndael ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvirijndael PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvirijndael LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvirijndael PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvirijndael LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/setup/CMakeLists.txt b/src/modules/setup/CMakeLists.txt
index 7f689c585..ef19f84f9 100644
--- a/src/modules/setup/CMakeLists.txt
+++ b/src/modules/setup/CMakeLists.txt
@@ -1,9 +1,8 @@
 # CMakeLists for src/modules/setup
 
-# From qmake
-#win32 {
-#	LIBS = -lole32 -luuid
-#}
+IF(WIN32)
+	LIST(APPEND LIBS -lole32 -luuid)
+ENDIF()
 
 SET(kvieditor_MOC_HDRS
 	setupwizard.h
@@ -18,9 +17,18 @@ SET(kvisetup_SRCS
 QT4_WRAP_CPP(kvisetup_MOC_SRCS ${kvisetup_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvisetup SHARED ${kvisetup_SRCS} ${kvisetup_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvisetup)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvisetup MODULE ${kvisetup_SRCS} ${kvisetup_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvisetup SHARED ${kvisetup_SRCS} ${kvisetup_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvisetup ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvisetup PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvisetup LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvisetup PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvisetup LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/sharedfile/CMakeLists.txt b/src/modules/sharedfile/CMakeLists.txt
index 519f5240f..4a88337fe 100644
--- a/src/modules/sharedfile/CMakeLists.txt
+++ b/src/modules/sharedfile/CMakeLists.txt
@@ -8,9 +8,18 @@ SET(kvisharedfile_SRCS
 QT4_WRAP_CPP(kvisharedfile_MOC_SRCS ${kvisharedfile_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvisharedfile SHARED ${kvisharedfile_SRCS} ${kvisharedfile_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvisharedfile)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvisharedfile MODULE ${kvisharedfile_SRCS} ${kvisharedfile_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvisharedfile SHARED ${kvisharedfile_SRCS} ${kvisharedfile_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvisharedfile ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvisharedfile PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvisharedfile LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvisharedfile PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvisharedfile LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/sharedfileswindow/CMakeLists.txt b/src/modules/sharedfileswindow/CMakeLists.txt
index 9d4f1e224..40b601bec 100644
--- a/src/modules/sharedfileswindow/CMakeLists.txt
+++ b/src/modules/sharedfileswindow/CMakeLists.txt
@@ -13,9 +13,18 @@ SET(kvisharedfilewindow_SRCS
 QT4_WRAP_CPP(kvisharedfilewindow_MOC_SRCS ${kvisharedfilewindow_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvisharedfilewindow SHARED ${kvisharedfilewindow_SRCS} ${kvisharedfilewindow_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvisharedfilewindow)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvisharedfilewindow MODULE ${kvisharedfilewindow_SRCS} ${kvisharedfilewindow_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvisharedfilewindow SHARED ${kvisharedfilewindow_SRCS} ${kvisharedfilewindow_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvisharedfilewindow ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvisharedfilewindow PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvisharedfilewindow LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvisharedfilewindow PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvisharedfilewindow LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/snd/CMakeLists.txt b/src/modules/snd/CMakeLists.txt
index 1e9acef94..6c578407c 100644
--- a/src/modules/snd/CMakeLists.txt
+++ b/src/modules/snd/CMakeLists.txt
@@ -1,9 +1,8 @@
 # CMakeLists for src/modules/snd
 
-# From qmake
-#win32{
-#	LIBS += -lwinmm
-#}
+IF(WIN32)
+	LIST(APPEND LIBS -lwinmm)
+ENDIF()
 
 SET(kvieditor_MOC_HDRS
 	libkvisnd.h
@@ -17,9 +16,18 @@ SET(kvisnd_SRCS
 QT4_WRAP_CPP(kvisnd_MOC_SRCS ${kvisnd_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvisnd SHARED ${kvisnd_SRCS} ${kvisnd_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvisnd)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvisnd MODULE ${kvisnd_SRCS} ${kvisnd_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvisnd SHARED ${kvisnd_SRCS} ${kvisnd_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvisnd ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvisnd PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvisnd LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvisnd PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvisnd LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/socketspy/CMakeLists.txt b/src/modules/socketspy/CMakeLists.txt
index 25a686521..fbe1c9138 100644
--- a/src/modules/socketspy/CMakeLists.txt
+++ b/src/modules/socketspy/CMakeLists.txt
@@ -13,9 +13,18 @@ SET(kvisocketspy_SRCS
 QT4_WRAP_CPP(kvisocketspy_MOC_SRCS ${kvisocketspy_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvisocketspy SHARED ${kvisocketspy_SRCS} ${kvisocketspy_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvisocketspy)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvisocketspy MODULE ${kvisocketspy_SRCS} ${kvisocketspy_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvisocketspy SHARED ${kvisocketspy_SRCS} ${kvisocketspy_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvisocketspy ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvisocketspy PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvisocketspy LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvisocketspy PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvisocketspy LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/spaste/CMakeLists.txt b/src/modules/spaste/CMakeLists.txt
index c351c9c1d..c388b7f14 100644
--- a/src/modules/spaste/CMakeLists.txt
+++ b/src/modules/spaste/CMakeLists.txt
@@ -14,9 +14,18 @@ SET(kvispaste_SRCS
 QT4_WRAP_CPP(kvispaste_MOC_SRCS ${kvispaste_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvispaste SHARED ${kvispaste_SRCS} ${kvispaste_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvispaste)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvispaste MODULE ${kvispaste_SRCS} ${kvispaste_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvispaste SHARED ${kvispaste_SRCS} ${kvispaste_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvispaste ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvispaste PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvispaste LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvispaste PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvispaste LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/str/CMakeLists.txt b/src/modules/str/CMakeLists.txt
index ee67727f7..b4b570eb9 100644
--- a/src/modules/str/CMakeLists.txt
+++ b/src/modules/str/CMakeLists.txt
@@ -1,14 +1,13 @@
 # CMakeLists for src/modules/str
 
-# From qmake
-#win32{
-#	LIBS += -leay32
-#	-lssleay32
-#}
-#
-#mac {
-#	LIBS += -lssl -lcrypto
-#}
+IF(UNIX)
+	IF(APPLE)
+		LIST(APPEND LIBS -lssl -lcrypto)
+	ENDIF()
+ELSE()
+	# Assume windows
+	LIST(APPEND LIBS -leay32 -lssleay32)
+ENDIF()
 
 SET(kvistr_SRCS
 	libkvistr.cpp
@@ -18,9 +17,18 @@ SET(kvistr_SRCS
 QT4_WRAP_CPP(kvistr_MOC_SRCS ${kvistr_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvistr SHARED ${kvistr_SRCS} ${kvistr_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvistr)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvistr MODULE ${kvistr_SRCS} ${kvistr_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvistr SHARED ${kvistr_SRCS} ${kvistr_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvistr ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvistr PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvistr LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvistr PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvistr LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/system/CMakeLists.txt b/src/modules/system/CMakeLists.txt
index e80691657..ea95dde3e 100644
--- a/src/modules/system/CMakeLists.txt
+++ b/src/modules/system/CMakeLists.txt
@@ -13,10 +13,19 @@ SET(kvisystem_SRCS
 QT4_WRAP_CPP(kvisystem_MOC_SRCS ${kvisystem_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvisystem SHARED ${kvisystem_SRCS} ${kvisystem_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvisystem)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvisystem MODULE ${kvisystem_SRCS} ${kvisystem_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvisystem SHARED ${kvisystem_SRCS} ${kvisystem_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvisystem ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvisystem PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
+SET_TARGET_PROPERTIES(kvisystem PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
 INSTALL(TARGETS kvisystem LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
 
diff --git a/src/modules/term/CMakeLists.txt b/src/modules/term/CMakeLists.txt
index 318bc4916..985a9e05d 100644
--- a/src/modules/term/CMakeLists.txt
+++ b/src/modules/term/CMakeLists.txt
@@ -15,9 +15,18 @@ SET(kviterm_SRCS
 QT4_WRAP_CPP(kviterm_MOC_SRCS ${kviterm_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kviterm SHARED ${kviterm_SRCS} ${kviterm_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kviterm)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kviterm MODULE ${kviterm_SRCS} ${kviterm_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kviterm SHARED ${kviterm_SRCS} ${kviterm_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kviterm ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviterm PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kviterm LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kviterm PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kviterm LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/texticons/CMakeLists.txt b/src/modules/texticons/CMakeLists.txt
index 955f46a8f..0a22c7549 100644
--- a/src/modules/texticons/CMakeLists.txt
+++ b/src/modules/texticons/CMakeLists.txt
@@ -8,9 +8,18 @@ SET(kvitexticons_SRCS
 QT4_WRAP_CPP(kvitexticons_MOC_SRCS ${kvitexticons_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvitexticons SHARED ${kvitexticons_SRCS} ${kvitexticons_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvitexticons)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvitexticons MODULE ${kvitexticons_SRCS} ${kvitexticons_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvitexticons SHARED ${kvitexticons_SRCS} ${kvitexticons_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvitexticons ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvitexticons PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
+SET_TARGET_PROPERTIES(kvitexticons PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
 INSTALL(TARGETS kvitexticons LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/theme/CMakeLists.txt b/src/modules/theme/CMakeLists.txt
index c69b14d8a..a3666431e 100644
--- a/src/modules/theme/CMakeLists.txt
+++ b/src/modules/theme/CMakeLists.txt
@@ -19,9 +19,18 @@ SET(kvitheme_SRCS
 QT4_WRAP_CPP(kvitheme_MOC_SRCS ${kvitheme_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvitheme SHARED ${kvitheme_SRCS} ${kvitheme_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvitheme)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvitheme MODULE ${kvitheme_SRCS} ${kvitheme_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvitheme SHARED ${kvitheme_SRCS} ${kvitheme_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvitheme ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvitheme PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvitheme LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvitheme PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvitheme LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/tip/CMakeLists.txt b/src/modules/tip/CMakeLists.txt
index 2ee653e5b..c6fd454ce 100644
--- a/src/modules/tip/CMakeLists.txt
+++ b/src/modules/tip/CMakeLists.txt
@@ -12,9 +12,18 @@ SET(kvitip_SRCS
 QT4_WRAP_CPP(kvitip_MOC_SRCS ${kvitip_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvitip SHARED ${kvitip_SRCS} ${kvitip_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvitip)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvitip MODULE ${kvitip_SRCS} ${kvitip_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvitip SHARED ${kvitip_SRCS} ${kvitip_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvitip ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvitip PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvitip LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvitip PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvitip LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/tmphighlight/CMakeLists.txt b/src/modules/tmphighlight/CMakeLists.txt
index cf7c7f5d6..9542107fb 100644
--- a/src/modules/tmphighlight/CMakeLists.txt
+++ b/src/modules/tmphighlight/CMakeLists.txt
@@ -8,9 +8,18 @@ SET(kvitmphighlight_SRCS
 QT4_WRAP_CPP(kvitmphighlight_MOC_SRCS ${kvitmphighlight_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvitmphighlight SHARED ${kvitmphighlight_SRCS} ${kvitmphighlight_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvitmphighlight)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvitmphighlight MODULE ${kvitmphighlight_SRCS} ${kvitmphighlight_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvitmphighlight SHARED ${kvitmphighlight_SRCS} ${kvitmphighlight_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvitmphighlight ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvitmphighlight PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvitmphighlight LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvitmphighlight PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvitmphighlight LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/toolbar/CMakeLists.txt b/src/modules/toolbar/CMakeLists.txt
index a6d65d3c0..6cfc7730a 100644
--- a/src/modules/toolbar/CMakeLists.txt
+++ b/src/modules/toolbar/CMakeLists.txt
@@ -8,9 +8,18 @@ SET(kvitoolbar_SRCS
 QT4_WRAP_CPP(kvitoolbar_MOC_SRCS ${kvitoolbar_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvitoolbar SHARED ${kvitoolbar_SRCS} ${kvitoolbar_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvitoolbar)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvitoolbar MODULE ${kvitoolbar_SRCS} ${kvitoolbar_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvitoolbar SHARED ${kvitoolbar_SRCS} ${kvitoolbar_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvitoolbar ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvitoolbar PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvitoolbar LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvitoolbar PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvitoolbar LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/toolbareditor/CMakeLists.txt b/src/modules/toolbareditor/CMakeLists.txt
index 8d3e2aa2a..7e0fd82a9 100644
--- a/src/modules/toolbareditor/CMakeLists.txt
+++ b/src/modules/toolbareditor/CMakeLists.txt
@@ -13,9 +13,18 @@ SET(kvitoolbareditor_SRCS
 QT4_WRAP_CPP(kvitoolbareditor_MOC_SRCS ${kvitoolbareditor_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvitoolbareditor SHARED ${kvitoolbareditor_SRCS} ${kvitoolbareditor_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvitoolbareditor)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvitoolbareditor MODULE ${kvitoolbareditor_SRCS} ${kvitoolbareditor_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvitoolbareditor SHARED ${kvitoolbareditor_SRCS} ${kvitoolbareditor_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvitoolbareditor ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvitoolbareditor PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvitoolbareditor LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvitoolbareditor PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvitoolbareditor LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/torrent/CMakeLists.txt b/src/modules/torrent/CMakeLists.txt
index 043069eab..e5ba0b4fb 100644
--- a/src/modules/torrent/CMakeLists.txt
+++ b/src/modules/torrent/CMakeLists.txt
@@ -17,9 +17,18 @@ SET(kvitorrent_SRCS
 QT4_WRAP_CPP(kvitorrent_MOC_SRCS ${kvitorrent_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvitorrent SHARED ${kvitorrent_SRCS} ${kvitorrent_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvitorrent)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvitorrent MODULE ${kvitorrent_SRCS} ${kvitorrent_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvitorrent SHARED ${kvitorrent_SRCS} ${kvitorrent_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvitorrent ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvitorrent PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kvitorrent LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kvitorrent PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kvitorrent LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/trayicon/CMakeLists.txt b/src/modules/trayicon/CMakeLists.txt
index 1085228f2..9b46fddcc 100644
--- a/src/modules/trayicon/CMakeLists.txt
+++ b/src/modules/trayicon/CMakeLists.txt
@@ -17,9 +17,18 @@ SET(kvitrayicon_SRCS
 QT4_WRAP_CPP(kvitrayicon_MOC_SRCS ${kvitrayicon_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kvitrayicon SHARED ${kvitrayicon_SRCS} ${kvitrayicon_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kvitrayicon)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kvitrayicon MODULE ${kvitrayicon_SRCS} ${kvitrayicon_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kvitrayicon SHARED ${kvitrayicon_SRCS} ${kvitrayicon_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kvitrayicon ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kvitrayicon PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
+SET_TARGET_PROPERTIES(kvitrayicon PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
 INSTALL(TARGETS kvitrayicon LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/url/CMakeLists.txt b/src/modules/url/CMakeLists.txt
index 4e6f2f403..2bf78a4a4 100644
--- a/src/modules/url/CMakeLists.txt
+++ b/src/modules/url/CMakeLists.txt
@@ -13,9 +13,18 @@ SET(kviurl_SRCS
 QT4_WRAP_CPP(kviurl_MOC_SRCS ${kviurl_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kviurl SHARED ${kviurl_SRCS} ${kviurl_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kviurl)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kviurl MODULE ${kviurl_SRCS} ${kviurl_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kviurl SHARED ${kviurl_SRCS} ${kviurl_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kviurl ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviurl PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kviurl LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kviurl PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kviurl LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
diff --git a/src/modules/window/CMakeLists.txt b/src/modules/window/CMakeLists.txt
index 9f071ef81..fa54d524b 100644
--- a/src/modules/window/CMakeLists.txt
+++ b/src/modules/window/CMakeLists.txt
@@ -13,9 +13,18 @@ SET(kviwindow_SRCS
 QT4_WRAP_CPP(kviwindow_MOC_SRCS ${kviwindow_MOC_HDRS})
 
 # Create library
-ADD_LIBRARY(kviwindow SHARED ${kviwindow_SRCS} ${kviwindow_MOC_SRCS})
-#TARGET_LINK_LIBRARIES(kvilib kviwindow)
+IF(UNIX)
+	IF(APPLE)
+		ADD_LIBRARY(kviwindow MODULE ${kviwindow_SRCS} ${kviwindow_MOC_SRCS})
+	ELSE()
+		# Assume linux
+		ADD_LIBRARY(kviwindow SHARED ${kviwindow_SRCS} ${kviwindow_MOC_SRCS})
+	ENDIF()
+ELSE()
+	# Assume windows
+	#ADD_LIBRARY(kviwindow ???)
+ENDIF()
 
 # Install target
-SET_TARGET_PROPERTIES(kviwindow PROPERTIES VERSION ${KVI_VERSION} SOVERSION ${KVI_MAJOR})
-INSTALL(TARGETS kviwindow LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)
-\ No newline at end of file
+SET_TARGET_PROPERTIES(kviwindow PROPERTIES VERSION ${VERSION} SOVERSION ${MAJOR})
+INSTALL(TARGETS kviwindow LIBRARY DESTINATION ${KVI_INSTALL_PREFIX}/share/kvirc/${KVI_VERSION_BRANCH}/modules/)