mirror of
https://github.com/signalwire/freeswitch.git
synced 2026-10-03 17:53:59 +00:00
[Build-System] Windows: Upgrade OpenSSL to v3.4.7_1, libpq to v17.11_1, rabbitmq-c to v0.17.0_1, zlib to v1.3.2_1, libpng to v1.6.58_1, curl to v7.88.1_1, libks to v2.0.11_1, signalwire-client-c to v2.0.5_2. (#3167)
This commit is contained in:
Andrey Volk
+18
@@ -250,6 +250,24 @@ libs/libcodec2-*/
|
||||
libs/libsilk-*/
|
||||
libs/rabbitmq-c-*/
|
||||
libs/rabbitmq-c-*.zip
|
||||
# Dependency packages w32\*.props download from freeswitch/windows-deps
|
||||
# into libs\<name>-<version>_<build>\ (rabbitmq-c is listed above).
|
||||
libs/zlib-*/
|
||||
libs/zlib-*.zip
|
||||
libs/openssl-*/
|
||||
libs/openssl-*.zip
|
||||
libs/libpng-*/
|
||||
libs/libpng-*.zip
|
||||
libs/libks-*/
|
||||
libs/libks-*.zip
|
||||
libs/signalwire-client-c-*/
|
||||
libs/signalwire-client-c-*.zip
|
||||
libs/curl-*/
|
||||
libs/curl-*.zip
|
||||
libs/libpcap-*/
|
||||
libs/libpcap-*.zip
|
||||
libs/libpq-*/
|
||||
libs/libpq-*.zip
|
||||
libs/SharpZipLib.*/
|
||||
libs/SharpZipLib.*.nupkg
|
||||
libs/nasm-*/
|
||||
|
||||
@@ -444,8 +444,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libyuv", "libs\win32\libyuv
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvpx", "libs\win32\libvpx\libvpx.2017.vcxproj", "{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libs\win32\libpng\libpng.2017.vcxproj", "{D6973076-9317-4EF2-A0B8-B7A18AC0713E}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "freetype.2017", "libs\win32\freetype\freetype.2017.vcxproj", "{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_png", "src\mod\formats\mod_png\mod_png.2017.vcxproj", "{FBC7E2A4-B989-4289-BA7F-68F440E9EF8B}"
|
||||
@@ -1900,18 +1898,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
|
||||
{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
|
||||
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.All|x64.Build.0 = Release|x64
|
||||
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Debug|x64.Build.0 = Debug|x64
|
||||
{D6973076-9317-4EF2-A0B8-B7A18AC0713E}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{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
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.All|Win32.ActiveCfg = Release|Win32
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.All|Win32.Build.0 = Release|Win32
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B}.All|x64.ActiveCfg = Release|x64
|
||||
@@ -2464,7 +2450,6 @@ 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}
|
||||
{D6973076-9317-4EF2-A0B8-B7A18AC0713E} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
|
||||
{78B079BD-9FC7-4B9E-B4A6-96DA0F00248B} = {EB910B0D-F27D-4B62-B67B-DE834C99AC5B}
|
||||
{FBC7E2A4-B989-4289-BA7F-68F440E9EF8B} = {A5A27244-AD24-46E5-B01B-840CD296C91D}
|
||||
{7AEE504B-23B6-4B05-829E-7CD34855F146} = {E72B5BCB-6462-4D23-B419-3AF1A4AC3D78}
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
1
|
||||
@@ -1,236 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="15.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">
|
||||
<ProjectName>libpng</ProjectName>
|
||||
<ProjectGuid>{D6973076-9317-4EF2-A0B8-B7A18AC0713E}</ProjectGuid>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<RootNamespace>libpng</RootNamespace>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<Import Project="$(SolutionDir)w32\zlib.props" Condition=" '$(zlibImported)' == '' " />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>MultiByte</CharacterSet>
|
||||
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release|x64'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
||||
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<Import Project="$(SolutionDir)\w32\download_libpng.props" Condition=" '$(downloadlibpngPropsImported)' == '' " />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='release|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="..\..\..\w32\extdll.props" />
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug|Win32'" Label="PropertySheets">
|
||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||
<Import Project="..\..\..\w32\extdll.props" />
|
||||
</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" />
|
||||
<Import Project="..\..\..\w32\extdll.props" />
|
||||
</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" />
|
||||
<Import Project="..\..\..\w32\extdll.props" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<TargetName>$(ProjectName)16</TargetName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<TargetName>$(ProjectName)16</TargetName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<TargetName>$(ProjectName)16</TargetName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<LinkIncremental>false</LinkIncremental>
|
||||
<TargetName>$(ProjectName)16</TargetName>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<WarningLevel>$(WarningLevel)</WarningLevel>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<FloatingPointExceptions>false</FloatingPointExceptions>
|
||||
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
|
||||
<PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
|
||||
<BrowseInformation>true</BrowseInformation>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
<StringPooling>true</StringPooling>
|
||||
<DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
<TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<Version>16</Version>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<WarningLevel>$(WarningLevel)</WarningLevel>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<FloatingPointExceptions>false</FloatingPointExceptions>
|
||||
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
|
||||
<PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
|
||||
<BrowseInformation>true</BrowseInformation>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
<StringPooling>true</StringPooling>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
<TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
|
||||
<Optimization>Full</Optimization>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<Version>16</Version>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<Midl>
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<WarningLevel>$(WarningLevel)</WarningLevel>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<FloatingPointExceptions>false</FloatingPointExceptions>
|
||||
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
|
||||
<PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
|
||||
<BrowseInformation>true</BrowseInformation>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
<StringPooling>true</StringPooling>
|
||||
<DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
<TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<Version>16</Version>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<Midl>
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<WarningLevel>$(WarningLevel)</WarningLevel>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<FloatingPointExceptions>false</FloatingPointExceptions>
|
||||
<TreatWChar_tAsBuiltInType>false</TreatWChar_tAsBuiltInType>
|
||||
<PrecompiledHeaderFile>pngpriv.h</PrecompiledHeaderFile>
|
||||
<BrowseInformation>true</BrowseInformation>
|
||||
<CompileAs>CompileAsC</CompileAs>
|
||||
<StringPooling>true</StringPooling>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<DisableSpecificWarnings>$(DisableSpecificWarnings)</DisableSpecificWarnings>
|
||||
<TreatWarningAsError>$(TreatWarningAsError)</TreatWarningAsError>
|
||||
<Optimization>Full</Optimization>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>false</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<Version>16</Version>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemGroup>
|
||||
<CustomBuild Include="cleancount">
|
||||
<FileType>Document</FileType>
|
||||
<Message>Generating pnglibconf.h</Message>
|
||||
<Command>copy $(ProjectDir)..\..\libpng\scripts\pnglibconf.h.prebuilt $(ProjectDir)..\..\libpng\pnglibconf.h</Command>
|
||||
<Outputs>$(ProjectDir)..\..\libpng\pnglibconf.h;%(Outputs)</Outputs>
|
||||
</CustomBuild>
|
||||
<ClCompile Include="..\..\libpng\png.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\..\libpng\pngerror.c" />
|
||||
<ClCompile Include="..\..\libpng\pngget.c" />
|
||||
<ClCompile Include="..\..\libpng\pngmem.c" />
|
||||
<ClCompile Include="..\..\libpng\pngpread.c" />
|
||||
<ClCompile Include="..\..\libpng\pngread.c" />
|
||||
<ClCompile Include="..\..\libpng\pngrio.c" />
|
||||
<ClCompile Include="..\..\libpng\pngrtran.c" />
|
||||
<ClCompile Include="..\..\libpng\pngrutil.c" />
|
||||
<ClCompile Include="..\..\libpng\pngset.c" />
|
||||
<ClCompile Include="..\..\libpng\pngtrans.c" />
|
||||
<ClCompile Include="..\..\libpng\pngwio.c" />
|
||||
<ClCompile Include="..\..\libpng\pngwrite.c" />
|
||||
<ClCompile Include="..\..\libpng\pngwtran.c" />
|
||||
<ClCompile Include="..\..\libpng\pngwutil.c" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="..\..\libpng\scripts\pngwin.rc">
|
||||
</ResourceCompile>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
@@ -46,6 +46,7 @@
|
||||
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<Import Project="..\..\..\..\w32\libpng.props" Condition=" '$(libpngImported)' == '' " />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
|
||||
@@ -70,13 +71,11 @@
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\win32\libpng\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalLibraryDirectories>..\..\..\..\libs\libpng\Win32\$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<RandomizedBaseAddress>false</RandomizedBaseAddress>
|
||||
<DataExecutionPrevention>
|
||||
</DataExecutionPrevention>
|
||||
@@ -87,13 +86,11 @@
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\win32\libpng\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;MOD_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalLibraryDirectories>..\..\..\..\libs\libpng\Win32\$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<RandomizedBaseAddress>false</RandomizedBaseAddress>
|
||||
<DataExecutionPrevention>
|
||||
</DataExecutionPrevention>
|
||||
@@ -102,12 +99,10 @@
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\win32\libpng\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalLibraryDirectories>..\..\..\..\libs\libpng\Win32\$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<RandomizedBaseAddress>false</RandomizedBaseAddress>
|
||||
<DataExecutionPrevention>
|
||||
</DataExecutionPrevention>
|
||||
@@ -118,12 +113,10 @@
|
||||
<TargetEnvironment>X64</TargetEnvironment>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>%(RootDir)%(Directory)..\..\..\..\libs\win32\libpng\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalLibraryDirectories>..\..\..\..\libs\libpng\Win32\$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<RandomizedBaseAddress>false</RandomizedBaseAddress>
|
||||
<DataExecutionPrevention>
|
||||
</DataExecutionPrevention>
|
||||
@@ -134,10 +127,6 @@
|
||||
<ClCompile Include="mod_png.c" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\..\libs\win32\libpng\libpng.2017.vcxproj">
|
||||
<Project>{D6973076-9317-4EF2-A0B8-B7A18AC0713E}</Project>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2017.vcxproj">
|
||||
<Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
|
||||
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
|
||||
|
||||
@@ -51,6 +51,7 @@
|
||||
<Import Project="$(SolutionDir)\w32\openssl.props" Condition=" '$(OpensslPropsImported)' == '' " />
|
||||
<Import Project="$(SolutionDir)\w32\curl.props" Condition=" '$(CurlPropsImported)' == '' " />
|
||||
<Import Project="$(SolutionDir)\w32\pcre.props" Condition=" '$(pcrePropsImported)' == '' " />
|
||||
<Import Project="$(SolutionDir)\w32\libpng.props" Condition=" '$(libpngImported)' == '' " />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
|
||||
@@ -128,7 +129,7 @@ if not exist "$(OutDir)fonts" xcopy "$(SolutionDir)fonts\*.*" "$(OutDir)fonts\"
|
||||
<BuildLog />
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite;..\..\libs\speex-1.2rc1\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libpng;..\..\libs\libvpx;..\..\libs\win32\libvpx\include_x86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite;..\..\libs\speex-1.2rc1\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libvpx;..\..\libs\win32\libvpx\include_x86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>CJSON_EXPORT_SYMBOLS;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;TPL_NOLIB;LIBSOFIA_SIP_UA_STATIC;SWITCH_HAVE_YUV;SWITCH_HAVE_VPX;SWITCH_HAVE_PNG;SWITCH_HAVE_FREETYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
@@ -178,7 +179,7 @@ if not exist "$(OutDir)fonts" xcopy "$(SolutionDir)fonts\*.*" "$(OutDir)fonts\"
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite;..\..\libs\speex-1.2rc1\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libpng;..\..\libs\libvpx;..\..\libs\win32\libvpx\include_x64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite;..\..\libs\speex-1.2rc1\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libvpx;..\..\libs\win32\libvpx\include_x64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>CJSON_EXPORT_SYMBOLS;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;TPL_NOLIB;LIBSOFIA_SIP_UA_STATIC;SWITCH_HAVE_YUV;SWITCH_HAVE_VPX;SWITCH_HAVE_PNG;SWITCH_HAVE_FREETYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>true</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
@@ -219,7 +220,7 @@ if not exist "$(OutDir)fonts" xcopy "$(SolutionDir)fonts\*.*" "$(OutDir)fonts\"
|
||||
<BuildLog />
|
||||
<ClCompile>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite;..\..\libs\speex-1.2rc1\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libpng;..\..\libs\libvpx;..\..\libs\win32\libvpx\include_x86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite;..\..\libs\speex-1.2rc1\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libvpx;..\..\libs\win32\libvpx\include_x86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>CJSON_EXPORT_SYMBOLS;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;TPL_NOLIB;LIBSOFIA_SIP_UA_STATIC;SWITCH_HAVE_YUV;SWITCH_HAVE_VPX;SWITCH_HAVE_PNG;SWITCH_HAVE_FREETYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>Create</PrecompiledHeader>
|
||||
@@ -257,7 +258,7 @@ if not exist "$(OutDir)fonts" xcopy "$(SolutionDir)fonts\*.*" "$(OutDir)fonts\"
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite;..\..\libs\speex-1.2rc1\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libpng;..\..\libs\libvpx;..\..\libs\win32\libvpx\include_x64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>..\..\src\include;..\..\libs\include;..\..\libs\srtp\include;..\..\libs\srtp\crypto\include;..\..\libs\libteletone\src;..\..\libs\sqlite;..\..\libs\speex-1.2rc1\include;..\..\libs\spandsp\src\msvc;..\..\libs\spandsp\src;..\..\libs\libtpl-1.5\src;..\..\libs\libtpl-1.5\src\win;..\..\libs\sofia-sip\libsofia-sip-ua\sdp;..\..\libs\sofia-sip\libsofia-sip-ua\su;..\..\libs\sofia-sip\win32;..\..\libs\libyuv\include;..\..\libs\freetype\include;..\..\libs\libvpx;..\..\libs\win32\libvpx\include_x64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>CJSON_EXPORT_SYMBOLS;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;FREESWITCHCORE_EXPORTS;STATICLIB;CRASH_PROT;TPL_NOLIB;LIBSOFIA_SIP_UA_STATIC;SWITCH_HAVE_YUV;SWITCH_HAVE_VPX;SWITCH_HAVE_PNG;SWITCH_HAVE_FREETYPE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>Create</PrecompiledHeader>
|
||||
@@ -777,9 +778,6 @@ if not exist "$(OutDir)fonts" xcopy "$(SolutionDir)fonts\*.*" "$(OutDir)fonts\"
|
||||
<ProjectReference Include="..\..\libs\win32\freetype\freetype.2017.vcxproj">
|
||||
<Project>{78b079bd-9fc7-4b9e-b4a6-96da0f00248b}</Project>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\libs\win32\libpng\libpng.2017.vcxproj">
|
||||
<Project>{d6973076-9317-4ef2-a0b8-b7a18ac0713e}</Project>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\libs\win32\libvpx\libvpx.2017.vcxproj">
|
||||
<Project>{dce19daf-69ac-46db-b14a-39f0faa5db74}</Project>
|
||||
</ProjectReference>
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ImportGroup Label="PropertySheets" />
|
||||
<PropertyGroup Label="UserMacros">
|
||||
<curlVersion>7.88.0</curlVersion>
|
||||
<curlBuildNumber>2</curlBuildNumber>
|
||||
<curlVersion>7.88.1</curlVersion>
|
||||
<curlBuildNumber>1</curlBuildNumber>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<curlVersionImported>true</curlVersionImported>
|
||||
|
||||
+3
-3
@@ -16,7 +16,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Label="UserMacros">
|
||||
<curlLibDir>$(SolutionDir)libs\curl-$(curlVersion)</curlLibDir>
|
||||
<curlLibDir>$(SolutionDir)libs\curl-$(curlVersion)_$(curlBuildNumber)</curlLibDir>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
<Target Name="curlBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
||||
<DownloadPackageTask
|
||||
package="https://files.freeswitch.org/windows/packages/curl/$(curlVersion)_$(curlBuildNumber)/curl-$(curlVersion)_$(curlBuildNumber)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
|
||||
package="https://github.com/freeswitch/windows-deps/releases/download/curl-v$(curlVersion)_$(curlBuildNumber)/curl-$(curlVersion)_$(curlBuildNumber)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
|
||||
expectfileordirectory="$(curlLibDir)\binaries\$(Platform)\$(LibraryConfiguration)\curl.lib"
|
||||
outputfolder=""
|
||||
outputfilename=""
|
||||
@@ -50,7 +50,7 @@
|
||||
</Target>
|
||||
<Target Name="curlHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
||||
<DownloadPackageTask
|
||||
package="https://files.freeswitch.org/windows/packages/curl/$(curlVersion)_$(curlBuildNumber)/curl-$(curlVersion)_$(curlBuildNumber)-headers.zip"
|
||||
package="https://github.com/freeswitch/windows-deps/releases/download/curl-v$(curlVersion)_$(curlBuildNumber)/curl-$(curlVersion)_$(curlBuildNumber)-headers.zip"
|
||||
expectfileordirectory="$(curlLibDir)\include\curl\curl.h"
|
||||
outputfolder=""
|
||||
outputfilename=""
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ImportGroup Label="PropertySheets">
|
||||
<Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />
|
||||
<Import Project="ffmpeg-version.props" Condition=" '$(ffmpegVersionImported)' == '' " />
|
||||
</ImportGroup>
|
||||
<PropertyGroup>
|
||||
<downloadFfmpegPropsImported>true</downloadFfmpegPropsImported>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
Download Target.
|
||||
Name must be unique.
|
||||
By design, targets are executed only once per project.
|
||||
|
||||
Usage:
|
||||
|
||||
package: URI
|
||||
|
||||
expectfileordirectory: Skips the download and extraction if exists
|
||||
|
||||
outputfolder: Folder to store a downloaded file.
|
||||
By default "$(BaseDir)libs", if empty
|
||||
|
||||
outputfilename: If not empty, overrides filename from URI.
|
||||
.exe files don't get extracted
|
||||
|
||||
extractto: Folder to extract an archive to
|
||||
-->
|
||||
|
||||
<Target Name="ffmpegDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
||||
<DownloadPackageTask
|
||||
package="http://files.freeswitch.org/downloads/libs/ffmpeg-$(ffmpegVersion).tar.bz2"
|
||||
expectfileordirectory="$(BaseDir)libs\ffmpeg-$(ffmpegVersion)\configure"
|
||||
outputfolder=""
|
||||
outputfilename=""
|
||||
extractto="$(BaseDir)libs\"
|
||||
/>
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
@@ -1,40 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ImportGroup Label="PropertySheets">
|
||||
<Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />
|
||||
</ImportGroup>
|
||||
<PropertyGroup>
|
||||
<downloadlibpngPropsImported>true</downloadlibpngPropsImported>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
Download Target.
|
||||
Name must be unique.
|
||||
By design, targets are executed only once per project.
|
||||
|
||||
Usage:
|
||||
|
||||
package: URI
|
||||
|
||||
expectfileordirectory: Skips the download and extraction if exists
|
||||
|
||||
outputfolder: Folder to store a downloaded file.
|
||||
By default "$(BaseDir)libs", if empty
|
||||
|
||||
outputfilename: If not empty, overrides filename from URI.
|
||||
.exe files don't get extracted
|
||||
|
||||
extractto: Folder to extract an archive to
|
||||
-->
|
||||
|
||||
<Target Name="libpngDownloadTarget" BeforeTargets="CustomBuild;PreBuildEvent;" DependsOnTargets="7za">
|
||||
<DownloadPackageTask
|
||||
package="http://files.freeswitch.org/downloads/libs/libpng.tar.bz2"
|
||||
expectfileordirectory="$(BaseDir)libs\libpng\png.h"
|
||||
outputfolder=""
|
||||
outputfilename=""
|
||||
extractto="$(BaseDir)libs\"
|
||||
/>
|
||||
</Target>
|
||||
|
||||
</Project>
|
||||
@@ -5,7 +5,7 @@
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros">
|
||||
<libksVersion>2.0.11</libksVersion>
|
||||
<libksBuildNumber>0</libksBuildNumber>
|
||||
<libksBuildNumber>1</libksBuildNumber>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<libksVersionImported>true</libksVersionImported>
|
||||
|
||||
+3
-3
@@ -10,7 +10,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Label="UserMacros">
|
||||
<libksDir>$(BaseDir)libs\libks-$(libksVersion)</libksDir>
|
||||
<libksDir>$(BaseDir)libs\libks-$(libksVersion)_$(libksBuildNumber)</libksDir>
|
||||
</PropertyGroup>
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
|
||||
<Target Name="libksBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
||||
<DownloadPackageTask
|
||||
package="https://files.freeswitch.org/windows/packages/libks/$(libksVersion)_$(libksBuildNumber)/libks-$(libksVersion)_$(libksBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
|
||||
package="https://github.com/freeswitch/windows-deps/releases/download/libks-v$(libksVersion)_$(libksBuildNumber)/libks-$(libksVersion)_$(libksBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
|
||||
expectfileordirectory="$(libksDir)\binaries\$(Platform)\$(Configuration)\ks2.dll"
|
||||
outputfolder=""
|
||||
outputfilename=""
|
||||
@@ -45,7 +45,7 @@
|
||||
</Target>
|
||||
<Target Name="libksHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
||||
<DownloadPackageTask
|
||||
package="https://files.freeswitch.org/windows/packages/libks/$(libksVersion)_$(libksBuildNumber)/libks-$(libksVersion)_$(libksBuildNumber)-headers.zip"
|
||||
package="https://github.com/freeswitch/windows-deps/releases/download/libks-v$(libksVersion)_$(libksBuildNumber)/libks-$(libksVersion)_$(libksBuildNumber)-headers.zip"
|
||||
expectfileordirectory="$(libksDir)\libks\src\include\libks\ks.h"
|
||||
outputfolder=""
|
||||
outputfilename=""
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ImportGroup Label="PropertySheets">
|
||||
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros">
|
||||
<!-- Release tag in freeswitch/windows-deps: libpng-v$(libpngVersion)_$(libpngBuildNumber) -->
|
||||
<libpngVersion>1.6.58</libpngVersion>
|
||||
<libpngBuildNumber>1</libpngBuildNumber>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<libpngVersionImported>true</libpngVersionImported>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup />
|
||||
<ItemDefinitionGroup />
|
||||
<ItemGroup>
|
||||
<BuildMacro Include="libpngVersion">
|
||||
<Value>$(libpngVersion)</Value>
|
||||
</BuildMacro>
|
||||
<BuildMacro Include="libpngBuildNumber">
|
||||
<Value>$(libpngBuildNumber)</Value>
|
||||
</BuildMacro>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
+95
-2
@@ -1,9 +1,102 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<!--
|
||||
Precompiled libpng from freeswitch/windows-deps. Replaces the in-tree build
|
||||
(libs\win32\libpng\libpng.2017.vcxproj + w32\download_libpng.props, both
|
||||
removed): the projects that used to reference that project (FreeSwitchCore,
|
||||
mod_png) import this property sheet instead.
|
||||
-->
|
||||
<PropertyGroup>
|
||||
<libpngImported>true</libpngImported>
|
||||
</PropertyGroup>
|
||||
<ImportGroup Label="PropertySheets">
|
||||
<Import Project="libpng-version.props" Condition=" '$(libpngVersionImported)' == '' "/>
|
||||
<Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />
|
||||
<!-- libpng16.dll needs zlib.dll (zlibd.dll in Debug) at run time; zlib.props
|
||||
downloads the matching zlib package and copies that DLL to the output dir. -->
|
||||
<Import Project="zlib.props" Condition=" '$(zlibImported)' == '' "/>
|
||||
</ImportGroup>
|
||||
|
||||
<!-- The packages ship only Release and Debug; map any project configuration onto
|
||||
one of them. Debug binaries carry the "d" postfix. -->
|
||||
<PropertyGroup>
|
||||
<LibraryConfiguration Condition="$(Configuration.ToLower().Contains('debug'))">Debug</LibraryConfiguration>
|
||||
<LibraryConfiguration Condition="$(Configuration.ToLower().Contains('release'))">Release</LibraryConfiguration>
|
||||
<libpngLibraryFileName Condition=" '$(LibraryConfiguration)' == 'Debug' ">libpng16d</libpngLibraryFileName>
|
||||
<libpngLibraryFileName Condition=" '$(LibraryConfiguration)' == 'Release' ">libpng16</libpngLibraryFileName>
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Label="UserMacros">
|
||||
<!-- Package name = zip prefix = folder inside the zips. It includes the build
|
||||
number, so a rebuilt package lands in a NEW folder and gets picked up. -->
|
||||
<libpngPkg>libpng-$(libpngVersion)_$(libpngBuildNumber)</libpngPkg>
|
||||
<libpngLibDir>$(BaseDir)libs\$(libpngPkg)</libpngLibDir>
|
||||
<libpngBinDir>$(libpngLibDir)\binaries\$(Platform)\$(LibraryConfiguration)</libpngBinDir>
|
||||
<!-- GitHub Release assets of freeswitch/windows-deps (tag libpng-v<version>_<build>). -->
|
||||
<libpngPkgBase>https://github.com/freeswitch/windows-deps/releases/download/libpng-v$(libpngVersion)_$(libpngBuildNumber)</libpngPkgBase>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
Download Target.
|
||||
Name must be unique.
|
||||
By design, targets are executed only once per project.
|
||||
|
||||
Usage:
|
||||
|
||||
package: URI
|
||||
|
||||
expectfileordirectory: Skips the download and extraction if exists
|
||||
|
||||
outputfolder: Folder to store a downloaded file.
|
||||
By default "$(BaseDir)libs", if empty
|
||||
|
||||
outputfilename: If not empty, overrides filename from URI.
|
||||
.exe files don't get extracted
|
||||
|
||||
extractto: Folder to extract an archive to
|
||||
-->
|
||||
|
||||
<Target Name="libpngBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
||||
<DownloadPackageTask
|
||||
package="$(libpngPkgBase)/$(libpngPkg)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
|
||||
expectfileordirectory="$(libpngBinDir)\lib\$(libpngLibraryFileName).lib"
|
||||
outputfolder=""
|
||||
outputfilename=""
|
||||
extractto="$(BaseDir)libs\"
|
||||
/>
|
||||
</Target>
|
||||
<Target Name="libpngHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
||||
<DownloadPackageTask
|
||||
package="$(libpngPkgBase)/$(libpngPkg)-headers.zip"
|
||||
expectfileordirectory="$(libpngLibDir)\include\png.h"
|
||||
outputfolder=""
|
||||
outputfilename=""
|
||||
extractto="$(BaseDir)libs\"
|
||||
/>
|
||||
</Target>
|
||||
|
||||
<!-- Copy libpng16.dll / libpng16d.dll next to the FreeSWITCH binary. -->
|
||||
<Target Name="libpngcopyTarget" BeforeTargets="CustomBuild" DependsOnTargets="libpngBinariesDownloadTarget">
|
||||
<ItemGroup>
|
||||
<libpngFiles Include="$(libpngBinDir)\bin\*.dll" />
|
||||
</ItemGroup>
|
||||
<Copy SkipUnchangedFiles="true"
|
||||
SourceFiles="@(libpngFiles)"
|
||||
DestinationFiles="@(libpngFiles->'$(BaseDir)$(Platform)\$(LibraryConfiguration)\%(Filename)%(Extension)')"
|
||||
/>
|
||||
</Target>
|
||||
|
||||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>$(SolutionDir)libs\libpng\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<!-- png.h, pngconf.h, pnglibconf.h -->
|
||||
<AdditionalIncludeDirectories>$(libpngLibDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>HAVE_LIBPNG;LIBPNG_DYNAMICLIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<!-- Import library of libpng16.dll / libpng16d.dll. A static link would use
|
||||
libpng16_static.lib / libpng16_staticd.lib and zlib's static library. -->
|
||||
<AdditionalLibraryDirectories>$(libpngBinDir)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalDependencies>$(libpngLibraryFileName).lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
</Project>
|
||||
@@ -4,8 +4,8 @@
|
||||
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros">
|
||||
<libpqVersion>10.23</libpqVersion>
|
||||
<libpqBuildNumber>2</libpqBuildNumber>
|
||||
<libpqVersion>17.11</libpqVersion>
|
||||
<libpqBuildNumber>1</libpqBuildNumber>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<libpqVersionImported>true</libpqVersionImported>
|
||||
|
||||
+3
-3
@@ -10,7 +10,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Label="UserMacros">
|
||||
<libpqlibDir>$(BaseDir)libs\libpq-$(libpqVersion)</libpqlibDir>
|
||||
<libpqlibDir>$(BaseDir)libs\libpq-$(libpqVersion)_$(libpqBuildNumber)</libpqlibDir>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
<Target Name="libpqBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
||||
<DownloadPackageTask
|
||||
package="https://files.freeswitch.org/windows/packages/libpq/$(libpqVersion)_$(libpqBuildNumber)/libpq-$(libpqVersion)_$(libpqBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
|
||||
package="https://github.com/freeswitch/windows-deps/releases/download/libpq-v$(libpqVersion)_$(libpqBuildNumber)/libpq-$(libpqVersion)_$(libpqBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
|
||||
expectfileordirectory="$(libpqlibDir)\binaries\$(Platform)\$(Configuration)\libpq.dll"
|
||||
outputfolder=""
|
||||
outputfilename=""
|
||||
@@ -44,7 +44,7 @@
|
||||
</Target>
|
||||
<Target Name="libpqHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
||||
<DownloadPackageTask
|
||||
package="https://files.freeswitch.org/windows/packages/libpq/$(libpqVersion)_$(libpqBuildNumber)/libpq-$(libpqVersion)_$(libpqBuildNumber)-headers.zip"
|
||||
package="https://github.com/freeswitch/windows-deps/releases/download/libpq-v$(libpqVersion)_$(libpqBuildNumber)/libpq-$(libpqVersion)_$(libpqBuildNumber)-headers.zip"
|
||||
expectfileordirectory="$(libpqlibDir)\include\libpq-fe.h"
|
||||
outputfolder=""
|
||||
outputfilename=""
|
||||
|
||||
@@ -4,8 +4,9 @@
|
||||
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros">
|
||||
<OpenSSLVersion>3.4.3</OpenSSLVersion>
|
||||
<OpenSSLLibDir>$(BaseDir)libs\openssl-$(OpenSSLVersion)</OpenSSLLibDir>
|
||||
<OpenSSLVersion>3.4.7</OpenSSLVersion>
|
||||
<OpenSSLBuildNumber>1</OpenSSLBuildNumber>
|
||||
<OpenSSLLibDir>$(BaseDir)libs\openssl-$(OpenSSLVersion)_$(OpenSSLBuildNumber)</OpenSSLLibDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<OpenSSLVersionImported>true</OpenSSLVersionImported>
|
||||
|
||||
+2
-2
@@ -35,7 +35,7 @@
|
||||
|
||||
<Target Name="opensslbinariesTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
||||
<DownloadPackageTask
|
||||
package="https://files.freeswitch.org/windows/packages/openssl/$(OpenSSLVersion)/openssl-$(OpenSSLVersion)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
|
||||
package="https://github.com/freeswitch/windows-deps/releases/download/openssl-v$(OpenSSLVersion)_$(OpenSSLBuildNumber)/openssl-$(OpenSSLVersion)_$(OpenSSLBuildNumber)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
|
||||
expectfileordirectory="$(OpenSSLLibDir)\binaries\$(Platform)\$(LibraryConfiguration)\openssl.exe"
|
||||
outputfolder=""
|
||||
outputfilename=""
|
||||
@@ -45,7 +45,7 @@
|
||||
|
||||
<Target Name="opensslheadersTarget" BeforeTargets="CustomBuild" DependsOnTargets="opensslbinariesTarget">
|
||||
<DownloadPackageTask
|
||||
package="https://files.freeswitch.org/windows/packages/openssl/$(OpenSSLVersion)/openssl-$(OpenSSLVersion)-headers.zip"
|
||||
package="https://github.com/freeswitch/windows-deps/releases/download/openssl-v$(OpenSSLVersion)_$(OpenSSLBuildNumber)/openssl-$(OpenSSLVersion)_$(OpenSSLBuildNumber)-headers.zip"
|
||||
expectfileordirectory="$(OpenSSLLibDir)\include\openssl\ssl.h"
|
||||
outputfolder=""
|
||||
outputfilename=""
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros">
|
||||
<rabbitmq_cMajorVersion>0</rabbitmq_cMajorVersion>
|
||||
<rabbitmq_cMinorVersion>15</rabbitmq_cMinorVersion>
|
||||
<rabbitmq_cMinorVersion>17</rabbitmq_cMinorVersion>
|
||||
<rabbitmq_cRevisionVersion>0</rabbitmq_cRevisionVersion>
|
||||
<rabbitmq_cVersion>0.15.0</rabbitmq_cVersion>
|
||||
<rabbitmq_cVersion>$(rabbitmq_cMajorVersion).$(rabbitmq_cMinorVersion).$(rabbitmq_cRevisionVersion)</rabbitmq_cVersion>
|
||||
<rabbitmq_cBuildNumber>1</rabbitmq_cBuildNumber>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
|
||||
@@ -3,10 +3,13 @@
|
||||
<ImportGroup Label="PropertySheets">
|
||||
<Import Project="rabbitmq-c-version.props" Condition=" '$(rabbitmq_cVersionImported)' == '' "/>
|
||||
<Import Project="downloadpackage.task" Condition=" '$(downloadpackagetask_Imported)' == '' " />
|
||||
<!-- librabbitmq.4.lib is a STATIC library built with SSL support: it references
|
||||
OpenSSL, so the consumer links the OpenSSL package too. -->
|
||||
<Import Project="openssl.props" Condition=" '$(OpensslPropsImported)' == '' "/>
|
||||
</ImportGroup>
|
||||
|
||||
<PropertyGroup Label="UserMacros">
|
||||
<rabbitmq_c_libDir>$(BaseDir)libs\rabbitmq-c-$(rabbitmq_cVersion)</rabbitmq_c_libDir>
|
||||
<rabbitmq_c_libDir>$(BaseDir)libs\rabbitmq-c-$(rabbitmq_cVersion)_$(rabbitmq_cBuildNumber)</rabbitmq_c_libDir>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
@@ -31,7 +34,7 @@
|
||||
|
||||
<Target Name="rabbitmq-c-binariesTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
||||
<DownloadPackageTask
|
||||
package="https://files.freeswitch.org/windows/packages/rabbitmq-c/$(rabbitmq_cVersion)_$(rabbitmq_cBuildNumber)/rabbitmq-c-$(rabbitmq_cVersion)_$(rabbitmq_cBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
|
||||
package="https://github.com/freeswitch/windows-deps/releases/download/rabbitmq-c-v$(rabbitmq_cVersion)_$(rabbitmq_cBuildNumber)/rabbitmq-c-$(rabbitmq_cVersion)_$(rabbitmq_cBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
|
||||
expectfileordirectory="$(rabbitmq_c_libDir)\binaries\$(Platform.ToLower())\$(Configuration.ToLower())\librabbitmq.4.lib"
|
||||
outputfolder=""
|
||||
outputfilename=""
|
||||
@@ -41,7 +44,7 @@
|
||||
|
||||
<Target Name="rabbitmq-c-headersTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
||||
<DownloadPackageTask
|
||||
package="https://files.freeswitch.org/windows/packages/rabbitmq-c/$(rabbitmq_cVersion)_$(rabbitmq_cBuildNumber)/rabbitmq-c-$(rabbitmq_cVersion)_$(rabbitmq_cBuildNumber)-headers.zip"
|
||||
package="https://github.com/freeswitch/windows-deps/releases/download/rabbitmq-c-v$(rabbitmq_cVersion)_$(rabbitmq_cBuildNumber)/rabbitmq-c-$(rabbitmq_cVersion)_$(rabbitmq_cBuildNumber)-headers.zip"
|
||||
expectfileordirectory="$(rabbitmq_c_libDir)\include\amqp.h"
|
||||
outputfolder=""
|
||||
outputfilename=""
|
||||
@@ -52,7 +55,7 @@
|
||||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>$(rabbitmq_c_libDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>AMQP_MAJOR_VERSION=$(rabbitmq_cMajorVersion);AMQP_MINOR_VERSION=$(rabbitmq_cMinorVersion);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>AMQP_STATIC;AMQP_MAJOR_VERSION=$(rabbitmq_cMajorVersion);AMQP_MINOR_VERSION=$(rabbitmq_cMinorVersion);%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalLibraryDirectories>$(rabbitmq_c_libDir)\binaries\$(Platform)\$(Configuration)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros">
|
||||
<signalwire-client-cVersion>2.0.1</signalwire-client-cVersion>
|
||||
<signalwire-client-cVersion>2.0.5</signalwire-client-cVersion>
|
||||
<signalwire-client-cBuildNumber>2</signalwire-client-cBuildNumber>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Label="UserMacros">
|
||||
<signalwire-client-cDir>$(BaseDir)libs\signalwire-client-c-$(signalwire-client-cVersion)</signalwire-client-cDir>
|
||||
<signalwire-client-cDir>$(BaseDir)libs\signalwire-client-c-$(signalwire-client-cVersion)_$(signalwire-client-cBuildNumber)</signalwire-client-cDir>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
<Target Name="signalwire-client-cBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
||||
<DownloadPackageTask
|
||||
package="https://files.freeswitch.org/windows/packages/signalwire-client-c/$(signalwire-client-cVersion)_$(signalwire-client-cBuildNumber)/signalwire-client-c-$(signalwire-client-cVersion)_$(signalwire-client-cBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
|
||||
package="https://github.com/freeswitch/windows-deps/releases/download/signalwire-client-c-v$(signalwire-client-cVersion)_$(signalwire-client-cBuildNumber)/signalwire-client-c-$(signalwire-client-cVersion)_$(signalwire-client-cBuildNumber)-binaries-$(Platform.ToLower())-$(Configuration.ToLower()).zip"
|
||||
expectfileordirectory="$(signalwire-client-cDir)\binaries\$(Platform)\$(Configuration)\signalwire_client2.dll"
|
||||
outputfolder=""
|
||||
outputfilename=""
|
||||
@@ -43,7 +43,7 @@
|
||||
</Target>
|
||||
<Target Name="signalwire-client-cHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
||||
<DownloadPackageTask
|
||||
package="https://files.freeswitch.org/windows/packages/signalwire-client-c/$(signalwire-client-cVersion)_$(signalwire-client-cBuildNumber)/signalwire-client-c-$(signalwire-client-cVersion)_$(signalwire-client-cBuildNumber)-headers.zip"
|
||||
package="https://github.com/freeswitch/windows-deps/releases/download/signalwire-client-c-v$(signalwire-client-cVersion)_$(signalwire-client-cBuildNumber)/signalwire-client-c-$(signalwire-client-cVersion)_$(signalwire-client-cBuildNumber)-headers.zip"
|
||||
expectfileordirectory="$(signalwire-client-cDir)\include\signalwire-client-c\client.h"
|
||||
outputfolder=""
|
||||
outputfilename=""
|
||||
|
||||
@@ -4,7 +4,8 @@
|
||||
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
|
||||
</ImportGroup>
|
||||
<PropertyGroup Label="UserMacros">
|
||||
<zlibVersion>1.2.11</zlibVersion>
|
||||
<zlibVersion>1.3.2</zlibVersion>
|
||||
<zlibBuildNumber>1</zlibBuildNumber>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<zlibVersionImported>true</zlibVersionImported>
|
||||
|
||||
+5
-5
@@ -16,7 +16,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<PropertyGroup Label="UserMacros">
|
||||
<zlibLibDir>$(BaseDir)libs\zlib-$(zlibVersion)</zlibLibDir>
|
||||
<zlibLibDir>$(BaseDir)libs\zlib-$(zlibVersion)_$(zlibBuildNumber)</zlibLibDir>
|
||||
</PropertyGroup>
|
||||
|
||||
<!--
|
||||
@@ -41,7 +41,7 @@
|
||||
|
||||
<Target Name="zlibBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
||||
<DownloadPackageTask
|
||||
package="http://files.freeswitch.org/windows/packages/zlib/$(zlibVersion)/zlib-$(zlibVersion)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
|
||||
package="https://github.com/freeswitch/windows-deps/releases/download/zlib-v$(zlibVersion)_$(zlibBuildNumber)/zlib-$(zlibVersion)_$(zlibBuildNumber)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
|
||||
expectfileordirectory="$(zlibLibDir)\binaries\$(Platform)\$(LibraryConfiguration)\lib\$(LibraryFileName).lib"
|
||||
outputfolder=""
|
||||
outputfilename=""
|
||||
@@ -50,7 +50,7 @@
|
||||
</Target>
|
||||
<Target Name="zlibHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
|
||||
<DownloadPackageTask
|
||||
package="http://files.freeswitch.org/windows/packages/zlib/$(zlibVersion)/zlib-$(zlibVersion)-headers.zip"
|
||||
package="https://github.com/freeswitch/windows-deps/releases/download/zlib-v$(zlibVersion)_$(zlibBuildNumber)/zlib-$(zlibVersion)_$(zlibBuildNumber)-headers.zip"
|
||||
expectfileordirectory="$(zlibLibDir)\include\zlib.h"
|
||||
outputfolder=""
|
||||
outputfilename=""
|
||||
@@ -70,11 +70,11 @@
|
||||
|
||||
<ItemDefinitionGroup>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>$(SolutionDir)libs\zlib-$(zlibVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<AdditionalIncludeDirectories>$(zlibLibDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>HAVE_ZLIB;ZLIB_STATICLIB;Z_SOLO;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<AdditionalLibraryDirectories>$(SolutionDir)libs\zlib-$(zlibVersion)\binaries\$(Platform)\$(LibraryConfiguration)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>$(zlibLibDir)\binaries\$(Platform)\$(LibraryConfiguration)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalDependencies>$(LibraryFileName).lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
</ItemDefinitionGroup>
|
||||
|
||||
Reference in New Issue
Block a user