From 6349b88fae6b11ae4adbb3a5848dc213825dbfc5 Mon Sep 17 00:00:00 2001 From: rukai Date: Mon, 25 Jan 2016 22:36:39 +1100 Subject: [PATCH] DolphinQt Builds on Visual Studio --- Source/Core/DolphinQt2/DolphinQt2.vcxproj | 212 ++++++++++++++++++ .../DolphinQt2/DolphinQt2.vcxproj.filters | 125 +++++++++++ Source/Core/DolphinQt2/GameList/GameList.cpp | 2 +- .../DolphinQt2/GameList/ListProxyModel.cpp | 2 +- Source/Core/DolphinQt2/ToolBar.cpp | 2 +- Source/dolphin-emu.sln | 7 +- 6 files changed, 346 insertions(+), 4 deletions(-) create mode 100644 Source/Core/DolphinQt2/DolphinQt2.vcxproj create mode 100644 Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj b/Source/Core/DolphinQt2/DolphinQt2.vcxproj new file mode 100644 index 0000000000..6852f5d24c --- /dev/null +++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj @@ -0,0 +1,212 @@ + + + + + Debug + x64 + + + Release + x64 + + + + {FA3FA62B-6F58-4B86-9453-4D149940A066} + 8.1 + + + + + Application + v140 + Unicode + + + true + + + false + + + + + + + + + + + + + + true + + + + 0x00400000 + false + true + $(ExternalsDir)ffmpeg\lib;$(ExternalsDir)OpenAL\$(PlatformName);%(AdditionalLibraryDirectories) + iphlpapi.lib;winmm.lib;setupapi.lib;opengl32.lib;glu32.lib;rpcrt4.lib;comctl32.lib;avcodec.lib;avformat.lib;avutil.lib;swresample.lib;swscale.lib;%(AdditionalDependencies) + Windows + /NODEFAULTLIB:libcmt + /NODEFAULTLIB:libcmt + + + $(ProjectDir)\VideoInterface;$(ProjectDir)\GameList;$(ProjectDir)\Config;%(AdditionalIncludeDirectories) + + + + + + + $(ExternalsDir)/gettext + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {8ada04d7-6db1-4da4-ab55-64fb12a0997b} + + + {4c9f135b-a85e-430c-bad4-4c67ef5fc12c} + + + {ab993f38-c31d-4897-b139-a620c42bc565} + + + {93d73454-2512-424e-9cda-4bb357fe13dd} + + + {ff213b23-2c26-4214-9f88-85271e557e87} + + + {54aa7840-5beb-4a0c-9452-74ba4cc7fd44} + + + {2e6c348c-c75c-4d94-8d1e-9c1fcbf3efe4} + + + {41279555-f94f-4ebc-99de-af863c10c5c4} + + + {e54cf649-140e-4255-81a5-30a673c1fb36} + + + {160bdc25-5626-4b0d-bdd8-2953d9777fb5} + + + {6bbd47cf-91fd-4077-b676-8b76980178a9} + + + {96020103-4ba5-4fd2-b4aa-5b6d24492d4e} + + + {ec1a314c-5588-4506-9c1e-2e58e5817f75} + + + {a4c423aa-f57c-46c7-a172-d1a777017d29} + + + {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} + + + {604C8368-F34A-4D55-82C8-CC92A0C13254} + + + {0e033be3-2e08-428e-9ae9-bc673efa12b5} + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters b/Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters new file mode 100644 index 0000000000..068186bc9b --- /dev/null +++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters @@ -0,0 +1,125 @@ + + + + + + + + + Generated Files + + + Generated Files + + + Generated Files + + + Generated Files + + + Generated Files + + + Generated Files + + + Generated Files + + + Generated Files + + + Generated Files + + + Generated Files + + + Generated Files + + + Generated Files + + + GameList + + + GameList + + + GameList + + + GameList + + + GameList + + + GameList + + + + + + + Generated Files + + + Config + + + + + + + + + + + GameList + + + GameList + + + GameList + + + GameList + + + GameList + + + GameList + + + Config + + + + + + GameList + + + + + + + + {c18a1fb3-64ff-4249-b808-d73a56ea3a2d} + + + {be9925db-448c-46d8-a5a3-fb957490d3ef} + + + {42f8a963-563e-420d-8aca-5761657dcff5} + + + + + + \ No newline at end of file diff --git a/Source/Core/DolphinQt2/GameList/GameList.cpp b/Source/Core/DolphinQt2/GameList/GameList.cpp index 5927be5a4d..3031903a56 100644 --- a/Source/Core/DolphinQt2/GameList/GameList.cpp +++ b/Source/Core/DolphinQt2/GameList/GameList.cpp @@ -140,7 +140,7 @@ QString GameList::GetSelectedGame() const QModelIndex model_index = proxy->mapToSource(sel_model->selectedIndexes()[0]); return m_model->GetPath(model_index.row()); } - return QStringLiteral(); + return QStringLiteral(""); } void GameList::SetPreferredView(bool table) diff --git a/Source/Core/DolphinQt2/GameList/ListProxyModel.cpp b/Source/Core/DolphinQt2/GameList/ListProxyModel.cpp index 3ec6ccba03..46712de8ba 100644 --- a/Source/Core/DolphinQt2/GameList/ListProxyModel.cpp +++ b/Source/Core/DolphinQt2/GameList/ListProxyModel.cpp @@ -7,7 +7,7 @@ #include "DolphinQt2/GameList/GameListModel.h" #include "DolphinQt2/GameList/ListProxyModel.h" -static constexpr QSize LARGE_BANNER_SIZE(144, 48); +static QSize LARGE_BANNER_SIZE(144, 48); ListProxyModel::ListProxyModel(QObject* parent) : QSortFilterProxyModel(parent) diff --git a/Source/Core/DolphinQt2/ToolBar.cpp b/Source/Core/DolphinQt2/ToolBar.cpp index feb9b2a0d5..29c152f03c 100644 --- a/Source/Core/DolphinQt2/ToolBar.cpp +++ b/Source/Core/DolphinQt2/ToolBar.cpp @@ -7,7 +7,7 @@ #include "DolphinQt2/Settings.h" #include "DolphinQt2/ToolBar.h" -static constexpr QSize ICON_SIZE(32, 32); +static QSize ICON_SIZE(32, 32); ToolBar::ToolBar(QWidget* parent) : QToolBar(parent) diff --git a/Source/dolphin-emu.sln b/Source/dolphin-emu.sln index 2093e4757b..1184b95021 100644 --- a/Source/dolphin-emu.sln +++ b/Source/dolphin-emu.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +VisualStudioVersion = 14.0.24720.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\DolphinWX.vcxproj", "{47411FDB-1BF2-48D0-AB4E-C7C41160F898}" EndProject @@ -69,6 +69,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "enet", "..\Externals\enet\enet.vcxproj", "{CBC76802-C128-4B17-BF6C-23B08C313E5E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12", "Core\VideoBackends\D3D12\D3D12.vcxproj", "{570215B7-E32F-4438-95AE-C8D955F9FCA3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DolphinQt2", "Core\DolphinQt2\DolphinQt2.vcxproj", "{FA3FA62B-6F58-4B86-9453-4D149940A066}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -200,6 +201,10 @@ Global {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Debug|x64.Build.0 = Debug|x64 {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Release|x64.ActiveCfg = Release|x64 {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Release|x64.Build.0 = Release|x64 + {FA3FA62B-6F58-4B86-9453-4D149940A066}.Debug|x64.ActiveCfg = Debug|x64 + {FA3FA62B-6F58-4B86-9453-4D149940A066}.Debug|x64.Build.0 = Debug|x64 + {FA3FA62B-6F58-4B86-9453-4D149940A066}.Release|x64.ActiveCfg = Release|x64 + {FA3FA62B-6F58-4B86-9453-4D149940A066}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE