|
1 |
| -diff --git a/bin/php/php.ini b/bin/php/php.ini |
2 |
| -index 5fc05c7..06306ea 100644 |
3 |
| ---- a/bin/php/php.ini |
4 |
| -+++ b/bin/php/php.ini |
5 |
| -@@ -8,5 +8,5 @@ extension=php_mysqli.dll |
6 |
| - memory_limit=4G |
7 |
| - |
8 |
| - error_reporting=-1 |
9 |
| --display_errors=1 |
10 |
| -+display_errors=0 |
11 |
| - display_startup_errors=1 |
| 1 | + bin/phpsdk_setshell.bat | 2 +- |
| 2 | + 1 file changed, 1 insertion(+), 1 deletion(-) |
| 3 | + |
12 | 4 | diff --git a/bin/phpsdk_setshell.bat b/bin/phpsdk_setshell.bat
|
13 |
| -index f651a4e..6c291db 100644 |
| 5 | +index 8c41734..0dcb846 100644 |
14 | 6 | --- a/bin/phpsdk_setshell.bat
|
15 | 7 | +++ b/bin/phpsdk_setshell.bat
|
16 |
| -@@ -199,9 +199,9 @@ if "%HOST_ARCH_NAME%"=="%TARGET_ARCH_NAME%" ( |
17 |
| - set VCVARSALL_ARCH_NAME=%HOST_ARCH_NAME%_%TARGET_ARCH_NAME% |
18 |
| - ) |
19 |
| - if 15 gtr %PHP_SDK_VS_NUM% ( |
20 |
| -- set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\vcvarsall.bat" !VCVARSALL_ARCH_NAME! |
21 |
| -+ set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\VsDevCmd.bat" -arch=!VCVARSALL_ARCH_NAME! -vcvars_ver=%vcvars_ver% -winsdk=%WKITVER% -no_logo |
| 8 | +@@ -211,7 +211,7 @@ if 15 gtr %PHP_SDK_VS_NUM% ( |
| 9 | + ) |
22 | 10 | ) else (
|
23 |
| -- set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\Auxiliary\Build\vcvarsall.bat" !VCVARSALL_ARCH_NAME! |
24 |
| -+ set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\VsDevCmd.bat" -arch=!VCVARSALL_ARCH_NAME! -vcvars_ver=%vcvars_ver% -winsdk=%WKITVER% -no_logo |
25 |
| - ) |
26 |
| - set VCVARSALL_ARCH_NAME= |
27 |
| - |
| 11 | + if NOT "%TOOLSET%"=="" ( |
| 12 | +- set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\Auxiliary\Build\vcvarsall.bat" !VCVARSALL_ARCH_NAME! -vcvars_ver=%TOOLSET% |
| 13 | ++ set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\VsDevCmd.bat" -arch=!VCVARSALL_ARCH_NAME! -vcvars_ver=%TOOLSET% -winsdk=%WKITVER% -no_logo |
| 14 | + ) else ( |
| 15 | + set PHP_SDK_VS_SHELL_CMD="!PHP_SDK_VC_DIR!\Auxiliary\Build\vcvarsall.bat" !VCVARSALL_ARCH_NAME! |
| 16 | + ) |
0 commit comments