Splitting zlib out.

4 files changed, 264 insertions, 83 deletions

diff --git a/win32/project/Balau.vcxproj b/win32/project/Balau.vcxproj
index deccd41..3487117 100644
--- a/win32/project/Balau.vcxproj
+++ b/win32/project/Balau.vcxproj
@@ -1640,16 +1640,6 @@
     </ClCompile>

     <ClCompile Include="..\regex\msvc-regex.c" />

     <ClCompile Include="..\tomcrypt_aes_enc.c" />

-    <ClCompile Include="..\zlib\adler32.c" />

-    <ClCompile Include="..\zlib\crc32.c" />

-    <ClCompile Include="..\zlib\deflate.c" />

-    <ClCompile Include="..\zlib\infback.c" />

-    <ClCompile Include="..\zlib\inffast.c" />

-    <ClCompile Include="..\zlib\inflate.c" />

-    <ClCompile Include="..\zlib\inftrees.c" />

-    <ClCompile Include="..\zlib\trees.c" />

-    <ClCompile Include="..\zlib\uncompr.c" />

-    <ClCompile Include="..\zlib\zutil.c" />

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\..\includes\Async.h" />

@@ -1910,16 +1900,6 @@
     <ClInclude Include="..\pthreads-win32\sched.h" />

     <ClInclude Include="..\pthreads-win32\semaphore.h" />

     <ClInclude Include="..\regex\regex.h" />

-    <ClInclude Include="..\zlib\crc32.h" />

-    <ClInclude Include="..\zlib\deflate.h" />

-    <ClInclude Include="..\zlib\inffast.h" />

-    <ClInclude Include="..\zlib\inffixed.h" />

-    <ClInclude Include="..\zlib\inflate.h" />

-    <ClInclude Include="..\zlib\inftrees.h" />

-    <ClInclude Include="..\zlib\trees.h" />

-    <ClInclude Include="..\zlib\zconf.h" />

-    <ClInclude Include="..\zlib\zlib.h" />

-    <ClInclude Include="..\zlib\zutil.h" />

   </ItemGroup>

   <ItemGroup>

     <None Include="..\..\src\jsoncpp\src\json_internalarray.inl">

diff --git a/win32/project/Balau.vcxproj.filters b/win32/project/Balau.vcxproj.filters
index 1465479..bac5119 100644
--- a/win32/project/Balau.vcxproj.filters
+++ b/win32/project/Balau.vcxproj.filters
@@ -10,9 +10,6 @@
     <Filter Include="Third Party">

       <UniqueIdentifier>{893ad8e1-312b-4844-80e6-80e0720df61b}</UniqueIdentifier>

     </Filter>

-    <Filter Include="Third Party\zlib">

-      <UniqueIdentifier>{19946262-3fd0-4851-b477-258229f854db}</UniqueIdentifier>

-    </Filter>

     <Filter Include="Third Party\iconv">

       <UniqueIdentifier>{8496db30-fa00-477c-9e7c-1b68c6956889}</UniqueIdentifier>

     </Filter>

@@ -318,36 +315,6 @@
     <ClCompile Include="..\..\src\ZHandle.cc">

       <Filter>Source</Filter>

     </ClCompile>

-    <ClCompile Include="..\zlib\adler32.c">

-      <Filter>Third Party\zlib</Filter>

-    </ClCompile>

-    <ClCompile Include="..\zlib\crc32.c">

-      <Filter>Third Party\zlib</Filter>

-    </ClCompile>

-    <ClCompile Include="..\zlib\deflate.c">

-      <Filter>Third Party\zlib</Filter>

-    </ClCompile>

-    <ClCompile Include="..\zlib\infback.c">

-      <Filter>Third Party\zlib</Filter>

-    </ClCompile>

-    <ClCompile Include="..\zlib\inffast.c">

-      <Filter>Third Party\zlib</Filter>

-    </ClCompile>

-    <ClCompile Include="..\zlib\inflate.c">

-      <Filter>Third Party\zlib</Filter>

-    </ClCompile>

-    <ClCompile Include="..\zlib\inftrees.c">

-      <Filter>Third Party\zlib</Filter>

-    </ClCompile>

-    <ClCompile Include="..\zlib\trees.c">

-      <Filter>Third Party\zlib</Filter>

-    </ClCompile>

-    <ClCompile Include="..\zlib\uncompr.c">

-      <Filter>Third Party\zlib</Filter>

-    </ClCompile>

-    <ClCompile Include="..\zlib\zutil.c">

-      <Filter>Third Party\zlib</Filter>

-    </ClCompile>

     <ClCompile Include="..\iconv\iconv.c">

       <Filter>Third Party\iconv</Filter>

     </ClCompile>

@@ -2279,36 +2246,6 @@
     <ClInclude Include="..\..\includes\ZHandle.h">

       <Filter>Headers</Filter>

     </ClInclude>

-    <ClInclude Include="..\zlib\crc32.h">

-      <Filter>Third Party\zlib</Filter>

-    </ClInclude>

-    <ClInclude Include="..\zlib\deflate.h">

-      <Filter>Third Party\zlib</Filter>

-    </ClInclude>

-    <ClInclude Include="..\zlib\inffast.h">

-      <Filter>Third Party\zlib</Filter>

-    </ClInclude>

-    <ClInclude Include="..\zlib\inffixed.h">

-      <Filter>Third Party\zlib</Filter>

-    </ClInclude>

-    <ClInclude Include="..\zlib\inflate.h">

-      <Filter>Third Party\zlib</Filter>

-    </ClInclude>

-    <ClInclude Include="..\zlib\inftrees.h">

-      <Filter>Third Party\zlib</Filter>

-    </ClInclude>

-    <ClInclude Include="..\zlib\trees.h">

-      <Filter>Third Party\zlib</Filter>

-    </ClInclude>

-    <ClInclude Include="..\zlib\zconf.h">

-      <Filter>Third Party\zlib</Filter>

-    </ClInclude>

-    <ClInclude Include="..\zlib\zlib.h">

-      <Filter>Third Party\zlib</Filter>

-    </ClInclude>

-    <ClInclude Include="..\zlib\zutil.h">

-      <Filter>Third Party\zlib</Filter>

-    </ClInclude>

     <ClInclude Include="..\iconv\aliases.h">

       <Filter>Third Party\iconv</Filter>

     </ClInclude>

diff --git a/win32/project/zlib.vcxproj b/win32/project/zlib.vcxproj
new file mode 100644
index 0000000..595fc05
--- /dev/null
+++ b/win32/project/zlib.vcxproj
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project DefaultTargets="Build" ToolsVersion="12.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>{C98A6524-5AA7-4FFD-8DDA-679A1016D185}</ProjectGuid>

+    <RootNamespace>zlib</RootNamespace>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseDebugLibraries>true</UseDebugLibraries>

+    <PlatformToolset>v120</PlatformToolset>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseDebugLibraries>true</UseDebugLibraries>

+    <PlatformToolset>v120</PlatformToolset>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseDebugLibraries>false</UseDebugLibraries>

+    <PlatformToolset>v120</PlatformToolset>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">

+    <ConfigurationType>StaticLibrary</ConfigurationType>

+    <UseDebugLibraries>false</UseDebugLibraries>

+    <PlatformToolset>v120</PlatformToolset>

+    <WholeProgramOptimization>true</WholeProgramOptimization>

+    <CharacterSet>MultiByte</CharacterSet>

+  </PropertyGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

+  <ImportGroup Label="ExtensionSettings">

+  </ImportGroup>

+  <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'">

+    <OutDir>$(SolutionDir)$(Platform)\$(ProjectName)\$(Configuration)\</OutDir>

+    <IntDir>$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <OutDir>$(SolutionDir)$(Platform)\$(ProjectName)\$(Configuration)\</OutDir>

+    <IntDir>$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <OutDir>$(SolutionDir)$(Platform)\$(ProjectName)\$(Configuration)\</OutDir>

+    <IntDir>$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <OutDir>$(SolutionDir)$(Platform)\$(ProjectName)\$(Configuration)\</OutDir>

+    <IntDir>$(Platform)\$(ProjectName)\$(Configuration)\</IntDir>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <ClCompile>

+      <WarningLevel>Level3</WarningLevel>

+      <Optimization>Disabled</Optimization>

+      <SDLCheck>true</SDLCheck>

+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ClCompile>

+    <Link>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

+    <ClCompile>

+      <WarningLevel>Level3</WarningLevel>

+      <Optimization>Disabled</Optimization>

+      <SDLCheck>true</SDLCheck>

+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ClCompile>

+    <Link>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <ClCompile>

+      <WarningLevel>Level3</WarningLevel>

+      <Optimization>MaxSpeed</Optimization>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <SDLCheck>true</SDLCheck>

+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ClCompile>

+    <Link>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <OptimizeReferences>true</OptimizeReferences>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+    <ClCompile>

+      <WarningLevel>Level3</WarningLevel>

+      <Optimization>MaxSpeed</Optimization>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <IntrinsicFunctions>true</IntrinsicFunctions>

+      <SDLCheck>true</SDLCheck>

+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+    </ClCompile>

+    <Link>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <OptimizeReferences>true</OptimizeReferences>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="..\zlib\adler32.c" />

+    <ClCompile Include="..\zlib\compress.c" />

+    <ClCompile Include="..\zlib\crc32.c" />

+    <ClCompile Include="..\zlib\deflate.c" />

+    <ClCompile Include="..\zlib\gzclose.c" />

+    <ClCompile Include="..\zlib\gzlib.c" />

+    <ClCompile Include="..\zlib\gzread.c" />

+    <ClCompile Include="..\zlib\gzwrite.c" />

+    <ClCompile Include="..\zlib\infback.c" />

+    <ClCompile Include="..\zlib\inffast.c" />

+    <ClCompile Include="..\zlib\inflate.c" />

+    <ClCompile Include="..\zlib\inftrees.c" />

+    <ClCompile Include="..\zlib\trees.c" />

+    <ClCompile Include="..\zlib\uncompr.c" />

+    <ClCompile Include="..\zlib\zutil.c" />

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\zlib\crc32.h" />

+    <ClInclude Include="..\zlib\deflate.h" />

+    <ClInclude Include="..\zlib\gzguts.h" />

+    <ClInclude Include="..\zlib\inffast.h" />

+    <ClInclude Include="..\zlib\inffixed.h" />

+    <ClInclude Include="..\zlib\inflate.h" />

+    <ClInclude Include="..\zlib\inftrees.h" />

+    <ClInclude Include="..\zlib\trees.h" />

+    <ClInclude Include="..\zlib\zconf.h" />

+    <ClInclude Include="..\zlib\zlib.h" />

+    <ClInclude Include="..\zlib\zutil.h" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/win32/project/zlib.vcxproj.filters b/win32/project/zlib.vcxproj.filters
new file mode 100644
index 0000000..874aab2
--- /dev/null
+++ b/win32/project/zlib.vcxproj.filters
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>

+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>

+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="..\zlib\adler32.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\zlib\compress.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\zlib\crc32.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\zlib\deflate.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\zlib\gzclose.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\zlib\gzlib.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\zlib\gzread.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\zlib\gzwrite.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\zlib\infback.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\zlib\inffast.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\zlib\inflate.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\zlib\inftrees.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\zlib\trees.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\zlib\uncompr.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\zlib\zutil.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="..\zlib\crc32.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\zlib\deflate.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\zlib\gzguts.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\zlib\inffast.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\zlib\inffixed.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\zlib\inflate.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\zlib\inftrees.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\zlib\trees.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\zlib\zconf.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\zlib\zlib.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="..\zlib\zutil.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+</Project>
\ No newline at end of file