From 59b7bb04b69ea879a8880217bc53377ed67d2a07 Mon Sep 17 00:00:00 2001 From: Rukai Date: Tue, 21 Jun 2016 11:03:41 +1000 Subject: [PATCH] VS can now run dolphinQt directly without DLL errors --- Source/Core/DolphinQt2/DolphinQt2.vcxproj.user | 7 +++++++ Source/dolphin-emu.sln | 10 +++++----- 2 files changed, 12 insertions(+), 5 deletions(-) create mode 100644 Source/Core/DolphinQt2/DolphinQt2.vcxproj.user diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj.user b/Source/Core/DolphinQt2/DolphinQt2.vcxproj.user new file mode 100644 index 0000000000..42da7cddad --- /dev/null +++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj.user @@ -0,0 +1,7 @@ + + + + $(BinaryOutputDir)$(TargetFileName) + WindowsLocalDebugger + + diff --git a/Source/dolphin-emu.sln b/Source/dolphin-emu.sln index cdcbee6260..bfe2723023 100644 --- a/Source/dolphin-emu.sln +++ b/Source/dolphin-emu.sln @@ -199,6 +199,10 @@ Global {CBC76802-C128-4B17-BF6C-23B08C313E5E}.Debug|x64.Build.0 = Debug|x64 {CBC76802-C128-4B17-BF6C-23B08C313E5E}.Release|x64.ActiveCfg = Release|x64 {CBC76802-C128-4B17-BF6C-23B08C313E5E}.Release|x64.Build.0 = Release|x64 + {BB00605C-125F-4A21-B33B-7BF418322DCB}.Debug|x64.ActiveCfg = Debug|x64 + {BB00605C-125F-4A21-B33B-7BF418322DCB}.Debug|x64.Build.0 = Debug|x64 + {BB00605C-125F-4A21-B33B-7BF418322DCB}.Release|x64.ActiveCfg = Release|x64 + {BB00605C-125F-4A21-B33B-7BF418322DCB}.Release|x64.Build.0 = Release|x64 {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Debug|x64.ActiveCfg = Debug|x64 {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Debug|x64.Build.0 = Debug|x64 {570215B7-E32F-4438-95AE-C8D955F9FCA3}.Release|x64.ActiveCfg = Release|x64 @@ -207,10 +211,6 @@ Global {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 - {BB00605C-125F-4A21-B33B-7BF418322DCB}.Debug|x64.ActiveCfg = Debug|x64 - {BB00605C-125F-4A21-B33B-7BF418322DCB}.Debug|x64.Build.0 = Debug|x64 - {BB00605C-125F-4A21-B33B-7BF418322DCB}.Release|x64.ActiveCfg = Release|x64 - {BB00605C-125F-4A21-B33B-7BF418322DCB}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -242,7 +242,7 @@ Global {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} {76563A7F-1011-4EAD-B667-7BB18D09568E} = {15670B2E-CED6-4ED5-94CE-A00B1B2B5BA6} {CBC76802-C128-4B17-BF6C-23B08C313E5E} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} - {570215B7-E32F-4438-95AE-C8D955F9FCA3} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} {BB00605C-125F-4A21-B33B-7BF418322DCB} = {87ADDFF9-5768-4DA2-A33B-2477593D6677} + {570215B7-E32F-4438-95AE-C8D955F9FCA3} = {AAD1BCD6-9804-44A5-A5FC-4782EA00E9D4} EndGlobalSection EndGlobal