From 34772cccab9d4db03c681b0a8542220d46cb7d50 Mon Sep 17 00:00:00 2001
From: Fabio Bas <ctrlaltca@gmail.com>
Date: Fri, 27 Jun 2014 17:09:09 +0200
Subject: [PATCH] Compilation fix for MSVC+Qt5

---
 cockatrice/CMakeLists.txt | 14 ++++++++------
 oracle/CMakeLists.txt     | 10 ++++++----
 servatrice/CMakeLists.txt | 11 ++++++++---
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt
index be347188..08714b07 100644
--- a/cockatrice/CMakeLists.txt
+++ b/cockatrice/CMakeLists.txt
@@ -224,18 +224,20 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 ADD_EXECUTABLE(cockatrice WIN32 MACOSX_BUNDLE ${cockatrice_SOURCES} ${cockatrice_QM} ${cockatrice_RESOURCES_RCC} ${cockatrice_MOC_SRCS})
 
 if(Qt4_FOUND)
+    if(MSVC) 
+        set(QT_USE_QTMAIN true) 
+    endif() 
     TARGET_LINK_LIBRARIES(cockatrice cockatrice_common ${COCKATRICE_LIBS})
 endif()
 if(Qt5Widgets_FOUND)
-    TARGET_LINK_LIBRARIES(cockatrice cockatrice_common)
+    if(MSVC)
+        TARGET_LINK_LIBRARIES(cockatrice cockatrice_common Qt5::WinMain)
+    else()
+        TARGET_LINK_LIBRARIES(cockatrice cockatrice_common)
+    endif()
     qt5_use_modules(cockatrice ${COCKATRICE_LIBS})
 endif()
 
-
-if(MSVC)
-	set_target_properties(cockatrice PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
-endif(MSVC)
-
 if(UNIX)
     if(APPLE)
         INSTALL(TARGETS cockatrice BUNDLE DESTINATION ./)
diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt
index b6db8eb4..9f713889 100644
--- a/oracle/CMakeLists.txt
+++ b/oracle/CMakeLists.txt
@@ -74,16 +74,18 @@ INCLUDE_DIRECTORIES(../cockatrice/src)
 ADD_EXECUTABLE(oracle WIN32 MACOSX_BUNDLE ${oracle_SOURCES} ${oracle_MOC_SRCS})
 
 if(Qt4_FOUND)
+    if(MSVC) 
+        set(QT_USE_QTMAIN true) 
+    endif() 
     TARGET_LINK_LIBRARIES(oracle ${ORACLE_LIBS})
 endif()
 if(Qt5Widgets_FOUND)
+    if(MSVC)
+        TARGET_LINK_LIBRARIES(oracle Qt5::WinMain)
+    endif()
     qt5_use_modules(oracle ${ORACLE_LIBS})
 endif()
 
-if(MSVC)
-	set_target_properties(oracle PROPERTIES LINK_FLAGS "/SUBSYSTEM:WINDOWS")
-endif(MSVC)
-
 if(UNIX)
     if(APPLE)
         INSTALL(TARGETS oracle BUNDLE DESTINATION ./)
diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt
index a5743f8e..1f548038 100644
--- a/servatrice/CMakeLists.txt
+++ b/servatrice/CMakeLists.txt
@@ -69,15 +69,20 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
 ADD_EXECUTABLE(servatrice MACOSX_BUNDLE ${servatrice_SOURCES} ${servatrice_MOC_SRCS})
 
 if(Qt4_FOUND)
+    if(MSVC) 
+        set(QT_USE_QTMAIN true) 
+    endif() 
     TARGET_LINK_LIBRARIES(servatrice cockatrice_common ${SERVATRICE_LIBS} ${LIBGCRYPT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
 endif()
 if(Qt5Widgets_FOUND)
-    TARGET_LINK_LIBRARIES(servatrice cockatrice_common ${LIBGCRYPT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+    if(MSVC)
+        TARGET_LINK_LIBRARIES(servatrice cockatrice_common ${LIBGCRYPT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT} Qt5::WinMain)
+    else()
+        TARGET_LINK_LIBRARIES(servatrice cockatrice_common ${LIBGCRYPT_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
+    endif()
     qt5_use_modules(servatrice ${SERVATRICE_LIBS})
 endif()
 
-
-
 #add_custom_target(versionheader ALL DEPENDS version_header)
 add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/version_string.h ${CMAKE_CURRENT_BINARY_DIR}/version_string.cpp