From e841a69c763514f7f76b7289b06a0d6f663224cf Mon Sep 17 00:00:00 2001
From: Jean-Paul Mari <djipi.mari@gmail.com>
Date: Sun, 7 Oct 2018 03:41:03 -0400
Subject: [PATCH] VS2017 project updates

---
 .gitignore                                    | 18 +----
 .../jaguarcore/jaguarcore.vcxproj.filters     | 78 ++++++++++---------
 Win-VS2017/virtualjaguar.vcxproj              |  5 +-
 3 files changed, 48 insertions(+), 53 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3626602..05baa39 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,22 +11,6 @@ src/m68000/obj/*.a
 src/m68000/obj/*.exe
 src/m68000/obj/*.d
 src/m68000/obj/*.o
-Win-VS2015/m68000/m68000.vcxproj.user
-Win-VS2015/jaguarcore/jaguarcore.vcxproj.user
-Win-VS2015/x64/Archives/
-Win-VS2015/*/x64/
-Win-VS2015/*/*_VS2015-DebugSetup.txt
-Win-VS2015/*/ReadMe.txt
-Win-VS2015/.vs/
-Win-VS2015/obj/
-Win-VS2015/Win32/
-Win-VS2015/x64/
-Win-VS2015/virtualjaguar.vcxproj.txt
-Win-VS2015/virtualjaguar.VC.db
-Win-VS2015/virtualjaguar.VC.VC.opendb
-Win-VS2015/virtualjaguar.sdf
-Win-VS2015/virtualjaguar.vcxproj.user
-Win-VS2015/virtualjaguar_VS2015-DebugSetup.txt
 *.bak
 makefile-qt
 makefile-qt*.*
@@ -46,3 +30,5 @@ Win-VS2017/virtualjaguar.VC.db
 Win-VS2017/virtualjaguar.VC.VC.opendb
 Win-VS2017/virtualjaguar.sdf
 Win-VS2017/virtualjaguar.vcxproj.user
+Win-VS2017/GeneratedFiles/
+Win-VS2015/
diff --git a/Win-VS2017/jaguarcore/jaguarcore.vcxproj.filters b/Win-VS2017/jaguarcore/jaguarcore.vcxproj.filters
index 182fffd..4bd05da 100644
--- a/Win-VS2017/jaguarcore/jaguarcore.vcxproj.filters
+++ b/Win-VS2017/jaguarcore/jaguarcore.vcxproj.filters
@@ -16,6 +16,12 @@
     <Filter Include="Header Files\_MSC_VER">
       <UniqueIdentifier>{f8340eff-4674-4d53-ac72-ae784aa774a1}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Header Files\BIOS">
+      <UniqueIdentifier>{2b278f38-8229-4460-a0fe-d257975052a5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\BIOS">
+      <UniqueIdentifier>{520c176e-6a0d-4c43-8d17-e7ba997a3b18}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\_MSC_VER\config.h">
@@ -48,15 +54,6 @@
     <ClInclude Include="..\..\src\eeprom.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\jagbios.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\jagbios2.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\jagcdbios.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\filedb.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -66,15 +63,6 @@
     <ClInclude Include="..\..\src\gpu.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\jagdevcdbios.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\jagstub1bios.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\src\jagstub2bios.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\src\jagdasm.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -105,6 +93,24 @@
     <ClInclude Include="..\..\src\modelsBIOS.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\jagstub1bios.h">
+      <Filter>Header Files\BIOS</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\jagdevcdbios.h">
+      <Filter>Header Files\BIOS</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\jagcdbios.h">
+      <Filter>Header Files\BIOS</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\jagbios2.h">
+      <Filter>Header Files\BIOS</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\jagbios.h">
+      <Filter>Header Files\BIOS</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\jagstub2bios.h">
+      <Filter>Header Files\BIOS</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\blitter.cpp">
@@ -134,27 +140,9 @@
     <ClCompile Include="..\..\src\gpu.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\jagbios.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\jagbios2.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\jagcdbios.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\jagdasm.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\jagdevcdbios.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\jagstub1bios.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\jagstub2bios.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\jaguar.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -191,5 +179,23 @@
     <ClCompile Include="..\..\src\modelsBIOS.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\jagstub2bios.cpp">
+      <Filter>Source Files\BIOS</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\jagstub1bios.cpp">
+      <Filter>Source Files\BIOS</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\jagdevcdbios.cpp">
+      <Filter>Source Files\BIOS</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\jagcdbios.cpp">
+      <Filter>Source Files\BIOS</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\jagbios2.cpp">
+      <Filter>Source Files\BIOS</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\jagbios.cpp">
+      <Filter>Source Files\BIOS</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Win-VS2017/virtualjaguar.vcxproj b/Win-VS2017/virtualjaguar.vcxproj
index 24f7707..3ee9d8b 100644
--- a/Win-VS2017/virtualjaguar.vcxproj
+++ b/Win-VS2017/virtualjaguar.vcxproj
@@ -505,7 +505,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="GeneratedFiles\Release\moc_debuggertab.cpp" />
+    <ClCompile Include="GeneratedFiles\Release\moc_debuggertab.cpp">
+	  <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_DSPDasmWin.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-- 
2.20.1