@@ -1093,16 +1093,16 @@ function Build-ZLib([Platform]$Platform, $Arch) {
10931093
10941094 Build-CMakeProject `
10951095 - Src $SourceCache \zlib `
1096- - Bin " $ ( $Arch.BinaryCache ) \$Platform \zlib-1.3" `
1097- - InstallTo $LibraryRoot \zlib- 1.3 \usr `
1096+ - Bin " $ ( $Arch.BinaryCache ) \$Platform \zlib-1.3.1 " `
1097+ - InstallTo $LibraryRoot \zlib- 1.3 . 1 \usr `
10981098 - Arch $Arch `
10991099 - Platform $Platform `
11001100 - BuildTargets default `
11011101 - Defines @ {
11021102 BUILD_SHARED_LIBS = " NO" ;
11031103 CMAKE_SYSTEM_NAME = if ($Platform -eq " Windows" ) { " Windows" } else { " Android" };
1104- INSTALL_BIN_DIR = " $LibraryRoot \zlib-1.3\usr\bin\$Platform \$ArchName " ;
1105- INSTALL_LIB_DIR = " $LibraryRoot \zlib-1.3\usr\lib\$Platform \$ArchName " ;
1104+ INSTALL_BIN_DIR = " $LibraryRoot \zlib-1.3.1 \usr\bin\$Platform \$ArchName " ;
1105+ INSTALL_LIB_DIR = " $LibraryRoot \zlib-1.3.1 \usr\lib\$Platform \$ArchName " ;
11061106 }
11071107}
11081108
@@ -1228,8 +1228,8 @@ function Build-CURL([Platform]$Platform, $Arch) {
12281228 USE_WIN32_IDN = if ($Platform -eq " Windows" ) { " YES" } else { " NO" };
12291229 USE_WIN32_LARGE_FILES = if ($Platform -eq " Windows" ) { " YES" } else { " NO" };
12301230 USE_WIN32_LDAP = " NO" ;
1231- ZLIB_ROOT = " $LibraryRoot \zlib-1.3\usr" ;
1232- ZLIB_LIBRARY = " $LibraryRoot \zlib-1.3\usr\lib\$Platform \$ArchName \zlibstatic.lib" ;
1231+ ZLIB_ROOT = " $LibraryRoot \zlib-1.3.1 \usr" ;
1232+ ZLIB_LIBRARY = " $LibraryRoot \zlib-1.3.1 \usr\lib\$Platform \$ArchName \zlibstatic.lib" ;
12331233 })
12341234}
12351235
@@ -1365,8 +1365,8 @@ function Build-Foundation([Platform]$Platform, $Arch, [switch]$Test = $false) {
13651365 LIBXML2_LIBRARY = " $LibraryRoot \libxml2-2.11.5\usr\lib\$Platform \$ShortArch \libxml2s.lib" ;
13661366 LIBXML2_INCLUDE_DIR = " $LibraryRoot \libxml2-2.11.5\usr\include\libxml2" ;
13671367 LIBXML2_DEFINITIONS = " /DLIBXML_STATIC" ;
1368- ZLIB_LIBRARY = " $LibraryRoot \zlib-1.3\usr\lib\$Platform \$ShortArch \zlibstatic.lib" ;
1369- ZLIB_INCLUDE_DIR = " $LibraryRoot \zlib-1.3\usr\include" ;
1368+ ZLIB_LIBRARY = " $LibraryRoot \zlib-1.3.1 \usr\lib\$Platform \$ShortArch \zlibstatic.lib" ;
1369+ ZLIB_INCLUDE_DIR = " $LibraryRoot \zlib-1.3.1 \usr\include" ;
13701370 dispatch_DIR = " $DispatchBinaryCache \cmake\modules" ;
13711371 } + $TestingDefines )
13721372 }
0 commit comments