@@ -1093,16 +1093,16 @@ function Build-ZLib([Platform]$Platform, $Arch) {
1093
1093
1094
1094
Build-CMakeProject `
1095
1095
- 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 `
1098
1098
- Arch $Arch `
1099
1099
- Platform $Platform `
1100
1100
- BuildTargets default `
1101
1101
- Defines @ {
1102
1102
BUILD_SHARED_LIBS = " NO" ;
1103
1103
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 " ;
1106
1106
}
1107
1107
}
1108
1108
@@ -1228,8 +1228,8 @@ function Build-CURL([Platform]$Platform, $Arch) {
1228
1228
USE_WIN32_IDN = if ($Platform -eq " Windows" ) { " YES" } else { " NO" };
1229
1229
USE_WIN32_LARGE_FILES = if ($Platform -eq " Windows" ) { " YES" } else { " NO" };
1230
1230
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" ;
1233
1233
})
1234
1234
}
1235
1235
@@ -1365,8 +1365,8 @@ function Build-Foundation([Platform]$Platform, $Arch, [switch]$Test = $false) {
1365
1365
LIBXML2_LIBRARY = " $LibraryRoot \libxml2-2.11.5\usr\lib\$Platform \$ShortArch \libxml2s.lib" ;
1366
1366
LIBXML2_INCLUDE_DIR = " $LibraryRoot \libxml2-2.11.5\usr\include\libxml2" ;
1367
1367
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" ;
1370
1370
dispatch_DIR = " $DispatchBinaryCache \cmake\modules" ;
1371
1371
} + $TestingDefines )
1372
1372
}
0 commit comments