From 852c8735e6ee00d666b6012ed60c1e718da90f43 Mon Sep 17 00:00:00 2001
From: David Walters <contact@davidwaltersdevelopment.com>
Date: Tue, 3 Apr 2018 18:21:10 +0100
Subject: [PATCH 1/4] Fix solution file to be Visual Studio 14 / "2015" format.

---
 pkg/msvc/RetroArch-msvc2015.sln | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkg/msvc/RetroArch-msvc2015.sln b/pkg/msvc/RetroArch-msvc2015.sln
index 2ee30da985..82f4c38f59 100644
--- a/pkg/msvc/RetroArch-msvc2015.sln
+++ b/pkg/msvc/RetroArch-msvc2015.sln
@@ -1,6 +1,8 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2015
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RetroArch-msvc2015", "msvc-2015\RetroArch-msvc2015.vcxproj", "{27FF7CE1-4059-4AA1-8062-FD529560FA54}"
 EndProject
 Global

From 7adec98cd84fabe60ab2f4173ccbf7f3ae8c08bc Mon Sep 17 00:00:00 2001
From: David Walters <contact@davidwaltersdevelopment.com>
Date: Tue, 3 Apr 2018 18:25:23 +0100
Subject: [PATCH 2/4] Fix MSVC2015 project/solution build config associations

---
 pkg/msvc/RetroArch-msvc2015.sln | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkg/msvc/RetroArch-msvc2015.sln b/pkg/msvc/RetroArch-msvc2015.sln
index 82f4c38f59..a20ab722df 100644
--- a/pkg/msvc/RetroArch-msvc2015.sln
+++ b/pkg/msvc/RetroArch-msvc2015.sln
@@ -19,16 +19,20 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|Win32.ActiveCfg = Debug Cg|Win32
 		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|Win32.Build.0 = Debug Cg|Win32
-		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|x64.ActiveCfg = Debug Cg|Win32
+		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|x64.ActiveCfg = Debug Cg|x64
+		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug Cg|x64.Build.0 = Debug Cg|x64
 		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|Win32.ActiveCfg = Debug|Win32
 		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|Win32.Build.0 = Debug|Win32
-		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|x64.ActiveCfg = Debug|Win32
+		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|x64.ActiveCfg = Debug|x64
+		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Debug|x64.Build.0 = Debug|x64
 		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|Win32.ActiveCfg = Release Cg|Win32
 		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|Win32.Build.0 = Release Cg|Win32
-		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|x64.ActiveCfg = Release Cg|Win32
+		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|x64.ActiveCfg = Release Cg|x64
+		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release Cg|x64.Build.0 = Release Cg|x64
 		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|Win32.ActiveCfg = Release|Win32
 		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|Win32.Build.0 = Release|Win32
-		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|x64.ActiveCfg = Release|Win32
+		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|x64.ActiveCfg = Release|x64
+		{27FF7CE1-4059-4AA1-8062-FD529560FA54}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

From c8a9f5eded7b3f10d72a5538b18530a0cda85f50 Mon Sep 17 00:00:00 2001
From: David Walters <contact@davidwaltersdevelopment.com>
Date: Tue, 3 Apr 2018 18:33:48 +0100
Subject: [PATCH 3/4] Compile fix for _vsnprintf_s, missing standard library
 header.

---
 libretro-common/compat/compat_snprintf.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libretro-common/compat/compat_snprintf.c b/libretro-common/compat/compat_snprintf.c
index f31de72d8c..40734a6fe2 100644
--- a/libretro-common/compat/compat_snprintf.c
+++ b/libretro-common/compat/compat_snprintf.c
@@ -25,6 +25,7 @@
 
 #include <retro_common.h>
 
+#include <stdio.h> /* added for _vsnprintf_s and _vscprintf on VS2015 and VS2017 */
 #include <stdarg.h>
 
 #if _MSC_VER < 1800

From b5b906bc5a1f7cc5d2e1f99d8ddbd03a1d8d81b1 Mon Sep 17 00:00:00 2001
From: David Walters <contact@davidwaltersdevelopment.com>
Date: Tue, 3 Apr 2018 18:41:34 +0100
Subject: [PATCH 4/4] Fix for fatal error C1128 in 64-bit Debug builds (by
 adding /bigobj to command line)

---
 pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj b/pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj
index 981d2f2fc9..a4cf7d356e 100644
--- a/pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj
+++ b/pkg/msvc/msvc-2017/RetroArch-msvc2017.vcxproj
@@ -384,9 +384,12 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsC</CompileAs>
     </ClCompile>
     <ClCompile Include="..\..\..\griffin\griffin_cpp.cpp" />
-    <ClCompile Include="..\..\..\griffin\griffin_glslang.cpp" />
+    <ClCompile Include="..\..\..\griffin\griffin_glslang.cpp">
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug Cg|x64'">/bigobj %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file