Skip to content

Commit

Permalink
FS-11069: [Build-System] Update zlib to 1.2.11 and move it to pre-com…
Browse files Browse the repository at this point in the history 
…piled binaries on Windows.
  • Loading branch information
@andywolk
andywolk authored and Muteesa Fred committed Jul 24, 2018
1 parent b12762d commit d22e16e
Show file tree
Hide file tree
Showing 7 changed files with 75 additions and 376 deletions.
34 changes: 0 additions & 34 deletions Freeswitch.2015.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -583,19 +583,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyuv", "libs\win32\libyuv
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvpx", "libs\win32\libvpx\libvpx.2015.vcxproj", "{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "libs\win32\zlib\zlib.vcxproj", "{60F89955-91C6-3A36-8000-13C592FEC2DF}"
ProjectSection(ProjectDependencies) = postProject
{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311} = {CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libs\win32\libpng\libpng.vcxproj", "{D6973076-9317-4EF2-A0B8-B7A18AC0713E}"
ProjectSection(ProjectDependencies) = postProject
{60F89955-91C6-3A36-8000-13C592FEC2DF} = {60F89955-91C6-3A36-8000-13C592FEC2DF}
{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33} = {C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download zlib", "libs\win32\Download zlib.2015.vcxproj", "{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Download libpng", "libs\win32\Download libpng.2015.vcxproj", "{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype", "libs\win32\freetype\freetype.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
Expand Down Expand Up @@ -2682,18 +2674,6 @@ Global
{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Release|Win32.Build.0 = Release|Win32
{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Release|x64.ActiveCfg = Release|x64
{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}.Release|x64.Build.0 = Release|x64
{60F89955-91C6-3A36-8000-13C592FEC2DF}.All|Win32.ActiveCfg = Release|Win32
{60F89955-91C6-3A36-8000-13C592FEC2DF}.All|Win32.Build.0 = Release|Win32
{60F89955-91C6-3A36-8000-13C592FEC2DF}.All|x64.ActiveCfg = Release|x64
{60F89955-91C6-3A36-8000-13C592FEC2DF}.All|x64.Build.0 = Release|x64
{60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|Win32.ActiveCfg = Debug|Win32
{60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|Win32.Build.0 = Debug|Win32
{60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|x64.ActiveCfg = Debug|x64
{60F89955-91C6-3A36-8000-13C592FEC2DF}.Debug|x64.Build.0 = Debug|x64
{60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|Win32.ActiveCfg = Release|Win32
{60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|Win32.Build.0 = Release|Win32
{60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|x64.ActiveCfg = Release|x64
{60F89955-91C6-3A36-8000-13C592FEC2DF}.Release|x64.Build.0 = Release|x64
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.All|Win32.ActiveCfg = Release|Win32
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.All|Win32.Build.0 = Release|Win32
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.All|x64.ActiveCfg = Release|x64
Expand All @@ -2706,18 +2686,6 @@ Global
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|Win32.Build.0 = Release|Win32
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x64.ActiveCfg = Release|x64
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|x64.Build.0 = Release|x64
{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.All|Win32.ActiveCfg = Release|Win32
{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.All|Win32.Build.0 = Release|Win32
{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.All|x64.ActiveCfg = Release|Win32
{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.All|x64.Build.0 = Release|Win32
{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.Debug|Win32.ActiveCfg = Debug|Win32
{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.Debug|Win32.Build.0 = Debug|Win32
{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.Debug|x64.ActiveCfg = Debug|Win32
{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.Debug|x64.Build.0 = Debug|Win32
{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.Release|Win32.ActiveCfg = Release|Win32
{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.Release|Win32.Build.0 = Release|Win32
{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.Release|x64.ActiveCfg = Release|Win32
{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311}.Release|x64.Build.0 = Release|Win32
{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.All|Win32.ActiveCfg = Release|Win32
{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.All|Win32.Build.0 = Release|Win32
{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33}.All|x64.ActiveCfg = Release|Win32
Expand Down Expand Up @@ -3147,9 +3115,7 @@ Global
{5B2BACE4-0F5A-4A21-930D-C0F4B1F58FA6} = {9460B5F1-0A95-41C4-BEB7-9C2C96459A7C}
{B6E22500-3DB6-4E6E-8CD5-591B781D7D99} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{60F89955-91C6-3A36-8000-13C592FEC2DF} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{CDCEC78E-D445-47AC-A2AE-DEBE2CE3A311} = {C120A020-773F-4EA3-923F-B67AF28B750D}
{C2D5EB6D-F4DE-4DEE-B5B8-B6FD26C22D33} = {C120A020-773F-4EA3-923F-B67AF28B750D}
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
{0AD87FDA-989F-4638-B6E1-B0132BB0560A} = {C120A020-773F-4EA3-923F-B67AF28B750D}
Expand Down
2 changes: 2 additions & 0 deletions libs/.gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -842,3 +842,5 @@ spandsp/configure
srtp/configure
tiff-4.0.2/configure
unimrcp/configure
zlib-*/
zlib-*
82 changes: 0 additions & 82 deletions libs/win32/Download zlib.2015.vcxproj
View file

This file was deleted.

19 changes: 2 additions & 17 deletions libs/win32/libpng/libpng.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,17 +100,14 @@
<CompileAs>CompileAsC</CompileAs>
<StringPooling>true</StringPooling>
<DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<Optimization>Disabled</Optimization>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>zlib.lib</AdditionalDependencies>
<Version>16</Version>
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -129,18 +126,15 @@
<StringPooling>true</StringPooling>
<MinimalRebuild>false</MinimalRebuild>
<DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<Optimization>Full</Optimization>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>zlib.lib</AdditionalDependencies>
<Version>16</Version>
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand All @@ -163,17 +157,14 @@
<CompileAs>CompileAsC</CompileAs>
<StringPooling>true</StringPooling>
<DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<Optimization>Disabled</Optimization>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>zlib.lib</AdditionalDependencies>
<Version>16</Version>
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand All @@ -195,18 +186,15 @@
<StringPooling>true</StringPooling>
<MinimalRebuild>false</MinimalRebuild>
<DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
<AdditionalIncludeDirectories>$(ZLibSrcDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
<Optimization>Full</Optimization>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<GenerateDebugInformation>false</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>zlib.lib</AdditionalDependencies>
<Version>16</Version>
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down Expand Up @@ -245,9 +233,6 @@
<ProjectReference Include="..\Download libpng.2015.vcxproj">
<Project>{c2d5eb6d-f4de-4dee-b5b8-b6fd26c22d33}</Project>
</ProjectReference>
<ProjectReference Include="..\zlib\zlib.vcxproj">
<Project>{60f89955-91c6-3a36-8000-13c592fec2df}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
Expand Down
Loading

0 comments on commit d22e16e

Please sign in to comment.