From be4106208c51fe416a986752d19a2e7d874ce11f Mon Sep 17 00:00:00 2001
From: Jonathan Campbell <jonathan@castus.tv>
Date: Thu, 28 Dec 2017 23:45:58 -0800
Subject: [PATCH] VS2017: Update sln/vcproj to follow dynamic core removal.
 CHANGELOG update.

---
 CHANGELOG                       | 6 ++++++
 vs2015/dosbox-x.vcxproj         | 1 -
 vs2015/dosbox-x.vcxproj.filters | 3 ---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 765b42941c3..8275b2ed96e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,10 @@
 <next>
+  - Removed non-recursive page fault option. It is now always on,
+    except for internal cases where it needs to be off for callback
+    instructions to do their work properly.
+  - Removed dynamic x86 core. It is old and unmaintained code that
+    is incompatible with the non-recursive page fault system.
+  - IRQ cascade interrupt fixes and cleanup.
   - BAT files given on the command line fixed to occur AFTER the
     registration of ULTRASND and BLASTER environment variables.
   - PC-98: DOS CON emulation fixed to decode Shift-JIS itself,
diff --git a/vs2015/dosbox-x.vcxproj b/vs2015/dosbox-x.vcxproj
index d5e74e42a90..735268dcda3 100644
--- a/vs2015/dosbox-x.vcxproj
+++ b/vs2015/dosbox-x.vcxproj
@@ -636,7 +636,6 @@ copy "$(SolutionDir)\..\dosbox.reference.conf" "$(OutputPath)\dosbox.reference.c
     <ClCompile Include="..\src\builtin\tree_exe.cpp" />
     <ClCompile Include="..\src\builtin\xcopy_exe.cpp" />
     <ClCompile Include="..\src\cpu\callback.cpp" />
-    <ClCompile Include="..\src\cpu\core_dyn_x86.cpp" />
     <ClCompile Include="..\src\cpu\core_full.cpp" />
     <ClCompile Include="..\src\cpu\core_normal.cpp" />
     <ClCompile Include="..\src\cpu\core_normal_286.cpp" />
diff --git a/vs2015/dosbox-x.vcxproj.filters b/vs2015/dosbox-x.vcxproj.filters
index c3072f6ad5b..62f02d05fe0 100644
--- a/vs2015/dosbox-x.vcxproj.filters
+++ b/vs2015/dosbox-x.vcxproj.filters
@@ -80,9 +80,6 @@
     <ClCompile Include="..\src\hardware\cmos.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\cpu\core_dyn_x86.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\cpu\core_full.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>