Fixed Visual solution

diff --git a/lib/divsufsort.c b/lib/divsufsort.c
index 9f45df59015a7e0f9392545e612b90211f79598e..60cceb088321ce5b62c297a6e714bafff5ae8e75 100644 (file)
--- a/lib/divsufsort.c
+++ b/lib/divsufsort.c
@@ -30,7 +30,8 @@
 #endif
 
 #if defined(_MSC_VER)
-  #pragma warning(disable : 4244)
+#  pragma warning(disable : 4244)
+#  pragma warning(disable : 4127)    /* C4127 : Condition expression is constant */
 #endif
 
 

diff --git a/lib/zdict.c b/lib/zdict.c
index cd58ab8a970a3e13378e3ce9f79c520a1d9a0d82..d3d5784dda8bcc766ffede22c80361bf5dab5068 100644 (file)
--- a/lib/zdict.c
+++ b/lib/zdict.c
@@ -36,7 +36,6 @@
 ****************************************/
 /* Disable some Visual warning messages */
 #ifdef _MSC_VER
-#  define _CRT_SECURE_NO_WARNINGS                /* fopen */
 #  pragma warning(disable : 4127)                /* disable: C4127: conditional expression is constant */
 #endif
 

diff --git a/lib/zstd_opt.h b/lib/zstd_opt.h
index 1ea88f10327b1b985128fedffe0e79bce5c5a983..f3e9bd2252dd9fd58a1c4b2832a8765ada39875a 100644 (file)
--- a/lib/zstd_opt.h
+++ b/lib/zstd_opt.h
@@ -416,8 +416,8 @@ static U32 ZSTD_HcGetAllMatches_selectMLS_extDict (
 *********************************/
 FORCE_INLINE
 void ZSTD_compressBlock_opt_generic(ZSTD_CCtx* ctx,
-                                     const void* src, size_t srcSize,
-                                     const U32 searchMethod, const U32 depth)
+                                    const void* src, size_t srcSize,
+                                    const U32 searchMethod, const U32 depth)
 {
     seqStore_t* seqStorePtr = &(ctx->seqStore);
     const BYTE* const istart = (const BYTE*)src;

diff --git a/visual/2013/dictBuilder/dictBuilder.vcxproj b/visual/2013/dictBuilder/dictBuilder.vcxproj
deleted file mode 100644 (file)
index 0260102..0000000
--- a/visual/2013/dictBuilder/dictBuilder.vcxproj
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup Label="ProjectConfigurations">\r
-    <ProjectConfiguration Include="Debug|Win32">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Debug|x64">\r
-      <Configuration>Debug</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|Win32">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>Win32</Platform>\r
-    </ProjectConfiguration>\r
-    <ProjectConfiguration Include="Release|x64">\r
-      <Configuration>Release</Configuration>\r
-      <Platform>x64</Platform>\r
-    </ProjectConfiguration>\r
-  </ItemGroup>\r
-  <PropertyGroup Label="Globals">\r
-    <ProjectGuid>{D4C01A3D-F609-4DA6-B53F-88D063CCE993}</ProjectGuid>\r
-    <Keyword>Win32Proj</Keyword>\r
-    <RootNamespace>fuzzer</RootNamespace>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">\r
-    <ConfigurationType>Application</ConfigurationType>\r
-    <UseDebugLibraries>true</UseDebugLibraries>\r
-    <PlatformToolset>v120</PlatformToolset>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">\r
-    <ConfigurationType>Application</ConfigurationType>\r
-    <UseDebugLibraries>true</UseDebugLibraries>\r
-    <PlatformToolset>v120</PlatformToolset>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">\r
-    <ConfigurationType>Application</ConfigurationType>\r
-    <UseDebugLibraries>false</UseDebugLibraries>\r
-    <PlatformToolset>v120</PlatformToolset>\r
-    <WholeProgramOptimization>true</WholeProgramOptimization>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">\r
-    <ConfigurationType>Application</ConfigurationType>\r
-    <UseDebugLibraries>false</UseDebugLibraries>\r
-    <PlatformToolset>v120</PlatformToolset>\r
-    <WholeProgramOptimization>true</WholeProgramOptimization>\r
-    <CharacterSet>Unicode</CharacterSet>\r
-  </PropertyGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />\r
-  <ImportGroup Label="ExtensionSettings">\r
-  </ImportGroup>\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">\r
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />\r
-  </ImportGroup>\r
-  <PropertyGroup Label="UserMacros" />\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <LinkIncremental>true</LinkIncremental>\r
-    <IncludePath>$(SolutionDir)..\..\lib;$(SolutionDir)..\..\lib\legacy;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);</IncludePath>\r
-    <RunCodeAnalysis>true</RunCodeAnalysis>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <LinkIncremental>true</LinkIncremental>\r
-    <IncludePath>$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);</IncludePath>\r
-    <RunCodeAnalysis>true</RunCodeAnalysis>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <LinkIncremental>false</LinkIncremental>\r
-    <IncludePath>$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);</IncludePath>\r
-    <RunCodeAnalysis>true</RunCodeAnalysis>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <LinkIncremental>false</LinkIncremental>\r
-    <IncludePath>$(SolutionDir)..\..\lib\legacy;$(SolutionDir)..\..\lib;$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSDK_IncludePath);</IncludePath>\r
-    <RunCodeAnalysis>true</RunCodeAnalysis>\r
-  </PropertyGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
-    <ClCompile>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
-      <WarningLevel>Level4</WarningLevel>\r
-      <Optimization>Disabled</Optimization>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <EnablePREfast>true</EnablePREfast>\r
-      <AdditionalOptions>/analyze:stacksize25000 %(AdditionalOptions)</AdditionalOptions>\r
-    </ClCompile>\r
-    <Link>\r
-      <SubSystem>Console</SubSystem>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <AdditionalDependencies>setargv.obj;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">\r
-    <ClCompile>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
-      <WarningLevel>Level4</WarningLevel>\r
-      <Optimization>Disabled</Optimization>\r
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <EnablePREfast>true</EnablePREfast>\r
-      <AdditionalOptions>/analyze:stacksize25000 %(AdditionalOptions)</AdditionalOptions>\r
-    </ClCompile>\r
-    <Link>\r
-      <SubSystem>Console</SubSystem>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
-    <ClCompile>\r
-      <WarningLevel>Level4</WarningLevel>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
-      <Optimization>MaxSpeed</Optimization>\r
-      <FunctionLevelLinking>true</FunctionLevelLinking>\r
-      <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <EnablePREfast>true</EnablePREfast>\r
-      <AdditionalOptions>/analyze:stacksize25000 %(AdditionalOptions)</AdditionalOptions>\r
-    </ClCompile>\r
-    <Link>\r
-      <SubSystem>Console</SubSystem>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
-      <OptimizeReferences>true</OptimizeReferences>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">\r
-    <ClCompile>\r
-      <WarningLevel>Level4</WarningLevel>\r
-      <PrecompiledHeader>\r
-      </PrecompiledHeader>\r
-      <Optimization>MaxSpeed</Optimization>\r
-      <FunctionLevelLinking>true</FunctionLevelLinking>\r
-      <IntrinsicFunctions>true</IntrinsicFunctions>\r
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
-      <EnablePREfast>true</EnablePREfast>\r
-      <AdditionalOptions>/analyze:stacksize25000 %(AdditionalOptions)</AdditionalOptions>\r
-    </ClCompile>\r
-    <Link>\r
-      <SubSystem>Console</SubSystem>\r
-      <GenerateDebugInformation>true</GenerateDebugInformation>\r
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
-      <OptimizeReferences>true</OptimizeReferences>\r
-    </Link>\r
-  </ItemDefinitionGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="..\..\..\dictBuilder\dibcli.c" />\r
-    <ClCompile Include="..\..\..\dictBuilder\dictBuilder.c" />\r
-    <ClCompile Include="..\..\..\dictBuilder\divsufsort.c" />\r
-    <ClCompile Include="..\..\..\dictBuilder\sssort.c" />\r
-    <ClCompile Include="..\..\..\dictBuilder\trsort.c" />\r
-    <ClCompile Include="..\..\..\dictBuilder\utils.c" />\r
-    <ClCompile Include="..\..\..\lib\fse.c" />\r
-    <ClCompile Include="..\..\..\lib\huff0.c" />\r
-    <ClCompile Include="..\..\..\lib\zstd_decompress.c" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClInclude Include="..\..\..\dictBuilder\config.h" />\r
-    <ClInclude Include="..\..\..\dictBuilder\dictBuilder.h" />\r
-    <ClInclude Include="..\..\..\dictBuilder\divsufsort.h" />\r
-    <ClInclude Include="..\..\..\dictBuilder\divsufsort_private.h" />\r
-    <ClInclude Include="..\..\..\dictBuilder\lfs.h" />\r
-    <ClInclude Include="..\..\..\lib\fse.h" />\r
-    <ClInclude Include="..\..\..\lib\huff0.h" />\r
-    <ClInclude Include="..\..\..\lib\huff0_static.h" />\r
-    <ClInclude Include="..\..\..\lib\zstd.h" />\r
-  </ItemGroup>\r
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
-  <ImportGroup Label="ExtensionTargets">\r
-  </ImportGroup>\r
-</Project>
\ No newline at end of file

diff --git a/visual/2013/dictBuilder/dictBuilder.vcxproj.filters b/visual/2013/dictBuilder/dictBuilder.vcxproj.filters
deleted file mode 100644 (file)
index a38cc30..0000000
--- a/visual/2013/dictBuilder/dictBuilder.vcxproj.filters
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <ItemGroup>\r
-    <Filter Include="Fichiers sources">\r
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>\r
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>\r
-    </Filter>\r
-    <Filter Include="Fichiers d%27en-tête">\r
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>\r
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>\r
-    </Filter>\r
-    <Filter Include="Fichiers de ressources">\r
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>\r
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>\r
-    </Filter>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClCompile Include="..\..\..\dictBuilder\dibcli.c">\r
-      <Filter>Fichiers sources</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\..\dictBuilder\dictBuilder.c">\r
-      <Filter>Fichiers sources</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\..\dictBuilder\divsufsort.c">\r
-      <Filter>Fichiers sources</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\..\dictBuilder\sssort.c">\r
-      <Filter>Fichiers sources</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\..\dictBuilder\trsort.c">\r
-      <Filter>Fichiers sources</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\..\dictBuilder\utils.c">\r
-      <Filter>Fichiers sources</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\..\lib\fse.c">\r
-      <Filter>Fichiers sources</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\..\lib\huff0.c">\r
-      <Filter>Fichiers sources</Filter>\r
-    </ClCompile>\r
-    <ClCompile Include="..\..\..\lib\zstd_decompress.c">\r
-      <Filter>Fichiers sources</Filter>\r
-    </ClCompile>\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ClInclude Include="..\..\..\dictBuilder\config.h">\r
-      <Filter>Fichiers d%27en-tête</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\..\dictBuilder\dictBuilder.h">\r
-      <Filter>Fichiers d%27en-tête</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\..\dictBuilder\divsufsort.h">\r
-      <Filter>Fichiers d%27en-tête</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\..\dictBuilder\divsufsort_private.h">\r
-      <Filter>Fichiers d%27en-tête</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\..\dictBuilder\lfs.h">\r
-      <Filter>Fichiers d%27en-tête</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\..\lib\fse.h">\r
-      <Filter>Fichiers d%27en-tête</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\..\lib\huff0.h">\r
-      <Filter>Fichiers d%27en-tête</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\..\lib\huff0_static.h">\r
-      <Filter>Fichiers d%27en-tête</Filter>\r
-    </ClInclude>\r
-    <ClInclude Include="..\..\..\lib\zstd.h">\r
-      <Filter>Fichiers d%27en-tête</Filter>\r
-    </ClInclude>\r
-  </ItemGroup>\r
-</Project>
\ No newline at end of file

diff --git a/visual/2013/fullbench/fullbench.vcxproj b/visual/2013/fullbench/fullbench.vcxproj
index c0d737682eced3bc0b7ab8374a94f832ee12aca0..3797960f460f277f101bab621b000a05c14c1e6d 100644 (file)
--- a/visual/2013/fullbench/fullbench.vcxproj
+++ b/visual/2013/fullbench/fullbench.vcxproj
@@ -161,9 +161,6 @@
   <ItemGroup>\r
     <ClCompile Include="..\..\..\lib\fse.c" />\r
     <ClCompile Include="..\..\..\lib\huff0.c" />\r
-    <ClCompile Include="..\..\..\lib\legacy\zstd_v01.c" />\r
-    <ClCompile Include="..\..\..\lib\legacy\zstd_v02.c" />\r
-    <ClCompile Include="..\..\..\lib\legacy\zstd_v03.c" />\r
     <ClCompile Include="..\..\..\lib\zstd_compress.c" />\r
     <ClCompile Include="..\..\..\lib\zstd_decompress.c" />\r
     <ClCompile Include="..\..\..\programs\datagen.c" />\r

diff --git a/visual/2013/fullbench/fullbench.vcxproj.filters b/visual/2013/fullbench/fullbench.vcxproj.filters
index c3db1976806d6bb1f6f8190eba2e05c21a161f8c..3a82000fb55ff0c5359b5bf21f9cb3f019e34e0d 100644 (file)
--- a/visual/2013/fullbench/fullbench.vcxproj.filters
+++ b/visual/2013/fullbench/fullbench.vcxproj.filters
@@ -24,24 +24,15 @@
     <ClCompile Include="..\..\..\programs\datagen.c">\r
       <Filter>Fichiers sources</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\..\lib\legacy\zstd_v01.c">\r
-      <Filter>Fichiers sources</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\..\lib\huff0.c">\r
       <Filter>Fichiers sources</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\..\lib\legacy\zstd_v02.c">\r
-      <Filter>Fichiers sources</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\..\lib\zstd_compress.c">\r
       <Filter>Fichiers sources</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\..\lib\zstd_decompress.c">\r
       <Filter>Fichiers sources</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\..\lib\legacy\zstd_v03.c">\r
-      <Filter>Fichiers sources</Filter>\r
-    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\..\lib\fse.h">\r

diff --git a/visual/2013/zstd.sln b/visual/2013/zstd.sln
index c132ddda63991393ed728ff5507d55c1327f26f0..3186fc67089ad8d30ba42c1681cd10234f88e125 100644 (file)
--- a/visual/2013/zstd.sln
+++ b/visual/2013/zstd.sln
@@ -1,7 +1,7 @@
 \r
 Microsoft Visual Studio Solution File, Format Version 12.00\r
-# Visual Studio 14\r
-VisualStudioVersion = 14.0.24720.0\r
+# Visual Studio 2013\r
+VisualStudioVersion = 12.0.40629.0\r
 MinimumVisualStudioVersion = 10.0.40219.1\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstd", "zstd\zstd.vcxproj", "{4E52A41A-F33B-4C7A-8C36-A1A6B4F4277C}"\r
 EndProject\r
@@ -11,8 +11,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fullbench", "fullbench\full
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zstdlib", "zstdlib\zstdlib.vcxproj", "{8BFD8150-94D5-4BF9-8A50-7BD9929A0850}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dictBuilder", "dictBuilder\dictBuilder.vcxproj", "{D4C01A3D-F609-4DA6-B53F-88D063CCE993}"\r
-EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
@@ -53,14 +51,6 @@ Global
                {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|Win32.Build.0 = Release|Win32\r
                {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|x64.ActiveCfg = Release|x64\r
                {8BFD8150-94D5-4BF9-8A50-7BD9929A0850}.Release|x64.Build.0 = Release|x64\r
-               {D4C01A3D-F609-4DA6-B53F-88D063CCE993}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {D4C01A3D-F609-4DA6-B53F-88D063CCE993}.Debug|Win32.Build.0 = Debug|Win32\r
-               {D4C01A3D-F609-4DA6-B53F-88D063CCE993}.Debug|x64.ActiveCfg = Debug|x64\r
-               {D4C01A3D-F609-4DA6-B53F-88D063CCE993}.Debug|x64.Build.0 = Debug|x64\r
-               {D4C01A3D-F609-4DA6-B53F-88D063CCE993}.Release|Win32.ActiveCfg = Release|Win32\r
-               {D4C01A3D-F609-4DA6-B53F-88D063CCE993}.Release|Win32.Build.0 = Release|Win32\r
-               {D4C01A3D-F609-4DA6-B53F-88D063CCE993}.Release|x64.ActiveCfg = Release|x64\r
-               {D4C01A3D-F609-4DA6-B53F-88D063CCE993}.Release|x64.Build.0 = Release|x64\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r

diff --git a/visual/2013/zstd/zstd.vcxproj b/visual/2013/zstd/zstd.vcxproj
index 1c3f0d1f244d8450695abc0f81773d11bcbc1e5c..4531976908100fcdde0e82d5f7cafc15328d7258 100644 (file)
--- a/visual/2013/zstd/zstd.vcxproj
+++ b/visual/2013/zstd/zstd.vcxproj
@@ -19,23 +19,27 @@
     </ProjectConfiguration>\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <ClCompile Include="..\..\..\lib\divsufsort.c" />\r
     <ClCompile Include="..\..\..\lib\fse.c" />\r
     <ClCompile Include="..\..\..\lib\huff0.c" />\r
     <ClCompile Include="..\..\..\lib\legacy\zstd_v01.c" />\r
     <ClCompile Include="..\..\..\lib\legacy\zstd_v02.c" />\r
     <ClCompile Include="..\..\..\lib\legacy\zstd_v03.c" />\r
     <ClCompile Include="..\..\..\lib\legacy\zstd_v04.c" />\r
-    <ClCompile Include="..\..\..\lib\zstd_buffered.c" />\r
+    <ClCompile Include="..\..\..\lib\zbuff.c" />\r
+    <ClCompile Include="..\..\..\lib\zdict.c" />\r
     <ClCompile Include="..\..\..\lib\zstd_compress.c" />\r
     <ClCompile Include="..\..\..\lib\zstd_decompress.c" />\r
     <ClCompile Include="..\..\..\programs\bench.c" />\r
     <ClCompile Include="..\..\..\programs\datagen.c" />\r
+    <ClCompile Include="..\..\..\programs\dibio.c" />\r
     <ClCompile Include="..\..\..\programs\fileio.c" />\r
     <ClCompile Include="..\..\..\programs\legacy\fileio_legacy.c" />\r
     <ClCompile Include="..\..\..\programs\xxhash.c" />\r
     <ClCompile Include="..\..\..\programs\zstdcli.c" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <ClInclude Include="..\..\..\lib\divsufsort.h" />\r
     <ClInclude Include="..\..\..\lib\fse.h" />\r
     <ClInclude Include="..\..\..\lib\fse_static.h" />\r
     <ClInclude Include="..\..\..\lib\huff0.h" />\r
@@ -45,6 +49,10 @@
     <ClInclude Include="..\..\..\lib\legacy\zstd_v02.h" />\r
     <ClInclude Include="..\..\..\lib\legacy\zstd_v03.h" />\r
     <ClInclude Include="..\..\..\lib\legacy\zstd_v04.h" />\r
+    <ClInclude Include="..\..\..\lib\zbuff.h" />\r
+    <ClInclude Include="..\..\..\lib\zbuff_static.h" />\r
+    <ClInclude Include="..\..\..\lib\zdict.h" />\r
+    <ClInclude Include="..\..\..\lib\zdict_static.h" />\r
     <ClInclude Include="..\..\..\lib\zstd.h" />\r
     <ClInclude Include="..\..\..\lib\zstd_buffered.h" />\r
     <ClInclude Include="..\..\..\lib\zstd_buffered_static.h" />\r
@@ -52,6 +60,7 @@
     <ClInclude Include="..\..\..\lib\zstd_static.h" />\r
     <ClInclude Include="..\..\..\programs\bench.h" />\r
     <ClInclude Include="..\..\..\programs\datagen.h" />\r
+    <ClInclude Include="..\..\..\programs\dibio.h" />\r
     <ClInclude Include="..\..\..\programs\fileio.h" />\r
     <ClInclude Include="..\..\..\programs\legacy\fileio_legacy.h" />\r
     <ClInclude Include="..\..\..\programs\xxhash.h" />\r

diff --git a/visual/2013/zstd/zstd.vcxproj.filters b/visual/2013/zstd/zstd.vcxproj.filters
index e8ab9fe587824353cabad74653e526bb7db70b68..31a97801987524b5e4d70e0950285f63686f2423 100644 (file)
--- a/visual/2013/zstd/zstd.vcxproj.filters
+++ b/visual/2013/zstd/zstd.vcxproj.filters
@@ -48,9 +48,6 @@
     <ClCompile Include="..\..\..\lib\zstd_decompress.c">\r
       <Filter>Fichiers sources</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\..\lib\zstd_buffered.c">\r
-      <Filter>Fichiers sources</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\..\lib\legacy\zstd_v03.c">\r
       <Filter>Fichiers sources</Filter>\r
     </ClCompile>\r
@@ -60,6 +57,18 @@
     <ClCompile Include="..\..\..\lib\legacy\zstd_v04.c">\r
       <Filter>Fichiers sources</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\..\lib\divsufsort.c">\r
+      <Filter>Fichiers sources</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\..\lib\zbuff.c">\r
+      <Filter>Fichiers sources</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\..\lib\zdict.c">\r
+      <Filter>Fichiers sources</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\..\programs\dibio.c">\r
+      <Filter>Fichiers sources</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\..\lib\fse.h">\r
@@ -119,5 +128,23 @@
     <ClInclude Include="..\..\..\lib\legacy\zstd_v04.h">\r
       <Filter>Fichiers d%27en-tête</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\..\lib\divsufsort.h">\r
+      <Filter>Fichiers sources</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\lib\zbuff.h">\r
+      <Filter>Fichiers sources</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\lib\zbuff_static.h">\r
+      <Filter>Fichiers sources</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\lib\zdict.h">\r
+      <Filter>Fichiers sources</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\lib\zdict_static.h">\r
+      <Filter>Fichiers sources</Filter>\r
+    </ClInclude>\r
+    <ClInclude Include="..\..\..\programs\dibio.h">\r
+      <Filter>Fichiers d%27en-tête</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file

diff --git a/visual/2013/zstdlib/zstdlib.vcxproj b/visual/2013/zstdlib/zstdlib.vcxproj
index 05a03ab8dbaa3ccddcb02076d838c5027b7f5e2d..b13bc98ff7c81ed77bbb2aaf22270976356022be 100644 (file)
--- a/visual/2013/zstdlib/zstdlib.vcxproj
+++ b/visual/2013/zstdlib/zstdlib.vcxproj
@@ -21,7 +21,7 @@
   <ItemGroup>\r
     <ClCompile Include="..\..\..\lib\fse.c" />\r
     <ClCompile Include="..\..\..\lib\huff0.c" />\r
-    <ClCompile Include="..\..\..\lib\zstd_buffered.c" />\r
+    <ClCompile Include="..\..\..\lib\zbuff.c" />\r
     <ClCompile Include="..\..\..\lib\zstd_compress.c" />\r
     <ClCompile Include="..\..\..\lib\zstd_decompress.c" />\r
   </ItemGroup>\r
@@ -34,9 +34,9 @@
     <ClInclude Include="..\..\..\lib\huff0.h" />\r
     <ClInclude Include="..\..\..\lib\huff0_static.h" />\r
     <ClInclude Include="..\..\..\lib\mem.h" />\r
+    <ClInclude Include="..\..\..\lib\zbuff.h" />\r
+    <ClInclude Include="..\..\..\lib\zbuff_static.h" />\r
     <ClInclude Include="..\..\..\lib\zstd.h" />\r
-    <ClInclude Include="..\..\..\lib\zstd_buffered.h" />\r
-    <ClInclude Include="..\..\..\lib\zstd_buffered_static.h" />\r
     <ClInclude Include="..\..\..\lib\zstd_internal.h" />\r
     <ClInclude Include="..\..\..\lib\zstd_static.h" />\r
     <ClInclude Include="resource.h" />\r

diff --git a/visual/2013/zstdlib/zstdlib.vcxproj.filters b/visual/2013/zstdlib/zstdlib.vcxproj.filters
index e4bdf7dbff1941b70dde09ad216b054ade02127e..ffb457b0b15ae2556179d34cf9935aa8d8a360f9 100644 (file)
--- a/visual/2013/zstdlib/zstdlib.vcxproj.filters
+++ b/visual/2013/zstdlib/zstdlib.vcxproj.filters
@@ -21,15 +21,15 @@
     <ClCompile Include="..\..\..\lib\huff0.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
-    <ClCompile Include="..\..\..\lib\zstd_buffered.c">\r
-      <Filter>Source Files</Filter>\r
-    </ClCompile>\r
     <ClCompile Include="..\..\..\lib\zstd_compress.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
     <ClCompile Include="..\..\..\lib\zstd_decompress.c">\r
       <Filter>Source Files</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\..\lib\zbuff.c">\r
+      <Filter>Source Files</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\..\lib\fse.h">\r
@@ -59,19 +59,19 @@
     <ClInclude Include="..\..\..\lib\zstd_internal.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\lib\zstd_buffered.h">\r
+    <ClInclude Include="..\..\..\lib\mem.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\lib\zstd_buffered_static.h">\r
+    <ClInclude Include="..\..\..\lib\error_private.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\lib\mem.h">\r
+    <ClInclude Include="..\..\..\lib\error_public.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\lib\error_private.h">\r
+    <ClInclude Include="..\..\..\lib\zbuff.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
-    <ClInclude Include="..\..\..\lib\error_public.h">\r
+    <ClInclude Include="..\..\..\lib\zbuff_static.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
   </ItemGroup>\r