Qt: Add msvc support

SonofUgly · Sep 15, 2014 · ae3a5ce · ae3a5ce
1 parent 16c6a19
commit ae3a5ce
Show file tree

Hide file tree

Showing 12 changed files with 363 additions and 37 deletions.
diff --git a/Source/Core/DolphinQt/AboutDialog.cpp b/Source/Core/DolphinQt/AboutDialog.cpp
@@ -7,28 +7,24 @@
 
 #include "AboutDialog.h"
 #include "ui_AboutDialog.h"
+#include "Common/Common.h"
+#include "Common/StdMakeUnique.h"
 
-// TODO
-#define scm_desc_str "unknown"
-#define scm_branch_str "unknown"
-#define scm_rev_git_str "0000000"
-
-DAboutDialog::DAboutDialog(QWidget *p) :
-    QDialog(p),
-    ui(new Ui::DAboutDialog)
+DAboutDialog::DAboutDialog(QWidget* p)
+	: QDialog(p)
 {
+	ui = std::make_unique<Ui::DAboutDialog>();
 	ui->setupUi(this);
-	ui->label->setText(ui->label->text().arg(scm_desc_str,
-	                                         "2014",
-	                                         scm_branch_str,
-	                                         scm_rev_git_str,
-	                                         __DATE__,
-	                                         __TIME__));
+	ui->label->setText(ui->label->text().arg(QLatin1String(scm_desc_str),
+	                                         QStringLiteral("2014"),
+	                                         QLatin1String(scm_branch_str),
+	                                         QLatin1String(scm_rev_git_str),
+	                                         QStringLiteral(__DATE__),
+	                                         QStringLiteral(__TIME__)));
 }
 
 DAboutDialog::~DAboutDialog()
 {
-	delete ui;
 }
 
 void DAboutDialog::on_label_linkActivated(const QString &link)

diff --git a/Source/Core/DolphinQt/AboutDialog.h b/Source/Core/DolphinQt/AboutDialog.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <memory>
 #include <QDialog>
 
 // Predefinitions
@@ -16,12 +17,12 @@ class DAboutDialog : public QDialog
 	Q_OBJECT
 
 public:
-	explicit DAboutDialog(QWidget *p = 0);
+	explicit DAboutDialog(QWidget* p = nullptr);
 	~DAboutDialog();
 
 private slots:
-	void on_label_linkActivated(const QString &link);
+	void on_label_linkActivated(const QString& link);
 
 private:
-	Ui::DAboutDialog *ui;
+	std::unique_ptr<Ui::DAboutDialog> ui;
 };
diff --git a/Source/Core/DolphinQt/CMakeLists.txt b/Source/Core/DolphinQt/CMakeLists.txt
@@ -1,14 +1,20 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR}) # because of generated UI files
+# because of generated UI files
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
 set(CMAKE_AUTOMOC ON)
 
-set(SRCS AboutDialog.cpp
-         AboutDialog.h
-         Main.cpp
-         MainWindow.cpp
-         MainWindow.h)
+set(SRCS
+	AboutDialog.cpp
+	AboutDialog.h
+	Main.cpp
+	MainWindow.cpp
+	MainWindow.h)
+
+set(UIS
+	AboutDialog.ui
+	MainWindow.ui)
 
-set(UIS AboutDialog.ui
-        MainWindow.ui)
+set(LIBS common)
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	set(DOLPHINQT_BINARY DolphinQt)
@@ -18,4 +24,5 @@ endif()
 
 qt5_wrap_ui(UI_HEADERS ${UIS})
 add_executable(${DOLPHINQT_BINARY} ${SRCS} ${UI_HEADERS})
+target_link_libraries(${DOLPHINQT_BINARY} ${LIBS})
 qt5_use_modules(${DOLPHINQT_BINARY} Widgets)
diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{69D2B16E-122A-4E5D-8C37-8EC7B0F7CEB0}</ProjectGuid>
+    <!--
+    Enable this once wxwidgets is completely removed
+    <ProjectName>Dolphin</ProjectName>
+    -->
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Debug'" Label="Configuration">
+    <UseDebugLibraries>true</UseDebugLibraries>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\VSProps\Base.props" />
+    <Import Project="..\..\VSProps\PCHUse.props" />
+    <Import Project="..\..\VSProps\QtCompile.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros">
+  </PropertyGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <BaseAddress>0x00400000</BaseAddress>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <FixedBaseAddress>true</FixedBaseAddress>
+      <AdditionalLibraryDirectories>$(ExternalsDir)OpenAL\$(PlatformName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;setupapi.lib;vfw32.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <!--QRC and UI files are handled automatically-->
+  <ItemGroup>
+    <QtResource Include="*.qrc" />
+  </ItemGroup>
+  <ItemGroup>
+    <QtUi Include="*.ui" />
+  </ItemGroup>
+  <!--MOC files need to be listed. Perhaps scan for Q_OBJECT in the future? (like automoc)-->
+  <!--NOTE: When adding moc'd files, you must list the outputs in the following ItemGroup!-->
+  <ItemGroup>
+    <QtMoc Include="AboutDialog.h" />
+    <QtMoc Include="MainWindow.h" />
+  </ItemGroup>
+  <!--TODO figure out how to get QtMoc to add outputs to ClCompile's inputs...-->
+  <ItemGroup>
+    <ClCompile Include="$(QtMocOutPrefix)AboutDialog.cpp" />
+    <ClCompile Include="$(QtMocOutPrefix)MainWindow.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="AboutDialog.cpp" />
+    <ClCompile Include="Main.cpp" />
+    <ClCompile Include="MainWindow.cpp" />
+  </ItemGroup>
+  <!--Put standard C/C++ headers here-->
+  <!--
+  <ItemGroup>
+    <ClInclude Include="Main.h" />
+  </ItemGroup>
+  -->
+  <ItemGroup>
+    <Text Include="CMakeLists.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="$(ExternalsDir)Bochs_disasm\Bochs_disasm.vcxproj">
+      <Project>{8ada04d7-6db1-4da4-ab55-64fb12a0997b}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)libpng\png\png.vcxproj">
+      <Project>{4c9f135b-a85e-430c-bad4-4c67ef5fc12c}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)LZO\LZO.vcxproj">
+      <Project>{ab993f38-c31d-4897-b139-a620c42bc565}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)SFML\build\vc2010\SFML_Network.vcxproj">
+      <Project>{93d73454-2512-424e-9cda-4bb357fe13dd}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(ExternalsDir)zlib\zlib.vcxproj">
+      <Project>{ff213b23-2c26-4214-9f88-85271e557e87}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)AudioCommon\AudioCommon.vcxproj">
+      <Project>{54aa7840-5beb-4a0c-9452-74ba4cc7fd44}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)Common\Common.vcxproj">
+      <Project>{2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)Common\SCMRevGen.vcxproj">
+      <Project>{41279555-f94f-4ebc-99de-af863c10c5c4}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)Core\Core.vcxproj">
+      <Project>{e54cf649-140e-4255-81a5-30a673c1fb36}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)DiscIO\DiscIO.vcxproj">
+      <Project>{160bdc25-5626-4b0d-bdd8-2953d9777fb5}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)InputCommon\InputCommon.vcxproj">
+      <Project>{6bbd47cf-91fd-4077-b676-8b76980178a9}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)VideoBackends\D3D\D3D.vcxproj">
+      <Project>{96020103-4ba5-4fd2-b4aa-5b6d24492d4e}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)VideoBackends\OGL\OGL.vcxproj">
+      <Project>{ec1a314c-5588-4506-9c1e-2e58e5817f75}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)VideoBackends\Software\Software.vcxproj">
+      <Project>{a4c423aa-f57c-46c7-a172-d1a777017d29}</Project>
+    </ProjectReference>
+    <ProjectReference Include="$(CoreDir)VideoCommon\VideoCommon.vcxproj">
+      <Project>{3de9ee35-3e91-4f27-a014-2866ad8c3fe3}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+    <Import Project="..\..\VSProps\QtCompile.targets" />
+  </ImportGroup>
+  <!--Copy Exe, Data directory and DLLs which should be located in the executable directory-->
+  <ItemGroup>
+    <DataDirFiles Include="$(DolphinRootDir)Data\**\*.*" />
+    <ExternalDlls Include="$(ExternalsDir)OpenAL\$(PlatformName)\*.dll;$(ExternalsDir)msvcrt\$(PlatformName)\*.dll" />
+    <BinaryFiles Include="$(TargetPath)" />
+    <AllInputFiles Include="@(DataDirFiles);@(ExternalDlls);@(BinaryFiles)" />
+  </ItemGroup>
+  <!--Disable copying to binary dir for now on the buildbot to prevent packaging of the outputs-->
+  <Target Name="AfterBuild" Inputs="@(AllInputFiles)" Outputs="@(AllInputFiles -> '$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(Extension)')"
+    Condition="'$(I_AM_BUILDACUS)'==''">
+    <Message Text="Copying Data directory..." Importance="High" />
+    <Copy SourceFiles="@(DataDirFiles)" DestinationFolder="$(BinaryOutputDir)%(RecursiveDir)" Condition="!Exists('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(DataDirFiles.Extension)') OR $([System.DateTime]::Parse('%(ModifiedTime)').Ticks) &gt; $([System.IO.File]::GetLastWriteTime('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(DataDirFiles.Extension)').Ticks)" />
+    <Message Text="Copying External .dlls" Importance="High" />
+    <Copy SourceFiles="@(ExternalDlls)" DestinationFolder="$(BinaryOutputDir)" Condition="!Exists('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(ExternalDlls.Extension)') OR $([System.DateTime]::Parse('%(ModifiedTime)').Ticks) &gt; $([System.IO.File]::GetLastWriteTime('$(BinaryOutputDir)%(RecursiveDir)%(Filename)%(ExternalDlls.Extension)').Ticks)" />
+    <Message Text="Copy: @(BinaryFiles) -&gt; $(BinaryOutputDir)" Importance="High" />
+    <Copy SourceFiles="@(BinaryFiles)" DestinationFolder="$(BinaryOutputDir)" />
+  </Target>
+</Project>
diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj.user b/Source/Core/DolphinQt/DolphinQt.vcxproj.user
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <!--For some stupid reason this has to be in the .user file...-->
+    <LocalDebuggerCommand>$(BinaryOutputDir)$(TargetFileName)</LocalDebuggerCommand>
+    <LocalDebuggerWorkingDirectory>$(BinaryOutputDir)</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <ShowAllFiles>false</ShowAllFiles>
+  </PropertyGroup>
+</Project>
diff --git a/Source/Core/DolphinQt/Main.cpp b/Source/Core/DolphinQt/Main.cpp
@@ -14,7 +14,7 @@
 static bool IsOsSupported()
 {
 #ifdef Q_OS_OSX
-	return QSysInfo::MacVersion >= QSysInfo::MV_10_7;
+	return QSysInfo::MacintoshVersion >= QSysInfo::MV_10_7;
 #elif defined(Q_OS_WIN)
 	return (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based) >= QSysInfo::WV_VISTA;
 #else

diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp
@@ -6,35 +6,34 @@
 #include <QUrl>
 
 #include "AboutDialog.h"
-
 #include "MainWindow.h"
 #include "ui_MainWindow.h"
+#include "Common/StdMakeUnique.h"
 
-DMainWindow::DMainWindow(QWidget *p) :
-    QMainWindow(p),
-    ui(new Ui::DMainWindow)
+DMainWindow::DMainWindow(QWidget* p)
+    : QMainWindow(p)
 {
+	ui = std::make_unique<Ui::DMainWindow>();
 	ui->setupUi(this);
 }
 
 DMainWindow::~DMainWindow()
 {
-	delete ui;
 }
 
 void DMainWindow::on_actWebsite_triggered()
 {
-    QDesktopServices::openUrl(QUrl("https://dolphin-emu.org/"));
+    QDesktopServices::openUrl(QUrl(QStringLiteral("https://dolphin-emu.org/")));
 }
 
 void DMainWindow::on_actOnlineDocs_triggered()
 {
-    QDesktopServices::openUrl(QUrl("https://dolphin-emu.org/docs/guides/"));
+	QDesktopServices::openUrl(QUrl(QStringLiteral("https://dolphin-emu.org/docs/guides/")));
 }
 
 void DMainWindow::on_actGitHub_triggered()
 {
-    QDesktopServices::openUrl(QUrl("https://github.com/dolphin-emu/dolphin/"));
+	QDesktopServices::openUrl(QUrl(QStringLiteral("https://github.com/dolphin-emu/dolphin/")));
 }
 
 void DMainWindow::on_actAbout_triggered()

diff --git a/Source/Core/DolphinQt/MainWindow.h b/Source/Core/DolphinQt/MainWindow.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <memory>
 #include <QMainWindow>
 
 // Predefinitions
@@ -16,7 +17,7 @@ class DMainWindow : public QMainWindow
 	Q_OBJECT
 
 public:
-	explicit DMainWindow(QWidget *p = 0);
+	explicit DMainWindow(QWidget* p = nullptr);
 	~DMainWindow();
 
 private slots:
@@ -28,5 +29,5 @@ private slots:
 	void on_actAbout_triggered();
 
 private:
-	Ui::DMainWindow *ui;
+	std::unique_ptr<Ui::DMainWindow> ui;
 };