From 82388980187b0e3794d187762054200bbdcc9a53 Mon Sep 17 00:00:00 2001
From: Lasse Collin <lasse.collin@tukaani.org>
Date: Sat, 16 Sep 2017 12:39:43 +0300
Subject: [PATCH] Windows: Move VS2013 files into windows/vs2013 directory.

---
 windows/{ => vs2013}/config.h            |   0
 windows/{ => vs2013}/liblzma.vcxproj     | 278 +++++++++++-----------
 windows/{ => vs2013}/liblzma_dll.vcxproj | 280 +++++++++++------------
 windows/{ => vs2013}/xz_win.sln          |   0
 4 files changed, 279 insertions(+), 279 deletions(-)
 rename windows/{ => vs2013}/config.h (100%)
 rename windows/{ => vs2013}/liblzma.vcxproj (57%)
 rename windows/{ => vs2013}/liblzma_dll.vcxproj (60%)
 rename windows/{ => vs2013}/xz_win.sln (100%)

diff --git a/windows/config.h b/windows/vs2013/config.h
similarity index 100%
rename from windows/config.h
rename to windows/vs2013/config.h
diff --git a/windows/liblzma.vcxproj b/windows/vs2013/liblzma.vcxproj
similarity index 57%
rename from windows/liblzma.vcxproj
rename to windows/vs2013/liblzma.vcxproj
index 2feafef9..66330022 100644
--- a/windows/liblzma.vcxproj
+++ b/windows/vs2013/liblzma.vcxproj
@@ -205,147 +205,147 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\common\tuklib_cpucores.c" />
-    <ClCompile Include="..\src\common\tuklib_physmem.c" />
-    <ClCompile Include="..\src\liblzma\check\check.c" />
-    <ClCompile Include="..\src\liblzma\check\crc32_fast.c" />
-    <ClCompile Include="..\src\liblzma\check\crc32_table.c" />
-    <ClCompile Include="..\src\liblzma\check\crc64_fast.c" />
-    <ClCompile Include="..\src\liblzma\check\crc64_table.c" />
-    <ClCompile Include="..\src\liblzma\check\sha256.c" />
-    <ClCompile Include="..\src\liblzma\common\alone_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\alone_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\auto_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\block_buffer_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\block_buffer_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\block_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\block_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\block_header_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\block_header_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\block_util.c" />
-    <ClCompile Include="..\src\liblzma\common\common.c" />
-    <ClCompile Include="..\src\liblzma\common\easy_buffer_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\easy_decoder_memusage.c" />
-    <ClCompile Include="..\src\liblzma\common\easy_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\easy_encoder_memusage.c" />
-    <ClCompile Include="..\src\liblzma\common\easy_preset.c" />
-    <ClCompile Include="..\src\liblzma\common\filter_buffer_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\filter_buffer_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\filter_common.c" />
-    <ClCompile Include="..\src\liblzma\common\filter_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\filter_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\filter_flags_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\filter_flags_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\hardware_cputhreads.c" />
-    <ClCompile Include="..\src\liblzma\common\hardware_physmem.c" />
-    <ClCompile Include="..\src\liblzma\common\index.c" />
-    <ClCompile Include="..\src\liblzma\common\index_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\index_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\index_hash.c" />
-    <ClCompile Include="..\src\liblzma\common\outqueue.c" />
-    <ClCompile Include="..\src\liblzma\common\stream_buffer_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\stream_buffer_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\stream_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\stream_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\stream_encoder_mt.c" />
-    <ClCompile Include="..\src\liblzma\common\stream_flags_common.c" />
-    <ClCompile Include="..\src\liblzma\common\stream_flags_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\stream_flags_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\vli_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\vli_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\vli_size.c" />
-    <ClCompile Include="..\src\liblzma\delta\delta_common.c" />
-    <ClCompile Include="..\src\liblzma\delta\delta_decoder.c" />
-    <ClCompile Include="..\src\liblzma\delta\delta_encoder.c" />
-    <ClCompile Include="..\src\liblzma\lzma\fastpos_table.c" />
-    <ClCompile Include="..\src\liblzma\lzma\lzma2_decoder.c" />
-    <ClCompile Include="..\src\liblzma\lzma\lzma2_encoder.c" />
-    <ClCompile Include="..\src\liblzma\lzma\lzma_decoder.c" />
-    <ClCompile Include="..\src\liblzma\lzma\lzma_encoder.c" />
-    <ClCompile Include="..\src\liblzma\lzma\lzma_encoder_optimum_fast.c" />
-    <ClCompile Include="..\src\liblzma\lzma\lzma_encoder_optimum_normal.c" />
-    <ClCompile Include="..\src\liblzma\lzma\lzma_encoder_presets.c" />
-    <ClCompile Include="..\src\liblzma\lz\lz_decoder.c" />
-    <ClCompile Include="..\src\liblzma\lz\lz_encoder.c" />
-    <ClCompile Include="..\src\liblzma\lz\lz_encoder_mf.c" />
-    <ClCompile Include="..\src\liblzma\rangecoder\price_table.c" />
-    <ClCompile Include="..\src\liblzma\simple\arm.c" />
-    <ClCompile Include="..\src\liblzma\simple\armthumb.c" />
-    <ClCompile Include="..\src\liblzma\simple\ia64.c" />
-    <ClCompile Include="..\src\liblzma\simple\powerpc.c" />
-    <ClCompile Include="..\src\liblzma\simple\simple_coder.c" />
-    <ClCompile Include="..\src\liblzma\simple\simple_decoder.c" />
-    <ClCompile Include="..\src\liblzma\simple\simple_encoder.c" />
-    <ClCompile Include="..\src\liblzma\simple\sparc.c" />
-    <ClCompile Include="..\src\liblzma\simple\x86.c" />
+    <ClCompile Include="..\..\src\common\tuklib_cpucores.c" />
+    <ClCompile Include="..\..\src\common\tuklib_physmem.c" />
+    <ClCompile Include="..\..\src\liblzma\check\check.c" />
+    <ClCompile Include="..\..\src\liblzma\check\crc32_fast.c" />
+    <ClCompile Include="..\..\src\liblzma\check\crc32_table.c" />
+    <ClCompile Include="..\..\src\liblzma\check\crc64_fast.c" />
+    <ClCompile Include="..\..\src\liblzma\check\crc64_table.c" />
+    <ClCompile Include="..\..\src\liblzma\check\sha256.c" />
+    <ClCompile Include="..\..\src\liblzma\common\alone_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\alone_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\auto_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\block_buffer_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\block_buffer_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\block_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\block_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\block_header_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\block_header_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\block_util.c" />
+    <ClCompile Include="..\..\src\liblzma\common\common.c" />
+    <ClCompile Include="..\..\src\liblzma\common\easy_buffer_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\easy_decoder_memusage.c" />
+    <ClCompile Include="..\..\src\liblzma\common\easy_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\easy_encoder_memusage.c" />
+    <ClCompile Include="..\..\src\liblzma\common\easy_preset.c" />
+    <ClCompile Include="..\..\src\liblzma\common\filter_buffer_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\filter_buffer_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\filter_common.c" />
+    <ClCompile Include="..\..\src\liblzma\common\filter_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\filter_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\filter_flags_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\filter_flags_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\hardware_cputhreads.c" />
+    <ClCompile Include="..\..\src\liblzma\common\hardware_physmem.c" />
+    <ClCompile Include="..\..\src\liblzma\common\index.c" />
+    <ClCompile Include="..\..\src\liblzma\common\index_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\index_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\index_hash.c" />
+    <ClCompile Include="..\..\src\liblzma\common\outqueue.c" />
+    <ClCompile Include="..\..\src\liblzma\common\stream_buffer_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\stream_buffer_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\stream_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\stream_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\stream_encoder_mt.c" />
+    <ClCompile Include="..\..\src\liblzma\common\stream_flags_common.c" />
+    <ClCompile Include="..\..\src\liblzma\common\stream_flags_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\stream_flags_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\vli_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\vli_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\vli_size.c" />
+    <ClCompile Include="..\..\src\liblzma\delta\delta_common.c" />
+    <ClCompile Include="..\..\src\liblzma\delta\delta_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\delta\delta_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\lzma\fastpos_table.c" />
+    <ClCompile Include="..\..\src\liblzma\lzma\lzma2_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\lzma\lzma2_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\lzma\lzma_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\lzma\lzma_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\lzma\lzma_encoder_optimum_fast.c" />
+    <ClCompile Include="..\..\src\liblzma\lzma\lzma_encoder_optimum_normal.c" />
+    <ClCompile Include="..\..\src\liblzma\lzma\lzma_encoder_presets.c" />
+    <ClCompile Include="..\..\src\liblzma\lz\lz_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\lz\lz_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\lz\lz_encoder_mf.c" />
+    <ClCompile Include="..\..\src\liblzma\rangecoder\price_table.c" />
+    <ClCompile Include="..\..\src\liblzma\simple\arm.c" />
+    <ClCompile Include="..\..\src\liblzma\simple\armthumb.c" />
+    <ClCompile Include="..\..\src\liblzma\simple\ia64.c" />
+    <ClCompile Include="..\..\src\liblzma\simple\powerpc.c" />
+    <ClCompile Include="..\..\src\liblzma\simple\simple_coder.c" />
+    <ClCompile Include="..\..\src\liblzma\simple\simple_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\simple\simple_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\simple\sparc.c" />
+    <ClCompile Include="..\..\src\liblzma\simple\x86.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\common\mythread.h" />
-    <ClInclude Include="..\src\common\sysdefs.h" />
-    <ClInclude Include="..\src\common\tuklib_common.h" />
-    <ClInclude Include="..\src\common\tuklib_config.h" />
-    <ClInclude Include="..\src\common\tuklib_cpucores.h" />
-    <ClInclude Include="..\src\common\tuklib_integer.h" />
-    <ClInclude Include="..\src\common\tuklib_physmem.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\base.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\bcj.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\block.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\check.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\container.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\delta.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\filter.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\hardware.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\index.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\index_hash.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\lzma12.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\stream_flags.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\version.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\vli.h" />
-    <ClInclude Include="..\src\liblzma\check\check.h" />
-    <ClInclude Include="..\src\liblzma\check\crc32_table_be.h" />
-    <ClInclude Include="..\src\liblzma\check\crc32_table_le.h" />
-    <ClInclude Include="..\src\liblzma\check\crc64_table_be.h" />
-    <ClInclude Include="..\src\liblzma\check\crc64_table_le.h" />
-    <ClInclude Include="..\src\liblzma\check\crc_macros.h" />
-    <ClInclude Include="..\src\liblzma\common\alone_decoder.h" />
-    <ClInclude Include="..\src\liblzma\common\block_buffer_encoder.h" />
-    <ClInclude Include="..\src\liblzma\common\block_decoder.h" />
-    <ClInclude Include="..\src\liblzma\common\block_encoder.h" />
-    <ClInclude Include="..\src\liblzma\common\common.h" />
-    <ClInclude Include="..\src\liblzma\common\easy_preset.h" />
-    <ClInclude Include="..\src\liblzma\common\filter_common.h" />
-    <ClInclude Include="..\src\liblzma\common\filter_decoder.h" />
-    <ClInclude Include="..\src\liblzma\common\filter_encoder.h" />
-    <ClInclude Include="..\src\liblzma\common\index.h" />
-    <ClInclude Include="..\src\liblzma\common\index_encoder.h" />
-    <ClInclude Include="..\src\liblzma\common\memcmplen.h" />
-    <ClInclude Include="..\src\liblzma\common\outqueue.h" />
-    <ClInclude Include="..\src\liblzma\common\stream_decoder.h" />
-    <ClInclude Include="..\src\liblzma\common\stream_flags_common.h" />
-    <ClInclude Include="..\src\liblzma\delta\delta_common.h" />
-    <ClInclude Include="..\src\liblzma\delta\delta_decoder.h" />
-    <ClInclude Include="..\src\liblzma\delta\delta_encoder.h" />
-    <ClInclude Include="..\src\liblzma\delta\delta_private.h" />
-    <ClInclude Include="..\src\liblzma\lzma\fastpos.h" />
-    <ClInclude Include="..\src\liblzma\lzma\lzma2_decoder.h" />
-    <ClInclude Include="..\src\liblzma\lzma\lzma2_encoder.h" />
-    <ClInclude Include="..\src\liblzma\lzma\lzma_common.h" />
-    <ClInclude Include="..\src\liblzma\lzma\lzma_decoder.h" />
-    <ClInclude Include="..\src\liblzma\lzma\lzma_encoder.h" />
-    <ClInclude Include="..\src\liblzma\lzma\lzma_encoder_private.h" />
-    <ClInclude Include="..\src\liblzma\lz\lz_decoder.h" />
-    <ClInclude Include="..\src\liblzma\lz\lz_encoder.h" />
-    <ClInclude Include="..\src\liblzma\lz\lz_encoder_hash.h" />
-    <ClInclude Include="..\src\liblzma\lz\lz_encoder_hash_table.h" />
-    <ClInclude Include="..\src\liblzma\rangecoder\price.h" />
-    <ClInclude Include="..\src\liblzma\rangecoder\range_common.h" />
-    <ClInclude Include="..\src\liblzma\rangecoder\range_decoder.h" />
-    <ClInclude Include="..\src\liblzma\rangecoder\range_encoder.h" />
-    <ClInclude Include="..\src\liblzma\simple\simple_coder.h" />
-    <ClInclude Include="..\src\liblzma\simple\simple_decoder.h" />
-    <ClInclude Include="..\src\liblzma\simple\simple_encoder.h" />
-    <ClInclude Include="..\src\liblzma\simple\simple_private.h" />
+    <ClInclude Include="..\..\src\common\mythread.h" />
+    <ClInclude Include="..\..\src\common\sysdefs.h" />
+    <ClInclude Include="..\..\src\common\tuklib_common.h" />
+    <ClInclude Include="..\..\src\common\tuklib_config.h" />
+    <ClInclude Include="..\..\src\common\tuklib_cpucores.h" />
+    <ClInclude Include="..\..\src\common\tuklib_integer.h" />
+    <ClInclude Include="..\..\src\common\tuklib_physmem.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\base.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\bcj.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\block.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\check.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\container.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\delta.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\filter.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\hardware.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\index.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\index_hash.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\lzma12.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\stream_flags.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\version.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\vli.h" />
+    <ClInclude Include="..\..\src\liblzma\check\check.h" />
+    <ClInclude Include="..\..\src\liblzma\check\crc32_table_be.h" />
+    <ClInclude Include="..\..\src\liblzma\check\crc32_table_le.h" />
+    <ClInclude Include="..\..\src\liblzma\check\crc64_table_be.h" />
+    <ClInclude Include="..\..\src\liblzma\check\crc64_table_le.h" />
+    <ClInclude Include="..\..\src\liblzma\check\crc_macros.h" />
+    <ClInclude Include="..\..\src\liblzma\common\alone_decoder.h" />
+    <ClInclude Include="..\..\src\liblzma\common\block_buffer_encoder.h" />
+    <ClInclude Include="..\..\src\liblzma\common\block_decoder.h" />
+    <ClInclude Include="..\..\src\liblzma\common\block_encoder.h" />
+    <ClInclude Include="..\..\src\liblzma\common\common.h" />
+    <ClInclude Include="..\..\src\liblzma\common\easy_preset.h" />
+    <ClInclude Include="..\..\src\liblzma\common\filter_common.h" />
+    <ClInclude Include="..\..\src\liblzma\common\filter_decoder.h" />
+    <ClInclude Include="..\..\src\liblzma\common\filter_encoder.h" />
+    <ClInclude Include="..\..\src\liblzma\common\index.h" />
+    <ClInclude Include="..\..\src\liblzma\common\index_encoder.h" />
+    <ClInclude Include="..\..\src\liblzma\common\memcmplen.h" />
+    <ClInclude Include="..\..\src\liblzma\common\outqueue.h" />
+    <ClInclude Include="..\..\src\liblzma\common\stream_decoder.h" />
+    <ClInclude Include="..\..\src\liblzma\common\stream_flags_common.h" />
+    <ClInclude Include="..\..\src\liblzma\delta\delta_common.h" />
+    <ClInclude Include="..\..\src\liblzma\delta\delta_decoder.h" />
+    <ClInclude Include="..\..\src\liblzma\delta\delta_encoder.h" />
+    <ClInclude Include="..\..\src\liblzma\delta\delta_private.h" />
+    <ClInclude Include="..\..\src\liblzma\lzma\fastpos.h" />
+    <ClInclude Include="..\..\src\liblzma\lzma\lzma2_decoder.h" />
+    <ClInclude Include="..\..\src\liblzma\lzma\lzma2_encoder.h" />
+    <ClInclude Include="..\..\src\liblzma\lzma\lzma_common.h" />
+    <ClInclude Include="..\..\src\liblzma\lzma\lzma_decoder.h" />
+    <ClInclude Include="..\..\src\liblzma\lzma\lzma_encoder.h" />
+    <ClInclude Include="..\..\src\liblzma\lzma\lzma_encoder_private.h" />
+    <ClInclude Include="..\..\src\liblzma\lz\lz_decoder.h" />
+    <ClInclude Include="..\..\src\liblzma\lz\lz_encoder.h" />
+    <ClInclude Include="..\..\src\liblzma\lz\lz_encoder_hash.h" />
+    <ClInclude Include="..\..\src\liblzma\lz\lz_encoder_hash_table.h" />
+    <ClInclude Include="..\..\src\liblzma\rangecoder\price.h" />
+    <ClInclude Include="..\..\src\liblzma\rangecoder\range_common.h" />
+    <ClInclude Include="..\..\src\liblzma\rangecoder\range_decoder.h" />
+    <ClInclude Include="..\..\src\liblzma\rangecoder\range_encoder.h" />
+    <ClInclude Include="..\..\src\liblzma\simple\simple_coder.h" />
+    <ClInclude Include="..\..\src\liblzma\simple\simple_decoder.h" />
+    <ClInclude Include="..\..\src\liblzma\simple\simple_encoder.h" />
+    <ClInclude Include="..\..\src\liblzma\simple\simple_private.h" />
     <ClInclude Include="config.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/windows/liblzma_dll.vcxproj b/windows/vs2013/liblzma_dll.vcxproj
similarity index 60%
rename from windows/liblzma_dll.vcxproj
rename to windows/vs2013/liblzma_dll.vcxproj
index d09f5e4f..264394c1 100644
--- a/windows/liblzma_dll.vcxproj
+++ b/windows/vs2013/liblzma_dll.vcxproj
@@ -231,151 +231,151 @@
     </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\common\tuklib_cpucores.c" />
-    <ClCompile Include="..\src\common\tuklib_physmem.c" />
-    <ClCompile Include="..\src\liblzma\check\check.c" />
-    <ClCompile Include="..\src\liblzma\check\crc32_fast.c" />
-    <ClCompile Include="..\src\liblzma\check\crc32_table.c" />
-    <ClCompile Include="..\src\liblzma\check\crc64_fast.c" />
-    <ClCompile Include="..\src\liblzma\check\crc64_table.c" />
-    <ClCompile Include="..\src\liblzma\check\sha256.c" />
-    <ClCompile Include="..\src\liblzma\common\alone_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\alone_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\auto_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\block_buffer_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\block_buffer_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\block_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\block_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\block_header_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\block_header_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\block_util.c" />
-    <ClCompile Include="..\src\liblzma\common\common.c" />
-    <ClCompile Include="..\src\liblzma\common\easy_buffer_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\easy_decoder_memusage.c" />
-    <ClCompile Include="..\src\liblzma\common\easy_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\easy_encoder_memusage.c" />
-    <ClCompile Include="..\src\liblzma\common\easy_preset.c" />
-    <ClCompile Include="..\src\liblzma\common\filter_buffer_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\filter_buffer_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\filter_common.c" />
-    <ClCompile Include="..\src\liblzma\common\filter_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\filter_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\filter_flags_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\filter_flags_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\hardware_cputhreads.c" />
-    <ClCompile Include="..\src\liblzma\common\hardware_physmem.c" />
-    <ClCompile Include="..\src\liblzma\common\index.c" />
-    <ClCompile Include="..\src\liblzma\common\index_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\index_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\index_hash.c" />
-    <ClCompile Include="..\src\liblzma\common\outqueue.c" />
-    <ClCompile Include="..\src\liblzma\common\stream_buffer_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\stream_buffer_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\stream_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\stream_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\stream_encoder_mt.c" />
-    <ClCompile Include="..\src\liblzma\common\stream_flags_common.c" />
-    <ClCompile Include="..\src\liblzma\common\stream_flags_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\stream_flags_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\vli_decoder.c" />
-    <ClCompile Include="..\src\liblzma\common\vli_encoder.c" />
-    <ClCompile Include="..\src\liblzma\common\vli_size.c" />
-    <ClCompile Include="..\src\liblzma\delta\delta_common.c" />
-    <ClCompile Include="..\src\liblzma\delta\delta_decoder.c" />
-    <ClCompile Include="..\src\liblzma\delta\delta_encoder.c" />
-    <ClCompile Include="..\src\liblzma\lzma\fastpos_table.c" />
-    <ClCompile Include="..\src\liblzma\lzma\lzma2_decoder.c" />
-    <ClCompile Include="..\src\liblzma\lzma\lzma2_encoder.c" />
-    <ClCompile Include="..\src\liblzma\lzma\lzma_decoder.c" />
-    <ClCompile Include="..\src\liblzma\lzma\lzma_encoder.c" />
-    <ClCompile Include="..\src\liblzma\lzma\lzma_encoder_optimum_fast.c" />
-    <ClCompile Include="..\src\liblzma\lzma\lzma_encoder_optimum_normal.c" />
-    <ClCompile Include="..\src\liblzma\lzma\lzma_encoder_presets.c" />
-    <ClCompile Include="..\src\liblzma\lz\lz_decoder.c" />
-    <ClCompile Include="..\src\liblzma\lz\lz_encoder.c" />
-    <ClCompile Include="..\src\liblzma\lz\lz_encoder_mf.c" />
-    <ClCompile Include="..\src\liblzma\rangecoder\price_table.c" />
-    <ClCompile Include="..\src\liblzma\simple\arm.c" />
-    <ClCompile Include="..\src\liblzma\simple\armthumb.c" />
-    <ClCompile Include="..\src\liblzma\simple\ia64.c" />
-    <ClCompile Include="..\src\liblzma\simple\powerpc.c" />
-    <ClCompile Include="..\src\liblzma\simple\simple_coder.c" />
-    <ClCompile Include="..\src\liblzma\simple\simple_decoder.c" />
-    <ClCompile Include="..\src\liblzma\simple\simple_encoder.c" />
-    <ClCompile Include="..\src\liblzma\simple\sparc.c" />
-    <ClCompile Include="..\src\liblzma\simple\x86.c" />
+    <ClCompile Include="..\..\src\common\tuklib_cpucores.c" />
+    <ClCompile Include="..\..\src\common\tuklib_physmem.c" />
+    <ClCompile Include="..\..\src\liblzma\check\check.c" />
+    <ClCompile Include="..\..\src\liblzma\check\crc32_fast.c" />
+    <ClCompile Include="..\..\src\liblzma\check\crc32_table.c" />
+    <ClCompile Include="..\..\src\liblzma\check\crc64_fast.c" />
+    <ClCompile Include="..\..\src\liblzma\check\crc64_table.c" />
+    <ClCompile Include="..\..\src\liblzma\check\sha256.c" />
+    <ClCompile Include="..\..\src\liblzma\common\alone_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\alone_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\auto_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\block_buffer_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\block_buffer_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\block_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\block_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\block_header_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\block_header_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\block_util.c" />
+    <ClCompile Include="..\..\src\liblzma\common\common.c" />
+    <ClCompile Include="..\..\src\liblzma\common\easy_buffer_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\easy_decoder_memusage.c" />
+    <ClCompile Include="..\..\src\liblzma\common\easy_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\easy_encoder_memusage.c" />
+    <ClCompile Include="..\..\src\liblzma\common\easy_preset.c" />
+    <ClCompile Include="..\..\src\liblzma\common\filter_buffer_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\filter_buffer_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\filter_common.c" />
+    <ClCompile Include="..\..\src\liblzma\common\filter_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\filter_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\filter_flags_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\filter_flags_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\hardware_cputhreads.c" />
+    <ClCompile Include="..\..\src\liblzma\common\hardware_physmem.c" />
+    <ClCompile Include="..\..\src\liblzma\common\index.c" />
+    <ClCompile Include="..\..\src\liblzma\common\index_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\index_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\index_hash.c" />
+    <ClCompile Include="..\..\src\liblzma\common\outqueue.c" />
+    <ClCompile Include="..\..\src\liblzma\common\stream_buffer_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\stream_buffer_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\stream_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\stream_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\stream_encoder_mt.c" />
+    <ClCompile Include="..\..\src\liblzma\common\stream_flags_common.c" />
+    <ClCompile Include="..\..\src\liblzma\common\stream_flags_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\stream_flags_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\vli_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\vli_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\common\vli_size.c" />
+    <ClCompile Include="..\..\src\liblzma\delta\delta_common.c" />
+    <ClCompile Include="..\..\src\liblzma\delta\delta_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\delta\delta_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\lzma\fastpos_table.c" />
+    <ClCompile Include="..\..\src\liblzma\lzma\lzma2_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\lzma\lzma2_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\lzma\lzma_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\lzma\lzma_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\lzma\lzma_encoder_optimum_fast.c" />
+    <ClCompile Include="..\..\src\liblzma\lzma\lzma_encoder_optimum_normal.c" />
+    <ClCompile Include="..\..\src\liblzma\lzma\lzma_encoder_presets.c" />
+    <ClCompile Include="..\..\src\liblzma\lz\lz_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\lz\lz_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\lz\lz_encoder_mf.c" />
+    <ClCompile Include="..\..\src\liblzma\rangecoder\price_table.c" />
+    <ClCompile Include="..\..\src\liblzma\simple\arm.c" />
+    <ClCompile Include="..\..\src\liblzma\simple\armthumb.c" />
+    <ClCompile Include="..\..\src\liblzma\simple\ia64.c" />
+    <ClCompile Include="..\..\src\liblzma\simple\powerpc.c" />
+    <ClCompile Include="..\..\src\liblzma\simple\simple_coder.c" />
+    <ClCompile Include="..\..\src\liblzma\simple\simple_decoder.c" />
+    <ClCompile Include="..\..\src\liblzma\simple\simple_encoder.c" />
+    <ClCompile Include="..\..\src\liblzma\simple\sparc.c" />
+    <ClCompile Include="..\..\src\liblzma\simple\x86.c" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\src\common\mythread.h" />
-    <ClInclude Include="..\src\common\sysdefs.h" />
-    <ClInclude Include="..\src\common\tuklib_common.h" />
-    <ClInclude Include="..\src\common\tuklib_config.h" />
-    <ClInclude Include="..\src\common\tuklib_cpucores.h" />
-    <ClInclude Include="..\src\common\tuklib_integer.h" />
-    <ClInclude Include="..\src\common\tuklib_physmem.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\base.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\bcj.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\block.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\check.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\container.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\delta.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\filter.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\hardware.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\index.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\index_hash.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\lzma12.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\stream_flags.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\version.h" />
-    <ClInclude Include="..\src\liblzma\api\lzma\vli.h" />
-    <ClInclude Include="..\src\liblzma\check\check.h" />
-    <ClInclude Include="..\src\liblzma\check\crc32_table_be.h" />
-    <ClInclude Include="..\src\liblzma\check\crc32_table_le.h" />
-    <ClInclude Include="..\src\liblzma\check\crc64_table_be.h" />
-    <ClInclude Include="..\src\liblzma\check\crc64_table_le.h" />
-    <ClInclude Include="..\src\liblzma\check\crc_macros.h" />
-    <ClInclude Include="..\src\liblzma\common\alone_decoder.h" />
-    <ClInclude Include="..\src\liblzma\common\block_buffer_encoder.h" />
-    <ClInclude Include="..\src\liblzma\common\block_decoder.h" />
-    <ClInclude Include="..\src\liblzma\common\block_encoder.h" />
-    <ClInclude Include="..\src\liblzma\common\common.h" />
-    <ClInclude Include="..\src\liblzma\common\easy_preset.h" />
-    <ClInclude Include="..\src\liblzma\common\filter_common.h" />
-    <ClInclude Include="..\src\liblzma\common\filter_decoder.h" />
-    <ClInclude Include="..\src\liblzma\common\filter_encoder.h" />
-    <ClInclude Include="..\src\liblzma\common\index.h" />
-    <ClInclude Include="..\src\liblzma\common\index_encoder.h" />
-    <ClInclude Include="..\src\liblzma\common\memcmplen.h" />
-    <ClInclude Include="..\src\liblzma\common\outqueue.h" />
-    <ClInclude Include="..\src\liblzma\common\stream_decoder.h" />
-    <ClInclude Include="..\src\liblzma\common\stream_flags_common.h" />
-    <ClInclude Include="..\src\liblzma\delta\delta_common.h" />
-    <ClInclude Include="..\src\liblzma\delta\delta_decoder.h" />
-    <ClInclude Include="..\src\liblzma\delta\delta_encoder.h" />
-    <ClInclude Include="..\src\liblzma\delta\delta_private.h" />
-    <ClInclude Include="..\src\liblzma\lzma\fastpos.h" />
-    <ClInclude Include="..\src\liblzma\lzma\lzma2_decoder.h" />
-    <ClInclude Include="..\src\liblzma\lzma\lzma2_encoder.h" />
-    <ClInclude Include="..\src\liblzma\lzma\lzma_common.h" />
-    <ClInclude Include="..\src\liblzma\lzma\lzma_decoder.h" />
-    <ClInclude Include="..\src\liblzma\lzma\lzma_encoder.h" />
-    <ClInclude Include="..\src\liblzma\lzma\lzma_encoder_private.h" />
-    <ClInclude Include="..\src\liblzma\lz\lz_decoder.h" />
-    <ClInclude Include="..\src\liblzma\lz\lz_encoder.h" />
-    <ClInclude Include="..\src\liblzma\lz\lz_encoder_hash.h" />
-    <ClInclude Include="..\src\liblzma\lz\lz_encoder_hash_table.h" />
-    <ClInclude Include="..\src\liblzma\rangecoder\price.h" />
-    <ClInclude Include="..\src\liblzma\rangecoder\range_common.h" />
-    <ClInclude Include="..\src\liblzma\rangecoder\range_decoder.h" />
-    <ClInclude Include="..\src\liblzma\rangecoder\range_encoder.h" />
-    <ClInclude Include="..\src\liblzma\simple\simple_coder.h" />
-    <ClInclude Include="..\src\liblzma\simple\simple_decoder.h" />
-    <ClInclude Include="..\src\liblzma\simple\simple_encoder.h" />
-    <ClInclude Include="..\src\liblzma\simple\simple_private.h" />
+    <ClInclude Include="..\..\src\common\mythread.h" />
+    <ClInclude Include="..\..\src\common\sysdefs.h" />
+    <ClInclude Include="..\..\src\common\tuklib_common.h" />
+    <ClInclude Include="..\..\src\common\tuklib_config.h" />
+    <ClInclude Include="..\..\src\common\tuklib_cpucores.h" />
+    <ClInclude Include="..\..\src\common\tuklib_integer.h" />
+    <ClInclude Include="..\..\src\common\tuklib_physmem.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\base.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\bcj.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\block.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\check.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\container.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\delta.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\filter.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\hardware.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\index.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\index_hash.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\lzma12.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\stream_flags.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\version.h" />
+    <ClInclude Include="..\..\src\liblzma\api\lzma\vli.h" />
+    <ClInclude Include="..\..\src\liblzma\check\check.h" />
+    <ClInclude Include="..\..\src\liblzma\check\crc32_table_be.h" />
+    <ClInclude Include="..\..\src\liblzma\check\crc32_table_le.h" />
+    <ClInclude Include="..\..\src\liblzma\check\crc64_table_be.h" />
+    <ClInclude Include="..\..\src\liblzma\check\crc64_table_le.h" />
+    <ClInclude Include="..\..\src\liblzma\check\crc_macros.h" />
+    <ClInclude Include="..\..\src\liblzma\common\alone_decoder.h" />
+    <ClInclude Include="..\..\src\liblzma\common\block_buffer_encoder.h" />
+    <ClInclude Include="..\..\src\liblzma\common\block_decoder.h" />
+    <ClInclude Include="..\..\src\liblzma\common\block_encoder.h" />
+    <ClInclude Include="..\..\src\liblzma\common\common.h" />
+    <ClInclude Include="..\..\src\liblzma\common\easy_preset.h" />
+    <ClInclude Include="..\..\src\liblzma\common\filter_common.h" />
+    <ClInclude Include="..\..\src\liblzma\common\filter_decoder.h" />
+    <ClInclude Include="..\..\src\liblzma\common\filter_encoder.h" />
+    <ClInclude Include="..\..\src\liblzma\common\index.h" />
+    <ClInclude Include="..\..\src\liblzma\common\index_encoder.h" />
+    <ClInclude Include="..\..\src\liblzma\common\memcmplen.h" />
+    <ClInclude Include="..\..\src\liblzma\common\outqueue.h" />
+    <ClInclude Include="..\..\src\liblzma\common\stream_decoder.h" />
+    <ClInclude Include="..\..\src\liblzma\common\stream_flags_common.h" />
+    <ClInclude Include="..\..\src\liblzma\delta\delta_common.h" />
+    <ClInclude Include="..\..\src\liblzma\delta\delta_decoder.h" />
+    <ClInclude Include="..\..\src\liblzma\delta\delta_encoder.h" />
+    <ClInclude Include="..\..\src\liblzma\delta\delta_private.h" />
+    <ClInclude Include="..\..\src\liblzma\lzma\fastpos.h" />
+    <ClInclude Include="..\..\src\liblzma\lzma\lzma2_decoder.h" />
+    <ClInclude Include="..\..\src\liblzma\lzma\lzma2_encoder.h" />
+    <ClInclude Include="..\..\src\liblzma\lzma\lzma_common.h" />
+    <ClInclude Include="..\..\src\liblzma\lzma\lzma_decoder.h" />
+    <ClInclude Include="..\..\src\liblzma\lzma\lzma_encoder.h" />
+    <ClInclude Include="..\..\src\liblzma\lzma\lzma_encoder_private.h" />
+    <ClInclude Include="..\..\src\liblzma\lz\lz_decoder.h" />
+    <ClInclude Include="..\..\src\liblzma\lz\lz_encoder.h" />
+    <ClInclude Include="..\..\src\liblzma\lz\lz_encoder_hash.h" />
+    <ClInclude Include="..\..\src\liblzma\lz\lz_encoder_hash_table.h" />
+    <ClInclude Include="..\..\src\liblzma\rangecoder\price.h" />
+    <ClInclude Include="..\..\src\liblzma\rangecoder\range_common.h" />
+    <ClInclude Include="..\..\src\liblzma\rangecoder\range_decoder.h" />
+    <ClInclude Include="..\..\src\liblzma\rangecoder\range_encoder.h" />
+    <ClInclude Include="..\..\src\liblzma\simple\simple_coder.h" />
+    <ClInclude Include="..\..\src\liblzma\simple\simple_decoder.h" />
+    <ClInclude Include="..\..\src\liblzma\simple\simple_encoder.h" />
+    <ClInclude Include="..\..\src\liblzma\simple\simple_private.h" />
     <ClInclude Include="config.h" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="..\src\liblzma\liblzma_w32res.rc" />
+    <ResourceCompile Include="..\..\src\liblzma\liblzma_w32res.rc" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/windows/xz_win.sln b/windows/vs2013/xz_win.sln
similarity index 100%
rename from windows/xz_win.sln
rename to windows/vs2013/xz_win.sln