VS2017 project updates

diff --git a/.gitignore b/.gitignore
index 3626602..05baa39 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -11,22 +11,6 @@ src/m68000/obj/*.a
 src/m68000/obj/*.exe\r
 src/m68000/obj/*.d\r
 src/m68000/obj/*.o\r
-Win-VS2015/m68000/m68000.vcxproj.user\r
-Win-VS2015/jaguarcore/jaguarcore.vcxproj.user\r
-Win-VS2015/x64/Archives/\r
-Win-VS2015/*/x64/\r
-Win-VS2015/*/*_VS2015-DebugSetup.txt\r
-Win-VS2015/*/ReadMe.txt\r
-Win-VS2015/.vs/\r
-Win-VS2015/obj/\r
-Win-VS2015/Win32/\r
-Win-VS2015/x64/\r
-Win-VS2015/virtualjaguar.vcxproj.txt\r
-Win-VS2015/virtualjaguar.VC.db\r
-Win-VS2015/virtualjaguar.VC.VC.opendb\r
-Win-VS2015/virtualjaguar.sdf\r
-Win-VS2015/virtualjaguar.vcxproj.user\r
-Win-VS2015/virtualjaguar_VS2015-DebugSetup.txt\r
 *.bak\r
 makefile-qt\r
 makefile-qt*.*\r
@@ -46,3 +30,5 @@ Win-VS2017/virtualjaguar.VC.db
 Win-VS2017/virtualjaguar.VC.VC.opendb\r
 Win-VS2017/virtualjaguar.sdf\r
 Win-VS2017/virtualjaguar.vcxproj.user\r
+Win-VS2017/GeneratedFiles/\r
+Win-VS2015/\r

diff --git a/Win-VS2017/jaguarcore/jaguarcore.vcxproj.filters b/Win-VS2017/jaguarcore/jaguarcore.vcxproj.filters
index 182fffd..4bd05da 100644 (file)
--- a/Win-VS2017/jaguarcore/jaguarcore.vcxproj.filters
+++ b/Win-VS2017/jaguarcore/jaguarcore.vcxproj.filters
@@ -16,6 +16,12 @@
     <Filter Include="Header Files\_MSC_VER">\r
       <UniqueIdentifier>{f8340eff-4674-4d53-ac72-ae784aa774a1}</UniqueIdentifier>\r
     </Filter>\r
+    <Filter Include="Header Files\BIOS">\r
+      <UniqueIdentifier>{2b278f38-8229-4460-a0fe-d257975052a5}</UniqueIdentifier>\r
+    </Filter>\r
+    <Filter Include="Source Files\BIOS">\r
+      <UniqueIdentifier>{520c176e-6a0d-4c43-8d17-e7ba997a3b18}</UniqueIdentifier>\r
+    </Filter>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\src\_MSC_VER\config.h">\r
@@ -48,15 +54,6 @@
     <ClInclude Include="..\..\src\eeprom.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\src\jagbios.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\src\jagbios2.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\src\jagcdbios.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\src\filedb.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
@@ -66,15 +63,6 @@
     <ClInclude Include="..\..\src\gpu.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\src\jagdevcdbios.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\src\jagstub1bios.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\src\jagstub2bios.h">\r
-      <Filter>Header Files</Filter>\r
-    </ClInclude>\r
     <ClInclude Include="..\..\src\jagdasm.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
@@ -105,6 +93,24 @@
     <ClInclude Include="..\..\src\modelsBIOS.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\src\jagstub1bios.h">\r
+      <Filter>Header Files\BIOS</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\src\jagdevcdbios.h">\r
+      <Filter>Header Files\BIOS</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\src\jagcdbios.h">\r
+      <Filter>Header Files\BIOS</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\src\jagbios2.h">\r
+      <Filter>Header Files\BIOS</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\src\jagbios.h">\r
+      <Filter>Header Files\BIOS</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\src\jagstub2bios.h">\r
+      <Filter>Header Files\BIOS</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClCompile Include="..\..\src\blitter.cpp">\r
@@ -134,27 +140,9 @@
     <ClCompile Include="..\..\src\gpu.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\src\jagbios.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\src\jagbios2.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\src\jagcdbios.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\src\jagdasm.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\src\jagdevcdbios.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\src\jagstub1bios.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\src\jagstub2bios.cpp">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\src\jaguar.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
@@ -191,5 +179,23 @@
     <ClCompile Include="..\..\src\modelsBIOS.cpp">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\src\jagstub2bios.cpp">\r
+      <Filter>Source Files\BIOS</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\jagstub1bios.cpp">\r
+      <Filter>Source Files\BIOS</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\jagdevcdbios.cpp">\r
+      <Filter>Source Files\BIOS</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\jagcdbios.cpp">\r
+      <Filter>Source Files\BIOS</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\jagbios2.cpp">\r
+      <Filter>Source Files\BIOS</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\src\jagbios.cpp">\r
+      <Filter>Source Files\BIOS</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/Win-VS2017/virtualjaguar.vcxproj b/Win-VS2017/virtualjaguar.vcxproj
index 24f7707..3ee9d8b 100644 (file)
--- a/Win-VS2017/virtualjaguar.vcxproj
+++ b/Win-VS2017/virtualjaguar.vcxproj
@@ -505,7 +505,10 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
     </ClCompile>\r
-    <ClCompile Include="GeneratedFiles\Release\moc_debuggertab.cpp" />\r
+    <ClCompile Include="GeneratedFiles\Release\moc_debuggertab.cpp">\r
+         <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r
+    </ClCompile>\r
     <ClCompile Include="GeneratedFiles\Release\moc_DSPDasmWin.cpp">\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>\r
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>\r