Merge pull request #5668 from shuffle2/qt-winmain

Qt/Windows: Properly link against qtmain.
dolphin-emu · Jun 23, 2017 · 485589f · 485589f
2 parents 4e39a42 + 38b61ed
commit 485589f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/Externals/Qt b/Externals/Qt
diff --git a/Source/Core/DolphinQt2/Main.cpp b/Source/Core/DolphinQt2/Main.cpp
@@ -19,6 +19,8 @@
 #include "UICommon/CommandLineParse.h"
 #include "UICommon/UICommon.h"
 
+// N.B. On Windows, this should be called from WinMain. Link against qtmain and specify
+// /SubSystem:Windows
 int main(int argc, char* argv[])
 {
   QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);

diff --git a/Source/VSProps/QtCompile.props b/Source/VSProps/QtCompile.props
@@ -36,6 +36,7 @@
     <Link>
       <AdditionalLibraryDirectories>$(QtLibDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>qtmain$(QtLibSuffix).lib;Qt5Core$(QtLibSuffix).lib;Qt5Gui$(QtLibSuffix).lib;Qt5Widgets$(QtLibSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <SubSystem>Windows</SubSystem>
       <!--
       <AdditionalOptions>"/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\" %(AdditionalOptions)</AdditionalOptions>
       -->