diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f3a9304d540b24bab5631061c53818ea48d85d01..346a4294261c43b7d592c3e02743fe32563e34f9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,39 +1,50 @@
-cmake_minimum_required(VERSION 2.6)
-FILE(GLOB SRC *.cpp *.h)
-FILE(GLOB_RECURSE SWIFTEN_SRC ../include/Swiften/*.cpp)
-FILE(GLOB HEADERS ../include/transport/*.h)
-
-if (CPPUNIT_FOUND)
-	FILE(GLOB SRC_TEST tests/*.cpp)
-
-	ADD_EXECUTABLE(libtransport_test ${SRC_TEST})
-
-	target_link_libraries(libtransport_test transport ${CPPUNIT_LIBRARIES} ${Boost_LIBRARIES})
-endif()
-
-include_directories(${POPT_INCLUDE_DIR})
-
-# SOURCE_GROUP(headers FILES ${HEADERS})
-
-
-
-if (PROTOBUF_FOUND)
-    ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC} ${CMAKE_CURRENT_BINARY_DIR}/../include/transport/protocol.pb.cc)
-	SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/../include/transport/protocol.pb.cc PROPERTIES GENERATED 1)
-    ADD_DEPENDENCIES(transport pb) 
-else()
-    ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC})
-endif()
-
-ADD_DEFINITIONS(-fPIC)
-
-TARGET_LINK_LIBRARIES(transport ${Boost_LIBRARIES} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY})
-
-SET_TARGET_PROPERTIES(transport PROPERTIES
-      VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}
-)
-
-INSTALL(TARGETS transport LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
-
-#CONFIGURE_FILE(transport.pc.in "${CMAKE_CURRENT_BINARY_DIR}/transport.pc")
-#INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/transport.pc" DESTINATION lib/pkgconfig)
+cmake_minimum_required(VERSION 2.6)
+FILE(GLOB SRC *.cpp *.h)
+FILE(GLOB_RECURSE SWIFTEN_SRC ../include/Swiften/*.cpp)
+FILE(GLOB HEADERS ../include/transport/*.h)
+
+if (CPPUNIT_FOUND)
+	FILE(GLOB SRC_TEST tests/*.cpp)
+
+	ADD_EXECUTABLE(libtransport_test ${SRC_TEST})
+
+	target_link_libraries(libtransport_test transport ${CPPUNIT_LIBRARIES} ${Boost_LIBRARIES})
+endif()
+
+if (NOT WIN32)
+include_directories(${POPT_INCLUDE_DIR})
+endif()
+
+# SOURCE_GROUP(headers FILES ${HEADERS})
+
+
+if (PROTOBUF_FOUND)
+	if (CMAKE_COMPILER_IS_GNUCXX)
+		ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC} ${CMAKE_CURRENT_BINARY_DIR}/../include/transport/protocol.pb.cc)
+	else(CMAKE_COMPILER_IS_GNUCXX)
+		ADD_LIBRARY(transport STATIC ${HEADERS} ${SRC} ${SWIFTEN_SRC} ${CMAKE_CURRENT_BINARY_DIR}/../include/transport/protocol.pb.cc)    
+	endif(CMAKE_COMPILER_IS_GNUCXX)
+	SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/../include/transport/protocol.pb.cc PROPERTIES GENERATED 1)
+	ADD_DEPENDENCIES(transport pb) 
+else(PROTOBUF_FOUND)
+	ADD_LIBRARY(transport SHARED ${HEADERS} ${SRC} ${SWIFTEN_SRC})
+endif(PROTOBUF_FOUND)
+
+if (CMAKE_COMPILER_IS_GNUCXX)
+	ADD_DEFINITIONS(-fPIC)
+endif()
+
+if (WIN32)
+	TARGET_LINK_LIBRARIES(transport ${Boost_LIBRARIES} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES})
+else (WIN32)
+	TARGET_LINK_LIBRARIES(transport ${Boost_LIBRARIES} ${SQLITE3_LIBRARIES} ${MYSQL_LIBRARIES} ${SWIFTEN_LIBRARY} ${PROTOBUF_LIBRARIES} ${LOG4CXX_LIBRARIES} ${POPT_LIBRARY})
+endif(WIN32)
+
+SET_TARGET_PROPERTIES(transport PROPERTIES
+      VERSION ${TRANSPORT_VERSION} SOVERSION ${TRANSPORT_VERSION}
+)
+
+INSTALL(TARGETS transport LIBRARY DESTINATION lib ARCHIVE DESTINATION lib COMPONENT libraries)
+
+#CONFIGURE_FILE(transport.pc.in "${CMAKE_CURRENT_BINARY_DIR}/transport.pc")
+#INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/transport.pc" DESTINATION lib/pkgconfig)