Merge pull request #69 from Nevcairiel/qt5msvcbuild

Qt5 MSVC build fixes

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 26f967f..b57061a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -447,10 +447,14 @@ endif(STATIC AND CMAKE_COMPILER_IS_GNUCXX)
 if(WIN32)
   link_libraries(imm32 winmm dbghelp Secur32)  # missing by default :/
   if(MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /DNOMINMAX")
     set(CMAKE_EXE_LINKER_FLAGS_RELWITHDEBUGINFO "/debug /INCREMENTAL:YES /NODEFAULTLIB:libcmt /DEFAULTLIB:msvcrt")
     set(CMAKE_EXE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:YES /NODEFAULTLIB:libcmt")
     set(CMAKE_EXE_LINKER_FLAGS_DEBUGFULL "${CMAKE_EXE_LINKER_FLAGS_DEBUG}")
     link_libraries(Version dwmapi shlwapi)
+    if(USE_QT5)
+      set(QT_QTMAIN_LIBRARY Qt5::WinMain)
+    endif(USE_QT5)
   endif(MSVC)
   if(HAVE_SSL AND STATIC)
      find_package(OpenSSL REQUIRED)