@@ -23,7 +23,6 @@ set PTHREAD_W32_VER=3.0.0
2323set LEVELDB_MCPE_VER = 1c7564468b41610da4f498430e795ca4de0931ff
2424set LIBDEFLATE_VER = dd12ff2b36d603dbb7fa8838fe7e7176fcbd4f6f
2525
26- set PHP_PTHREADS_VER = 4.2.2
2726set PHP_PMMPTHREAD_VER = 6.0.12
2827set PHP_YAML_VER = 2.2.3
2928set PHP_CHUNKUTILS2_VER = 0.3.5
@@ -219,14 +218,7 @@ cd /D ..
219218call :pm-echo " Getting additional PHP extensions..."
220219cd /D php-src\ext
221220
222- set THREAD_EXT_FLAGS = " "
223- if " %PM_VERSION_MAJOR% " geq " 5" (
224- call :get-extension-zip-from-github " pmmpthread" " %PHP_PMMPTHREAD_VER% " " pmmp" " ext-pmmpthread" || exit 1
225- set THREAD_EXT_FLAGS = " --with-pmmpthread=shared"
226- ) else (
227- call :get-extension-zip-from-github " pthreads" " %PHP_PTHREADS_VER% " " pmmp" " ext-pmmpthread" || exit 1
228- set THREAD_EXT_FLAGS = " --with-pthreads=shared"
229- )
221+ call :get-extension-zip-from-github " pmmpthread" " %PHP_PMMPTHREAD_VER% " " pmmp" " ext-pmmpthread" || exit 1
230222call :get-extension-zip-from-github " yaml" " %PHP_YAML_VER% " " php" " pecl-file_formats-yaml" || exit 1
231223call :get-extension-zip-from-github " chunkutils2" " %PHP_CHUNKUTILS2_VER% " " pmmp" " ext-chunkutils2" || exit 1
232224call :get-extension-zip-from-github " igbinary" " %PHP_IGBINARY_VER% " " igbinary" " igbinary" || exit 1
@@ -304,7 +296,7 @@ call configure^
304296 --with-mysqlnd^
305297 --with-openssl^
306298 --with-pcre-jit^
307- %THREAD_EXT_FLAGS% ^
299+ --with-pmmpthread=shared ^
308300 --with-simplexml^
309301 --with-sodium^
310302 --with-sqlite3=shared^
@@ -345,11 +337,7 @@ call :pm-echo "Generating php.ini..."
345337(echo error_reporting=-1)>> " %php_ini% "
346338(echo zend.assertions=-1)>> " %php_ini% "
347339(echo extension_dir=ext)>> " %php_ini% "
348- if " %PM_VERSION_MAJOR% " geq " 5" (
349- (echo extension=php_pmmpthread.dll)>> " %php_ini% "
350- ) else (
351- (echo extension=php_pthreads.dll)>> " %php_ini% "
352- )
340+ (echo extension=php_pmmpthread.dll)>> " %php_ini% "
353341(echo extension=php_openssl.dll)>> " %php_ini% "
354342(echo extension=php_chunkutils2.dll)>> " %php_ini% "
355343(echo extension=php_igbinary.dll)>> " %php_ini% "
0 commit comments