From 2384fc36d89a208e7a239edf1ad4726e6e0fd946 Mon Sep 17 00:00:00 2001
From: Gavin Gao <gavingao@zju.edu.cn>
Date: Thu, 27 Sep 2018 18:22:52 +0800
Subject: [PATCH] Fix MSVC (x64)build

Add missing preflate source files
---
 contrib/preflate/preflate_reencoder.h  |   4 +-
 precomp.cpp                            |  27 +-
 vs2015/Precomp/Precomp.vcxproj         | 717 +++++++++++++------------
 vs2015/Precomp/Precomp.vcxproj.filters | 105 ++++
 4 files changed, 497 insertions(+), 356 deletions(-)

diff --git a/contrib/preflate/preflate_reencoder.h b/contrib/preflate/preflate_reencoder.h
index ec7e2f1..c3e5d47 100644
--- a/contrib/preflate/preflate_reencoder.h
+++ b/contrib/preflate/preflate_reencoder.h
@@ -17,8 +17,8 @@
 
 #include <vector>
 #include "preflate_statistical_codec.h"
-#include <support/stream.h>
-#include <support/task_pool.h>
+#include "support/stream.h"
+#include "support/task_pool.h"
 
 class PreflateReencoderTask {
 public:
diff --git a/precomp.cpp b/precomp.cpp
index 1530328..5a7a161 100644
--- a/precomp.cpp
+++ b/precomp.cpp
@@ -1630,40 +1630,43 @@ int init_comfort(int argc, char* argv[]) {
           for (j = 0; j < (int)strlen(value); j++) {
             switch (toupper(value[j])) {
               case 'X':
-                otf_xz_filter_enabled[0] = true;
+                otf_xz_extra_params.enable_filter_x86 = true;
                 break;
               case 'P':
-                otf_xz_filter_enabled[1] = true;
+                otf_xz_extra_params.enable_filter_powerpc = true;
                 break;
               case 'I':
-                otf_xz_filter_enabled[2] = true;
+                otf_xz_extra_params.enable_filter_ia64 = true;
                 break;
               case 'A':
-                otf_xz_filter_enabled[3] = true;
+                otf_xz_extra_params.enable_filter_arm = true;
                 break;
               case 'T':
-                otf_xz_filter_enabled[4] = true;
+                otf_xz_extra_params.enable_filter_armthumb = true;
                 break;
               case 'S':
-                otf_xz_filter_enabled[5] = true;
+                otf_xz_extra_params.enable_filter_sparc = true;
                 break;
               case 'D':
                 {
                   j++;
                   char nextchar = value[j];
                   if ((nextchar < '0') || (nextchar > '9')) {
-                    printf("ERROR: LZMA delta filter must be followed by a distance (1..256)\n");
+                    printf("ERROR: LZMA delta filter must be followed by a distance (%d..%d)\n",
+                        LZMA_DELTA_DIST_MIN, LZMA_DELTA_DIST_MAX);
                     wait_for_key();
                     exit(1);
                   }
-                  otf_xz_filter_delta_enabled = true;
+                  otf_xz_extra_params.enable_filter_delta = true;
                   while ((value[j] > '0') && (value[j] < '9')) {
-                    otf_xz_filter_delta_distance *= 10;
-                    otf_xz_filter_delta_distance += (value[j] - '0');
+                    otf_xz_extra_params.filter_delta_distance *= 10;
+                    otf_xz_extra_params.filter_delta_distance += (value[j] - '0');
                     j++;
                   }
-                  if ((otf_xz_filter_delta_distance < 1) || (otf_xz_filter_delta_distance > 256)) {
-                    printf("ERROR: LZMA delta filter distance must be in range 1..256\n");
+                  if (otf_xz_extra_params.filter_delta_distance < LZMA_DELTA_DIST_MIN 
+                       || otf_xz_extra_params.filter_delta_distance > LZMA_DELTA_DIST_MAX) {
+                    printf("ERROR: LZMA delta filter distance must be in range %d..%d\n",
+                        LZMA_DELTA_DIST_MIN, LZMA_DELTA_DIST_MAX);
                     wait_for_key();
                     exit(1);
                   }
diff --git a/vs2015/Precomp/Precomp.vcxproj b/vs2015/Precomp/Precomp.vcxproj
index 3ecb445..60c0945 100644
--- a/vs2015/Precomp/Precomp.vcxproj
+++ b/vs2015/Precomp/Precomp.vcxproj
@@ -1,343 +1,376 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{04EA71E2-770B-4D2E-905D-2E7AFB98590D}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>Precomp</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings" />
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <TargetName>precomp</TargetName>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);BUILD_LIB</PreprocessorDefinitions>
-      <AdditionalOptions>/I..\..\contrib\liblzma\api /I..\..\contrib\liblzma\check\ /I..\..\contrib\liblzma\common\ /I..\..\contrib\liblzma\delta\ /I..\..\contrib\liblzma\lz\ /I..\..\contrib\liblzma\lzma\ /I..\..\contrib\liblzma\rangecoder\ /I..\..\contrib\liblzma\simple\ /Imsinttypes\ %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>BIT64;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);BUILD_LIB</PreprocessorDefinitions>
-      <AdditionalOptions>/I..\..\contrib\liblzma\api /I..\..\contrib\liblzma\check\ /I..\..\contrib\liblzma\common\ /I..\..\contrib\liblzma\delta\ /I..\..\contrib\liblzma\lz\ /I..\..\contrib\liblzma\lzma\ /I..\..\contrib\liblzma\rangecoder\ /I..\..\contrib\liblzma\simple\ /Imsinttypes\ %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;BUILD_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/I..\..\contrib\liblzma\api /I..\..\contrib\liblzma\check\ /I..\..\contrib\liblzma\common\ /I..\..\contrib\liblzma\delta\ /I..\..\contrib\liblzma\lz\ /I..\..\contrib\liblzma\lzma\ /I..\..\contrib\liblzma\rangecoder\ /I..\..\contrib\liblzma\simple\ /Imsinttypes\ %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>BIT64;WIN32;NDEBUG;_CONSOLE;BUILD_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalOptions>/I..\..\contrib\liblzma\api /I..\..\contrib\liblzma\check\ /I..\..\contrib\liblzma\common\ /I..\..\contrib\liblzma\delta\ /I..\..\contrib\liblzma\lz\ /I..\..\contrib\liblzma\lzma\ /I..\..\contrib\liblzma\rangecoder\ /I..\..\contrib\liblzma\simple\ /Imsinttypes\ %(AdditionalOptions)</AdditionalOptions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-    </Link>
-    <PostBuildEvent>
-      <Command>copy/y "$(TargetPath)" ..</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\contrib\bzip2\blocksort.c" />
-    <ClCompile Include="..\..\contrib\bzip2\bzlib.c" />
-    <ClCompile Include="..\..\contrib\bzip2\compress.c" />
-    <ClCompile Include="..\..\contrib\bzip2\crctable.c" />
-    <ClCompile Include="..\..\contrib\bzip2\decompress.c" />
-    <ClCompile Include="..\..\contrib\bzip2\huffman.c" />
-    <ClCompile Include="..\..\contrib\bzip2\randtable.c" />
-    <ClCompile Include="..\..\contrib\giflib\dgif_lib_gcc.c" />
-    <ClCompile Include="..\..\contrib\giflib\egif_lib_gcc.c" />
-    <ClCompile Include="..\..\contrib\giflib\gifalloc.c" />
-    <ClCompile Include="..\..\contrib\giflib\gif_err.c" />
-    <ClCompile Include="..\..\contrib\liblzma\check\check.c" />
-    <ClCompile Include="..\..\contrib\liblzma\check\crc32_fast.c" />
-    <ClCompile Include="..\..\contrib\liblzma\check\crc32_table.c" />
-    <ClCompile Include="..\..\contrib\liblzma\check\crc64_fast.c" />
-    <ClCompile Include="..\..\contrib\liblzma\check\crc64_table.c" />
-    <ClCompile Include="..\..\contrib\liblzma\check\sha256.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\alone_decoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\alone_encoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\auto_decoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\block_buffer_decoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\block_buffer_encoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\block_decoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\block_encoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\block_header_decoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\block_header_encoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\block_util.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\common.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\easy_buffer_encoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\easy_decoder_memusage.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\easy_encoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\easy_encoder_memusage.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\easy_preset.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\filter_buffer_decoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\filter_buffer_encoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\filter_common.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\filter_decoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\filter_encoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\filter_flags_decoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\filter_flags_encoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\hardware_cputhreads.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\hardware_physmem.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\index.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\index_decoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\index_encoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\index_hash.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\outqueue.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\stream_buffer_decoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\stream_buffer_encoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\stream_decoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\stream_encoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\stream_encoder_mt.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\stream_flags_common.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\stream_flags_decoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\stream_flags_encoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\tuklib_cpucores.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\tuklib_physmem.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\vli_decoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\vli_encoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\common\vli_size.c" />
-    <ClCompile Include="..\..\contrib\liblzma\compress_easy_mt.cpp" />
-    <ClCompile Include="..\..\contrib\liblzma\delta\delta_common.c" />
-    <ClCompile Include="..\..\contrib\liblzma\delta\delta_decoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\delta\delta_encoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\lzma\fastpos_table.c" />
-    <ClCompile Include="..\..\contrib\liblzma\lzma\lzma2_decoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\lzma\lzma2_encoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\lzma\lzma_decoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\lzma\lzma_encoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\lzma\lzma_encoder_optimum_fast.c" />
-    <ClCompile Include="..\..\contrib\liblzma\lzma\lzma_encoder_optimum_normal.c" />
-    <ClCompile Include="..\..\contrib\liblzma\lzma\lzma_encoder_presets.c" />
-    <ClCompile Include="..\..\contrib\liblzma\lz\lz_decoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\lz\lz_encoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\lz\lz_encoder_mf.c" />
-    <ClCompile Include="..\..\contrib\liblzma\rangecoder\price_table.c" />
-    <ClCompile Include="..\..\contrib\liblzma\simple\arm.c" />
-    <ClCompile Include="..\..\contrib\liblzma\simple\armthumb.c" />
-    <ClCompile Include="..\..\contrib\liblzma\simple\ia64.c" />
-    <ClCompile Include="..\..\contrib\liblzma\simple\powerpc.c" />
-    <ClCompile Include="..\..\contrib\liblzma\simple\simple_coder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\simple\simple_decoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\simple\simple_encoder.c" />
-    <ClCompile Include="..\..\contrib\liblzma\simple\sparc.c" />
-    <ClCompile Include="..\..\contrib\liblzma\simple\x86.c" />
-    <ClCompile Include="..\..\contrib\packjpg\aricoder.cpp" />
-    <ClCompile Include="..\..\contrib\packjpg\bitops.cpp" />
-    <ClCompile Include="..\..\contrib\packjpg\packjpg.cpp" />
-    <ClCompile Include="..\..\contrib\packmp3\huffmp3.cpp" />
-    <ClCompile Include="..\..\contrib\packmp3\packmp3.cpp" />
-    <ClCompile Include="..\..\contrib\zlib\adler32.c" />
-    <ClCompile Include="..\..\contrib\zlib\crc32.c" />
-    <ClCompile Include="..\..\contrib\zlib\deflate.c" />
-    <ClCompile Include="..\..\contrib\zlib\inffast.c" />
-    <ClCompile Include="..\..\contrib\zlib\inflate.c" />
-    <ClCompile Include="..\..\contrib\zlib\inftrees.c" />
-    <ClCompile Include="..\..\contrib\zlib\trees.c" />
-    <ClCompile Include="..\..\contrib\zlib\zutil.c" />
-    <ClCompile Include="..\..\precomp.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\contrib\bzip2\bzlib.h" />
-    <ClInclude Include="..\..\contrib\bzip2\bzlib_private.h" />
-    <ClInclude Include="..\..\contrib\giflib\gif_lib.h" />
-    <ClInclude Include="..\..\contrib\giflib\gif_lib_private.h" />
-    <ClInclude Include="..\..\contrib\liblzma\api\lzma.h" />
-    <ClInclude Include="..\..\contrib\liblzma\api\lzma\base.h" />
-    <ClInclude Include="..\..\contrib\liblzma\api\lzma\bcj.h" />
-    <ClInclude Include="..\..\contrib\liblzma\api\lzma\block.h" />
-    <ClInclude Include="..\..\contrib\liblzma\api\lzma\check.h" />
-    <ClInclude Include="..\..\contrib\liblzma\api\lzma\container.h" />
-    <ClInclude Include="..\..\contrib\liblzma\api\lzma\delta.h" />
-    <ClInclude Include="..\..\contrib\liblzma\api\lzma\filter.h" />
-    <ClInclude Include="..\..\contrib\liblzma\api\lzma\hardware.h" />
-    <ClInclude Include="..\..\contrib\liblzma\api\lzma\index.h" />
-    <ClInclude Include="..\..\contrib\liblzma\api\lzma\index_hash.h" />
-    <ClInclude Include="..\..\contrib\liblzma\api\lzma\lzma12.h" />
-    <ClInclude Include="..\..\contrib\liblzma\api\lzma\stream_flags.h" />
-    <ClInclude Include="..\..\contrib\liblzma\api\lzma\version.h" />
-    <ClInclude Include="..\..\contrib\liblzma\api\lzma\vli.h" />
-    <ClInclude Include="..\..\contrib\liblzma\check\check.h" />
-    <ClInclude Include="..\..\contrib\liblzma\check\crc_macros.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\alone_decoder.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\block_buffer_encoder.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\block_decoder.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\block_encoder.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\common.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\easy_preset.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\filter_common.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\filter_decoder.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\filter_encoder.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\index.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\index_encoder.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\memcmplen.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\mythread.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\outqueue.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\stream_decoder.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\stream_flags_common.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\sysdefs.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\sysdefs_schnaader.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\tuklib_common.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\tuklib_config.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\tuklib_cpucores.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\tuklib_integer.h" />
-    <ClInclude Include="..\..\contrib\liblzma\common\tuklib_physmem.h" />
-    <ClInclude Include="..\..\contrib\liblzma\delta\delta_common.h" />
-    <ClInclude Include="..\..\contrib\liblzma\delta\delta_decoder.h" />
-    <ClInclude Include="..\..\contrib\liblzma\delta\delta_encoder.h" />
-    <ClInclude Include="..\..\contrib\liblzma\delta\delta_private.h" />
-    <ClInclude Include="..\..\contrib\liblzma\lzma\fastpos.h" />
-    <ClInclude Include="..\..\contrib\liblzma\lzma\lzma2_decoder.h" />
-    <ClInclude Include="..\..\contrib\liblzma\lzma\lzma2_encoder.h" />
-    <ClInclude Include="..\..\contrib\liblzma\lzma\lzma_common.h" />
-    <ClInclude Include="..\..\contrib\liblzma\lzma\lzma_decoder.h" />
-    <ClInclude Include="..\..\contrib\liblzma\lzma\lzma_encoder.h" />
-    <ClInclude Include="..\..\contrib\liblzma\lzma\lzma_encoder_private.h" />
-    <ClInclude Include="..\..\contrib\liblzma\lz\lz_decoder.h" />
-    <ClInclude Include="..\..\contrib\liblzma\lz\lz_encoder.h" />
-    <ClInclude Include="..\..\contrib\liblzma\lz\lz_encoder_hash.h" />
-    <ClInclude Include="..\..\contrib\liblzma\lz\lz_encoder_hash_table.h" />
-    <ClInclude Include="..\..\contrib\liblzma\precomp_xz.h" />
-    <ClInclude Include="..\..\contrib\liblzma\rangecoder\price.h" />
-    <ClInclude Include="..\..\contrib\liblzma\rangecoder\range_common.h" />
-    <ClInclude Include="..\..\contrib\liblzma\rangecoder\range_decoder.h" />
-    <ClInclude Include="..\..\contrib\liblzma\rangecoder\range_encoder.h" />
-    <ClInclude Include="..\..\contrib\liblzma\simple\simple_coder.h" />
-    <ClInclude Include="..\..\contrib\liblzma\simple\simple_decoder.h" />
-    <ClInclude Include="..\..\contrib\liblzma\simple\simple_encoder.h" />
-    <ClInclude Include="..\..\contrib\liblzma\simple\simple_private.h" />
-    <ClInclude Include="..\..\contrib\packjpg\aricoder.h" />
-    <ClInclude Include="..\..\contrib\packjpg\bitops.h" />
-    <ClInclude Include="..\..\contrib\packjpg\dct8x8.h" />
-    <ClInclude Include="..\..\contrib\packjpg\htables.h" />
-    <ClInclude Include="..\..\contrib\packjpg\packJPGlib.h" />
-    <ClInclude Include="..\..\contrib\packmp3\huffmp3.h" />
-    <ClInclude Include="..\..\contrib\packmp3\huffmp3tbl.h" />
-    <ClInclude Include="..\..\contrib\packmp3\packmp3lib.h" />
-    <ClInclude Include="..\..\contrib\packmp3\pmp3bitlen.h" />
-    <ClInclude Include="..\..\contrib\packmp3\pmp3tbl.h" />
-    <ClInclude Include="..\..\contrib\zlib\crc32.h" />
-    <ClInclude Include="..\..\contrib\zlib\deflate.h" />
-    <ClInclude Include="..\..\contrib\zlib\inffast.h" />
-    <ClInclude Include="..\..\contrib\zlib\inffixed.h" />
-    <ClInclude Include="..\..\contrib\zlib\inflate.h" />
-    <ClInclude Include="..\..\contrib\zlib\inftrees.h" />
-    <ClInclude Include="..\..\contrib\zlib\trees.h" />
-    <ClInclude Include="..\..\contrib\zlib\zconf.h" />
-    <ClInclude Include="..\..\contrib\zlib\zlib.h" />
-    <ClInclude Include="..\..\contrib\zlib\zutil.h" />
-    <ClInclude Include="..\..\precomp.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets" />
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{04EA71E2-770B-4D2E-905D-2E7AFB98590D}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>Precomp</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings" />
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <TargetName>precomp</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);BUILD_LIB</PreprocessorDefinitions>
+      <AdditionalOptions>/I..\..\contrib\liblzma\api /I..\..\contrib\liblzma\check\ /I..\..\contrib\liblzma\common\ /I..\..\contrib\liblzma\delta\ /I..\..\contrib\liblzma\lz\ /I..\..\contrib\liblzma\lzma\ /I..\..\contrib\liblzma\rangecoder\ /I..\..\contrib\liblzma\simple\ /Imsinttypes\ %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>BIT64;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);BUILD_LIB</PreprocessorDefinitions>
+      <AdditionalOptions>/I..\..\contrib\liblzma\api /I..\..\contrib\liblzma\check\ /I..\..\contrib\liblzma\common\ /I..\..\contrib\liblzma\delta\ /I..\..\contrib\liblzma\lz\ /I..\..\contrib\liblzma\lzma\ /I..\..\contrib\liblzma\rangecoder\ /I..\..\contrib\liblzma\simple\ /Imsinttypes\ %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;BUILD_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/I..\..\contrib\liblzma\api /I..\..\contrib\liblzma\check\ /I..\..\contrib\liblzma\common\ /I..\..\contrib\liblzma\delta\ /I..\..\contrib\liblzma\lz\ /I..\..\contrib\liblzma\lzma\ /I..\..\contrib\liblzma\rangecoder\ /I..\..\contrib\liblzma\simple\ /Imsinttypes\ %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>BIT64;WIN32;NDEBUG;_CONSOLE;BUILD_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalOptions>/I..\..\contrib\liblzma\api /I..\..\contrib\liblzma\check\ /I..\..\contrib\liblzma\common\ /I..\..\contrib\liblzma\delta\ /I..\..\contrib\liblzma\lz\ /I..\..\contrib\liblzma\lzma\ /I..\..\contrib\liblzma\rangecoder\ /I..\..\contrib\liblzma\simple\ /Imsinttypes\ %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+    </Link>
+    <PostBuildEvent>
+      <Command>copy/y "$(TargetPath)" ..</Command>
+    </PostBuildEvent>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\contrib\bzip2\blocksort.c" />
+    <ClCompile Include="..\..\contrib\bzip2\bzlib.c" />
+    <ClCompile Include="..\..\contrib\bzip2\compress.c" />
+    <ClCompile Include="..\..\contrib\bzip2\crctable.c" />
+    <ClCompile Include="..\..\contrib\bzip2\decompress.c" />
+    <ClCompile Include="..\..\contrib\bzip2\huffman.c" />
+    <ClCompile Include="..\..\contrib\bzip2\randtable.c" />
+    <ClCompile Include="..\..\contrib\giflib\dgif_lib_gcc.c" />
+    <ClCompile Include="..\..\contrib\giflib\egif_lib_gcc.c" />
+    <ClCompile Include="..\..\contrib\giflib\gifalloc.c" />
+    <ClCompile Include="..\..\contrib\giflib\gif_err.c" />
+    <ClCompile Include="..\..\contrib\liblzma\check\check.c" />
+    <ClCompile Include="..\..\contrib\liblzma\check\crc32_fast.c" />
+    <ClCompile Include="..\..\contrib\liblzma\check\crc32_table.c" />
+    <ClCompile Include="..\..\contrib\liblzma\check\crc64_fast.c" />
+    <ClCompile Include="..\..\contrib\liblzma\check\crc64_table.c" />
+    <ClCompile Include="..\..\contrib\liblzma\check\sha256.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\alone_decoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\alone_encoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\auto_decoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\block_buffer_decoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\block_buffer_encoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\block_decoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\block_encoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\block_header_decoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\block_header_encoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\block_util.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\common.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\easy_buffer_encoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\easy_decoder_memusage.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\easy_encoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\easy_encoder_memusage.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\easy_preset.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\filter_buffer_decoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\filter_buffer_encoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\filter_common.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\filter_decoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\filter_encoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\filter_flags_decoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\filter_flags_encoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\hardware_cputhreads.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\hardware_physmem.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\index.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\index_decoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\index_encoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\index_hash.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\outqueue.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\stream_buffer_decoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\stream_buffer_encoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\stream_decoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\stream_encoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\stream_encoder_mt.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\stream_flags_common.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\stream_flags_decoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\stream_flags_encoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\tuklib_cpucores.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\tuklib_physmem.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\vli_decoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\vli_encoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\common\vli_size.c" />
+    <ClCompile Include="..\..\contrib\liblzma\compress_easy_mt.cpp" />
+    <ClCompile Include="..\..\contrib\liblzma\delta\delta_common.c" />
+    <ClCompile Include="..\..\contrib\liblzma\delta\delta_decoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\delta\delta_encoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\lzma\fastpos_table.c" />
+    <ClCompile Include="..\..\contrib\liblzma\lzma\lzma2_decoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\lzma\lzma2_encoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\lzma\lzma_decoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\lzma\lzma_encoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\lzma\lzma_encoder_optimum_fast.c" />
+    <ClCompile Include="..\..\contrib\liblzma\lzma\lzma_encoder_optimum_normal.c" />
+    <ClCompile Include="..\..\contrib\liblzma\lzma\lzma_encoder_presets.c" />
+    <ClCompile Include="..\..\contrib\liblzma\lz\lz_decoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\lz\lz_encoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\lz\lz_encoder_mf.c" />
+    <ClCompile Include="..\..\contrib\liblzma\rangecoder\price_table.c" />
+    <ClCompile Include="..\..\contrib\liblzma\simple\arm.c" />
+    <ClCompile Include="..\..\contrib\liblzma\simple\armthumb.c" />
+    <ClCompile Include="..\..\contrib\liblzma\simple\ia64.c" />
+    <ClCompile Include="..\..\contrib\liblzma\simple\powerpc.c" />
+    <ClCompile Include="..\..\contrib\liblzma\simple\simple_coder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\simple\simple_decoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\simple\simple_encoder.c" />
+    <ClCompile Include="..\..\contrib\liblzma\simple\sparc.c" />
+    <ClCompile Include="..\..\contrib\liblzma\simple\x86.c" />
+    <ClCompile Include="..\..\contrib\packjpg\aricoder.cpp" />
+    <ClCompile Include="..\..\contrib\packjpg\bitops.cpp" />
+    <ClCompile Include="..\..\contrib\packjpg\packjpg.cpp" />
+    <ClCompile Include="..\..\contrib\packmp3\huffmp3.cpp" />
+    <ClCompile Include="..\..\contrib\packmp3\packmp3.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\preflate_block_decoder.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\preflate_block_reencoder.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\preflate_block_trees.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\preflate_checker.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\preflate_complevel_estimator.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\preflate_constants.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\preflate_decoder.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\preflate_hash_chain.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\preflate_info.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\preflate_parameter_estimator.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\preflate_parser_config.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\preflate_predictor_state.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\preflate_reencoder.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\preflate_seq_chain.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\preflate_statistical_codec.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\preflate_statistical_debug.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\preflate_statistical_model.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\preflate_token.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\preflate_token_predictor.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\preflate_tree_predictor.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\support\arithmetic_coder.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\support\array_helper.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\support\bitstream.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\support\bit_helper.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\support\const_division.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\support\filestream.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\support\huffman_decoder.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\support\huffman_encoder.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\support\huffman_helper.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\support\memstream.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\support\outputcachestream.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\support\support_tests.cpp" />
+    <ClCompile Include="..\..\contrib\preflate\support\task_pool.cpp" />
+    <ClCompile Include="..\..\contrib\zlib\adler32.c" />
+    <ClCompile Include="..\..\contrib\zlib\crc32.c" />
+    <ClCompile Include="..\..\contrib\zlib\deflate.c" />
+    <ClCompile Include="..\..\contrib\zlib\inffast.c" />
+    <ClCompile Include="..\..\contrib\zlib\inflate.c" />
+    <ClCompile Include="..\..\contrib\zlib\inftrees.c" />
+    <ClCompile Include="..\..\contrib\zlib\trees.c" />
+    <ClCompile Include="..\..\contrib\zlib\zutil.c" />
+    <ClCompile Include="..\..\precomp.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\contrib\bzip2\bzlib.h" />
+    <ClInclude Include="..\..\contrib\bzip2\bzlib_private.h" />
+    <ClInclude Include="..\..\contrib\giflib\gif_lib.h" />
+    <ClInclude Include="..\..\contrib\giflib\gif_lib_private.h" />
+    <ClInclude Include="..\..\contrib\liblzma\api\lzma.h" />
+    <ClInclude Include="..\..\contrib\liblzma\api\lzma\base.h" />
+    <ClInclude Include="..\..\contrib\liblzma\api\lzma\bcj.h" />
+    <ClInclude Include="..\..\contrib\liblzma\api\lzma\block.h" />
+    <ClInclude Include="..\..\contrib\liblzma\api\lzma\check.h" />
+    <ClInclude Include="..\..\contrib\liblzma\api\lzma\container.h" />
+    <ClInclude Include="..\..\contrib\liblzma\api\lzma\delta.h" />
+    <ClInclude Include="..\..\contrib\liblzma\api\lzma\filter.h" />
+    <ClInclude Include="..\..\contrib\liblzma\api\lzma\hardware.h" />
+    <ClInclude Include="..\..\contrib\liblzma\api\lzma\index.h" />
+    <ClInclude Include="..\..\contrib\liblzma\api\lzma\index_hash.h" />
+    <ClInclude Include="..\..\contrib\liblzma\api\lzma\lzma12.h" />
+    <ClInclude Include="..\..\contrib\liblzma\api\lzma\stream_flags.h" />
+    <ClInclude Include="..\..\contrib\liblzma\api\lzma\version.h" />
+    <ClInclude Include="..\..\contrib\liblzma\api\lzma\vli.h" />
+    <ClInclude Include="..\..\contrib\liblzma\check\check.h" />
+    <ClInclude Include="..\..\contrib\liblzma\check\crc_macros.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\alone_decoder.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\block_buffer_encoder.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\block_decoder.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\block_encoder.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\common.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\easy_preset.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\filter_common.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\filter_decoder.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\filter_encoder.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\index.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\index_encoder.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\memcmplen.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\mythread.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\outqueue.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\stream_decoder.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\stream_flags_common.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\sysdefs.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\sysdefs_schnaader.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\tuklib_common.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\tuklib_config.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\tuklib_cpucores.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\tuklib_integer.h" />
+    <ClInclude Include="..\..\contrib\liblzma\common\tuklib_physmem.h" />
+    <ClInclude Include="..\..\contrib\liblzma\delta\delta_common.h" />
+    <ClInclude Include="..\..\contrib\liblzma\delta\delta_decoder.h" />
+    <ClInclude Include="..\..\contrib\liblzma\delta\delta_encoder.h" />
+    <ClInclude Include="..\..\contrib\liblzma\delta\delta_private.h" />
+    <ClInclude Include="..\..\contrib\liblzma\lzma\fastpos.h" />
+    <ClInclude Include="..\..\contrib\liblzma\lzma\lzma2_decoder.h" />
+    <ClInclude Include="..\..\contrib\liblzma\lzma\lzma2_encoder.h" />
+    <ClInclude Include="..\..\contrib\liblzma\lzma\lzma_common.h" />
+    <ClInclude Include="..\..\contrib\liblzma\lzma\lzma_decoder.h" />
+    <ClInclude Include="..\..\contrib\liblzma\lzma\lzma_encoder.h" />
+    <ClInclude Include="..\..\contrib\liblzma\lzma\lzma_encoder_private.h" />
+    <ClInclude Include="..\..\contrib\liblzma\lz\lz_decoder.h" />
+    <ClInclude Include="..\..\contrib\liblzma\lz\lz_encoder.h" />
+    <ClInclude Include="..\..\contrib\liblzma\lz\lz_encoder_hash.h" />
+    <ClInclude Include="..\..\contrib\liblzma\lz\lz_encoder_hash_table.h" />
+    <ClInclude Include="..\..\contrib\liblzma\precomp_xz.h" />
+    <ClInclude Include="..\..\contrib\liblzma\rangecoder\price.h" />
+    <ClInclude Include="..\..\contrib\liblzma\rangecoder\range_common.h" />
+    <ClInclude Include="..\..\contrib\liblzma\rangecoder\range_decoder.h" />
+    <ClInclude Include="..\..\contrib\liblzma\rangecoder\range_encoder.h" />
+    <ClInclude Include="..\..\contrib\liblzma\simple\simple_coder.h" />
+    <ClInclude Include="..\..\contrib\liblzma\simple\simple_decoder.h" />
+    <ClInclude Include="..\..\contrib\liblzma\simple\simple_encoder.h" />
+    <ClInclude Include="..\..\contrib\liblzma\simple\simple_private.h" />
+    <ClInclude Include="..\..\contrib\packjpg\aricoder.h" />
+    <ClInclude Include="..\..\contrib\packjpg\bitops.h" />
+    <ClInclude Include="..\..\contrib\packjpg\dct8x8.h" />
+    <ClInclude Include="..\..\contrib\packjpg\htables.h" />
+    <ClInclude Include="..\..\contrib\packjpg\packJPGlib.h" />
+    <ClInclude Include="..\..\contrib\packmp3\huffmp3.h" />
+    <ClInclude Include="..\..\contrib\packmp3\huffmp3tbl.h" />
+    <ClInclude Include="..\..\contrib\packmp3\packmp3lib.h" />
+    <ClInclude Include="..\..\contrib\packmp3\pmp3bitlen.h" />
+    <ClInclude Include="..\..\contrib\packmp3\pmp3tbl.h" />
+    <ClInclude Include="..\..\contrib\zlib\crc32.h" />
+    <ClInclude Include="..\..\contrib\zlib\deflate.h" />
+    <ClInclude Include="..\..\contrib\zlib\inffast.h" />
+    <ClInclude Include="..\..\contrib\zlib\inffixed.h" />
+    <ClInclude Include="..\..\contrib\zlib\inflate.h" />
+    <ClInclude Include="..\..\contrib\zlib\inftrees.h" />
+    <ClInclude Include="..\..\contrib\zlib\trees.h" />
+    <ClInclude Include="..\..\contrib\zlib\zconf.h" />
+    <ClInclude Include="..\..\contrib\zlib\zlib.h" />
+    <ClInclude Include="..\..\contrib\zlib\zutil.h" />
+    <ClInclude Include="..\..\precomp.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets" />
 </Project>
\ No newline at end of file
diff --git a/vs2015/Precomp/Precomp.vcxproj.filters b/vs2015/Precomp/Precomp.vcxproj.filters
index 4132e7c..a7c7f4b 100644
--- a/vs2015/Precomp/Precomp.vcxproj.filters
+++ b/vs2015/Precomp/Precomp.vcxproj.filters
@@ -13,6 +13,12 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
+    <Filter Include="preflate">
+      <UniqueIdentifier>{9416e607-1e8a-4ca1-9f51-9bff0801a2c1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="preflate\support">
+      <UniqueIdentifier>{f6506460-d4fd-438f-ab05-9dadebe44308}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\precomp.cpp">
@@ -312,6 +318,105 @@
     <ClCompile Include="..\..\contrib\liblzma\check\crc64_fast.c">
       <Filter>Quelldateien</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\support\arithmetic_coder.cpp">
+      <Filter>preflate\support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\support\array_helper.cpp">
+      <Filter>preflate\support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\support\bit_helper.cpp">
+      <Filter>preflate\support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\support\bitstream.cpp">
+      <Filter>preflate\support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\support\const_division.cpp">
+      <Filter>preflate\support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\support\filestream.cpp">
+      <Filter>preflate\support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\support\huffman_decoder.cpp">
+      <Filter>preflate\support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\support\huffman_encoder.cpp">
+      <Filter>preflate\support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\support\huffman_helper.cpp">
+      <Filter>preflate\support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\support\memstream.cpp">
+      <Filter>preflate\support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\support\outputcachestream.cpp">
+      <Filter>preflate\support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\support\support_tests.cpp">
+      <Filter>preflate\support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\support\task_pool.cpp">
+      <Filter>preflate\support</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\preflate_block_decoder.cpp">
+      <Filter>preflate</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\preflate_block_reencoder.cpp">
+      <Filter>preflate</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\preflate_block_trees.cpp">
+      <Filter>preflate</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\preflate_checker.cpp">
+      <Filter>preflate</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\preflate_complevel_estimator.cpp">
+      <Filter>preflate</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\preflate_constants.cpp">
+      <Filter>preflate</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\preflate_decoder.cpp">
+      <Filter>preflate</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\preflate_hash_chain.cpp">
+      <Filter>preflate</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\preflate_info.cpp">
+      <Filter>preflate</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\preflate_parameter_estimator.cpp">
+      <Filter>preflate</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\preflate_parser_config.cpp">
+      <Filter>preflate</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\preflate_predictor_state.cpp">
+      <Filter>preflate</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\preflate_reencoder.cpp">
+      <Filter>preflate</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\preflate_seq_chain.cpp">
+      <Filter>preflate</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\preflate_statistical_codec.cpp">
+      <Filter>preflate</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\preflate_statistical_debug.cpp">
+      <Filter>preflate</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\preflate_statistical_model.cpp">
+      <Filter>preflate</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\preflate_token.cpp">
+      <Filter>preflate</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\preflate_token_predictor.cpp">
+      <Filter>preflate</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\contrib\preflate\preflate_tree_predictor.cpp">
+      <Filter>preflate</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\contrib\bzip2\bzlib.h">