ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-10-03 17:53:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Build-System] Windows: Upgrade opencv to v4.10.0_1, pcre (PCRE2) to v10.48_1 (#3172)

Browse Source
This commit is contained in:
Andrey Volk
2026-09-16 14:26:56 +03:00
committed by GitHub
parent 21f6fe8b13
commit 241a408d42
5 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+4
View File
@@ -272,6 +272,10 @@ libs/mariadb-connector-c-*/
libs/mariadb-connector-c-*.zip
libs/flite-*/
libs/flite-*.zip
libs/pcre-*/
libs/pcre-*.zip
libs/opencv-*/
libs/opencv-*.zip
libs/lua-*.zip
libs/SharpZipLib.*/
libs/SharpZipLib.*.nupkg
w32/opencv-version.props
+2 -1
View File
@@ -4,7 +4,8 @@
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
</ImportGroup>
<PropertyGroup Label="UserMacros">
<opencvVersion>3.4.1</opencvVersion>
<opencvVersion>4.10.0</opencvVersion>
<opencvBuildNumber>1</opencvBuildNumber>
</PropertyGroup>
<PropertyGroup>
<opencvVersionImported>true</opencvVersionImported>
w32/opencv.props
+8 -8
View File
@@ -11,12 +11,12 @@
<PropertyGroup>
<LibraryConfiguration Condition="$(Configuration.ToLower().Contains('debug'))">Debug</LibraryConfiguration>
<LibraryConfiguration Condition="$(Configuration.ToLower().Contains('release'))">Release</LibraryConfiguration>
<OpenCVLibraryFileName Condition=" '$(LibraryConfiguration)' == 'Debug' ">opencv_world341d</OpenCVLibraryFileName>
<OpenCVLibraryFileName Condition=" '$(LibraryConfiguration)' == 'Release' ">opencv_world341</OpenCVLibraryFileName>
<OpenCVLibraryFileName Condition=" '$(LibraryConfiguration)' == 'Debug' ">opencv_world4100d</OpenCVLibraryFileName>
<OpenCVLibraryFileName Condition=" '$(LibraryConfiguration)' == 'Release' ">opencv_world4100</OpenCVLibraryFileName>
</PropertyGroup>
<PropertyGroup Label="UserMacros">
<opencvLibDir>$(BaseDir)libs\opencv-$(opencvVersion)</opencvLibDir>
<opencvLibDir>$(BaseDir)libs\opencv-$(opencvVersion)_$(opencvBuildNumber)</opencvLibDir>
</PropertyGroup>
<!--
@@ -41,7 +41,7 @@
<Target Name="opencvBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
<DownloadPackageTask
package="http://files.freeswitch.org/windows/packages/opencv/$(opencvVersion)/opencv-$(opencvVersion)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
package="https://github.com/freeswitch/windows-deps/releases/download/opencv-v$(opencvVersion)_$(opencvBuildNumber)/opencv-$(opencvVersion)_$(opencvBuildNumber)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
expectfileordirectory="$(opencvLibDir)\binaries\$(Platform)\$(LibraryConfiguration)\lib\$(OpenCVLibraryFileName).lib"
outputfolder=""
outputfilename=""
@@ -50,8 +50,8 @@
</Target>
<Target Name="opencvHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
<DownloadPackageTask
package="http://files.freeswitch.org/windows/packages/opencv/$(opencvVersion)/opencv-$(opencvVersion)-headers.zip"
expectfileordirectory="$(opencvLibDir)\include\opencv\cv.h"
package="https://github.com/freeswitch/windows-deps/releases/download/opencv-v$(opencvVersion)_$(opencvBuildNumber)/opencv-$(opencvVersion)_$(opencvBuildNumber)-headers.zip"
expectfileordirectory="$(opencvLibDir)\include\opencv2\opencv.hpp"
outputfolder=""
outputfilename=""
extractto="$(BaseDir)libs\"
@@ -70,10 +70,10 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(opencvLibDir)\include\;$(opencvLibDir)\include\opencv\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(opencvLibDir)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(SolutionDir)libs\opencv-$(opencvVersion)\binaries\$(Platform)\$(LibraryConfiguration)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)libs\opencv-$(opencvVersion)_$(opencvBuildNumber)\binaries\$(Platform)\$(LibraryConfiguration)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>$(OpenCVLibraryFileName).lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
w32/pcre-version.props
+2 -1
View File
@@ -4,7 +4,8 @@
<Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
</ImportGroup>
<PropertyGroup Label="UserMacros">
<pcreVersion>10.45</pcreVersion>
<pcreVersion>10.48</pcreVersion>
<pcreBuildNumber>1</pcreBuildNumber>
</PropertyGroup>
<PropertyGroup>
<pcreVersionImported>true</pcreVersionImported>
w32/pcre.props
+5 -5
View File
@@ -17,7 +17,7 @@
</PropertyGroup>
<PropertyGroup Label="UserMacros">
<pcreLibDir>$(BaseDir)libs\pcre-$(pcreVersion)</pcreLibDir>
<pcreLibDir>$(BaseDir)libs\pcre-$(pcreVersion)_$(pcreBuildNumber)</pcreLibDir>
</PropertyGroup>
<!--
@@ -42,7 +42,7 @@
<Target Name="pcreBinariesDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
<DownloadPackageTask
package="http://files.freeswitch.org/windows/packages/pcre/$(pcreVersion)/pcre-$(pcreVersion)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
package="https://github.com/freeswitch/windows-deps/releases/download/pcre-v$(pcreVersion)_$(pcreBuildNumber)/pcre-$(pcreVersion)_$(pcreBuildNumber)-binaries-$(Platform.ToLower())-$(LibraryConfiguration.ToLower()).zip"
expectfileordirectory="$(pcreLibDir)\binaries\$(Platform)\$(LibraryConfiguration)\lib\$(PCRELibraryFileName).lib"
outputfolder=""
outputfilename=""
@@ -51,7 +51,7 @@
</Target>
<Target Name="pcreHeadersDownloadTarget" BeforeTargets="CustomBuild" DependsOnTargets="7za">
<DownloadPackageTask
package="http://files.freeswitch.org/windows/packages/pcre/$(pcreVersion)/pcre-$(pcreVersion)-headers.zip"
package="https://github.com/freeswitch/windows-deps/releases/download/pcre-v$(pcreVersion)_$(pcreBuildNumber)/pcre-$(pcreVersion)_$(pcreBuildNumber)-headers.zip"
expectfileordirectory="$(pcreLibDir)\include\pcre2.h"
outputfolder=""
outputfilename=""
@@ -71,11 +71,11 @@
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(BaseDir)libs\pcre-$(pcreVersion)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(BaseDir)libs\pcre-$(pcreVersion)_$(pcreBuildNumber)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
<AdditionalLibraryDirectories>$(SolutionDir)libs\pcre-$(pcreVersion)\binaries\$(Platform)\$(LibraryConfiguration)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)libs\pcre-$(pcreVersion)_$(pcreBuildNumber)\binaries\$(Platform)\$(LibraryConfiguration)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>$(PCRELibraryFileName).lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>