Skip to content

Commit a66db67

Browse files
revert all workarounds except copy zs.lib ⟶ zlib_a.lib
1 parent cdde343 commit a66db67

3 files changed

Lines changed: 2 additions & 3 deletions

File tree

src/SPC/builder/windows/SystemUtil.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ public static function makeCmakeToolchainFile(?string $cflags = null, ?string $l
9696
SET(CMAKE_EXE_LINKER_FLAGS "{$ldflags}")
9797
SET(CMAKE_FIND_ROOT_PATH "{$buildroot}")
9898
SET(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded)
99-
SET(ZLIB_LIBRARY "{$buildroot}/lib/zs.lib")
10099
CMAKE;
101100
if (!is_dir(SOURCE_PATH)) {
102101
FileSystem::createDir(SOURCE_PATH);

src/globals/ext-tests/openssl.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
}
3232
assert($valid);
3333
}
34-
if (PHP_VERSION_ID >= 80500 && defined('PHP_ZTS') && PHP_ZTS === 0 && defined('OPENSSL_VERSION_NUMBER') && OPENSSL_VERSION_NUMBER >= 0x30200000) {
34+
if (PHP_VERSION_ID >= 80500 && defined('OPENSSL_VERSION_NUMBER') && OPENSSL_VERSION_NUMBER >= 0x30200000) {
3535
assert(function_exists('openssl_password_hash'));
3636
}

src/globals/test-extensions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
// If you want to test your added extensions and libs, add below (comma separated, example `bcmath,openssl`).
5252
$extensions = match (PHP_OS_FAMILY) {
5353
'Linux', 'Darwin' => 'zlib',
54-
'Windows' => 'amqp,apcu,bcmath,bz2,calendar,ctype,curl,dba,dom,ds,exif,ffi,fileinfo,filter,ftp,iconv,igbinary,libxml,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pdo_mysql,pdo_sqlite,phar,rar,redis,session,shmop,simdjson,simplexml,soap,sockets,sqlite3,sqlsrv,ssh2,sysvshm,tokenizer,xml,xmlreader,xmlwriter,yac,yaml,zip,zlib',
54+
'Windows' => 'amqp,apcu,bcmath,bz2,calendar,ctype,curl,dba,dom,ds,exif,ffi,fileinfo,filter,ftp,gd,iconv,igbinary,libxml,mbregex,mbstring,mysqli,mysqlnd,opcache,openssl,pdo,pdo_mysql,pdo_sqlite,pdo_sqlsrv,phar,rar,redis,session,shmop,simdjson,simplexml,soap,sockets,sqlite3,sqlsrv,ssh2,sysvshm,tokenizer,xml,xmlreader,xmlwriter,yac,yaml,zip,zlib',
5555
};
5656

5757
// If you want to test shared extensions, add them below (comma separated, example `bcmath,openssl`).

0 commit comments

Comments
 (0)