From fa2439a383fd7ffede286a2e7d87e0896963b315 Mon Sep 17 00:00:00 2001
From: Emmanuel Marty <emmanuel@fgl.com>
Date: Fri, 7 Jun 2019 23:21:04 +0200
Subject: [PATCH] Update VS2017 project after code split

---
 VS2017/lzsa.vcxproj         | 33 +++++++++-----
 VS2017/lzsa.vcxproj.filters | 91 +++++++++++++++++++++++++------------
 VS2017/lzsa.vcxproj.user    |  8 ++--
 3 files changed, 88 insertions(+), 44 deletions(-)

diff --git a/VS2017/lzsa.vcxproj b/VS2017/lzsa.vcxproj
index 122d826..bc2f3c8 100755
--- a/VS2017/lzsa.vcxproj
+++ b/VS2017/lzsa.vcxproj
@@ -177,35 +177,46 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\expand_v1.h" />
-    <ClInclude Include="..\src\expand_v2.h" />
+    <ClInclude Include="..\src\dictionary.h" />
+    <ClInclude Include="..\src\expand_context.h" />
+    <ClInclude Include="..\src\expand_streaming.h" />
+    <ClInclude Include="..\src\expand_block_v1.h" />
+    <ClInclude Include="..\src\expand_block_v2.h" />
     <ClInclude Include="..\src\format.h" />
     <ClInclude Include="..\src\frame.h" />
-    <ClInclude Include="..\src\inmem.h" />
+    <ClInclude Include="..\src\expand_inmem.h" />
     <ClInclude Include="..\src\lib.h" />
     <ClInclude Include="..\src\libdivsufsort\include\config.h" />
     <ClInclude Include="..\src\libdivsufsort\include\divsufsort.h" />
     <ClInclude Include="..\src\libdivsufsort\include\divsufsort_private.h" />
     <ClInclude Include="..\src\matchfinder.h" />
-    <ClInclude Include="..\src\shrink_v1.h" />
-    <ClInclude Include="..\src\shrink_v2.h" />
+    <ClInclude Include="..\src\shrink_context.h" />
+    <ClInclude Include="..\src\shrink_inmem.h" />
+    <ClInclude Include="..\src\shrink_streaming.h" />
+    <ClInclude Include="..\src\shrink_block_v1.h" />
+    <ClInclude Include="..\src\shrink_block_v2.h" />
     <ClInclude Include="..\src\stream.h" />
     <ClInclude Include="pch.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\expand_v1.c" />
-    <ClCompile Include="..\src\expand_v2.c" />
+    <ClCompile Include="..\src\dictionary.c" />
+    <ClCompile Include="..\src\expand_context.c" />
+    <ClCompile Include="..\src\expand_streaming.c" />
+    <ClCompile Include="..\src\expand_block_v1.c" />
+    <ClCompile Include="..\src\expand_block_v2.c" />
     <ClCompile Include="..\src\frame.c" />
-    <ClCompile Include="..\src\inmem.c" />
-    <ClCompile Include="..\src\lib.c" />
+    <ClCompile Include="..\src\expand_inmem.c" />
     <ClCompile Include="..\src\libdivsufsort\lib\divsufsort.c" />
     <ClCompile Include="..\src\libdivsufsort\lib\sssort.c" />
     <ClCompile Include="..\src\libdivsufsort\lib\trsort.c" />
     <ClCompile Include="..\src\libdivsufsort\lib\utils.c" />
     <ClCompile Include="..\src\lzsa.c" />
     <ClCompile Include="..\src\matchfinder.c" />
-    <ClCompile Include="..\src\shrink_v1.c" />
-    <ClCompile Include="..\src\shrink_v2.c" />
+    <ClCompile Include="..\src\shrink_context.c" />
+    <ClCompile Include="..\src\shrink_inmem.c" />
+    <ClCompile Include="..\src\shrink_streaming.c" />
+    <ClCompile Include="..\src\shrink_block_v1.c" />
+    <ClCompile Include="..\src\shrink_block_v2.c" />
     <ClCompile Include="..\src\stream.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/VS2017/lzsa.vcxproj.filters b/VS2017/lzsa.vcxproj.filters
index 332d097..740ae0b 100755
--- a/VS2017/lzsa.vcxproj.filters
+++ b/VS2017/lzsa.vcxproj.filters
@@ -42,18 +42,6 @@
     <ClInclude Include="..\src\frame.h">
       <Filter>Fichiers sources</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\expand_v2.h">
-      <Filter>Fichiers sources</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\shrink_v2.h">
-      <Filter>Fichiers sources</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\expand_v1.h">
-      <Filter>Fichiers sources</Filter>
-    </ClInclude>
-    <ClInclude Include="..\src\shrink_v1.h">
-      <Filter>Fichiers sources</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\matchfinder.h">
       <Filter>Fichiers sources</Filter>
     </ClInclude>
@@ -63,7 +51,37 @@
     <ClInclude Include="..\src\stream.h">
       <Filter>Fichiers sources</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\inmem.h">
+    <ClInclude Include="..\src\expand_streaming.h">
+      <Filter>Fichiers sources</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\expand_inmem.h">
+      <Filter>Fichiers sources</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\dictionary.h">
+      <Filter>Fichiers sources</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\shrink_context.h">
+      <Filter>Fichiers sources</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\shrink_streaming.h">
+      <Filter>Fichiers sources</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\expand_context.h">
+      <Filter>Fichiers sources</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\expand_block_v1.h">
+      <Filter>Fichiers sources</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\expand_block_v2.h">
+      <Filter>Fichiers sources</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\shrink_block_v1.h">
+      <Filter>Fichiers sources</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\shrink_block_v2.h">
+      <Filter>Fichiers sources</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\shrink_inmem.h">
       <Filter>Fichiers sources</Filter>
     </ClInclude>
   </ItemGroup>
@@ -83,31 +101,46 @@
     <ClCompile Include="..\src\frame.c">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\expand_v2.c">
-      <Filter>Fichiers sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\shrink_v2.c">
-      <Filter>Fichiers sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\expand_v1.c">
-      <Filter>Fichiers sources</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\shrink_v1.c">
-      <Filter>Fichiers sources</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\matchfinder.c">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\lib.c">
-      <Filter>Fichiers sources</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\lzsa.c">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
     <ClCompile Include="..\src\stream.c">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\inmem.c">
+    <ClCompile Include="..\src\expand_streaming.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\expand_inmem.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\dictionary.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\shrink_context.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\shrink_streaming.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\expand_context.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\expand_block_v1.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\expand_block_v2.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\shrink_block_v1.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\shrink_block_v2.c">
+      <Filter>Fichiers sources</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\shrink_inmem.c">
       <Filter>Fichiers sources</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/VS2017/lzsa.vcxproj.user b/VS2017/lzsa.vcxproj.user
index 0086f75..05b5e9d 100755
--- a/VS2017/lzsa.vcxproj.user
+++ b/VS2017/lzsa.vcxproj.user
@@ -2,25 +2,25 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LocalDebuggerCommand>$(TargetPath)</LocalDebuggerCommand>
-    <LocalDebuggerCommandArguments>-c -v corpus/zxspectrum/graphics/bfox-dont_go_away_(2010).mg1 packed_lzsa/zxspectrum/graphics/bfox-dont_go_away_(2010).mg.lzs</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-test</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerWorkingDirectory>$(ProjectDir)..\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LocalDebuggerCommand>$(TargetPath)</LocalDebuggerCommand>
-    <LocalDebuggerCommandArguments>-c -v corpus/zxspectrum/graphics/bfox-dont_go_away_(2010).mg1 packed_lzsa/zxspectrum/graphics/bfox-dont_go_away_(2010).mg.lzs</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-test</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerWorkingDirectory>$(ProjectDir)..\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LocalDebuggerCommand>$(TargetPath)</LocalDebuggerCommand>
-    <LocalDebuggerCommandArguments>-c -v corpus/zxspectrum/graphics/bfox-dont_go_away_(2010).mg1 packed_lzsa/zxspectrum/graphics/bfox-dont_go_away_(2010).mg.lzs</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-test</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerWorkingDirectory>$(ProjectDir)..\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LocalDebuggerCommand>$(TargetPath)</LocalDebuggerCommand>
-    <LocalDebuggerCommandArguments>-c -v corpus/zxspectrum/graphics/bfox-dont_go_away_(2010).mg1 packed_lzsa/zxspectrum/graphics/bfox-dont_go_away_(2010).mg.lzs</LocalDebuggerCommandArguments>
+    <LocalDebuggerCommandArguments>-test</LocalDebuggerCommandArguments>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerWorkingDirectory>$(ProjectDir)..\</LocalDebuggerWorkingDirectory>
   </PropertyGroup>