From 3e4cea7f6fdd5c1588402908bcd62362bf9a8313 Mon Sep 17 00:00:00 2001 From: EmptyChaos Date: Wed, 13 Jul 2016 01:11:29 +0000 Subject: [PATCH] DolphinQt2: Fix MSBuild for Visual Studio. Null VideoBackend is not being linked correctly. --- Source/Core/DolphinQt2/DolphinQt2.vcxproj | 3 +++ Source/Core/DolphinQt2/MainWindow.cpp | 1 + Source/dolphin-emu.sln | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj b/Source/Core/DolphinQt2/DolphinQt2.vcxproj index 1c69275b5b..d44d38f533 100644 --- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj +++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj @@ -189,6 +189,9 @@ {a4c423aa-f57c-46c7-a172-d1a777017d29} + + {53A5391B-737E-49A8-BC8F-312ADA00736F} + {3de9ee35-3e91-4f27-a014-2866ad8c3fe3} diff --git a/Source/Core/DolphinQt2/MainWindow.cpp b/Source/Core/DolphinQt2/MainWindow.cpp index 7d9cf61820..012e9c1209 100644 --- a/Source/Core/DolphinQt2/MainWindow.cpp +++ b/Source/Core/DolphinQt2/MainWindow.cpp @@ -8,6 +8,7 @@ #include #include "Core/BootManager.h" +#include "Core/ConfigManager.h" #include "Core/Core.h" #include "Core/HW/ProcessorInterface.h" #include "Core/Movie.h" diff --git a/Source/dolphin-emu.sln b/Source/dolphin-emu.sln index 88595c8d44..b0b19982ae 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.25123.0 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dolphin", "Core\DolphinWX\DolphinWX.vcxproj", "{47411FDB-1BF2-48D0-AB4E-C7C41160F898}" EndProject @@ -73,6 +73,7 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curl", "..\Externals\curl\curl.vcxproj", "{BB00605C-125F-4A21-B33B-7BF418322DCB}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "D3D12", "Core\VideoBackends\D3D12\D3D12.vcxproj", "{570215B7-E32F-4438-95AE-C8D955F9FCA3}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DolphinQt2", "Core\DolphinQt2\DolphinQt2.vcxproj", "{FA3FA62B-6F58-4B86-9453-4D149940A066}" EndProject Global