Skip to content

Commit 315d391

Browse files
committed
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: Sync makefile options for phpize
2 parents 86aa1ca + 075986f commit 315d391

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

win32/build/Makefile.phpize

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,15 @@ PHPLIB=$(PHPSDK_DIR)\lib\$(PHPLIB)
88
LDFLAGS=$(LDFLAGS) /libpath:"$(PHPSDK_DIR)\lib\;$(PHPSDK_DIR)"
99
BUILD_DIR_DEV=$(PHPSDK_DIR)
1010

11+
!if "$(DEBUGGER)" == "1"
12+
DEBUGGER_CMD=devenv
13+
DEBUGGER_ARGS=/debugexe
14+
!else
15+
DEBUGGER_CMD=
16+
DEBUGGER_ARGS=
17+
!endif
18+
19+
all: generated_files $(EXT_TARGETS) $(PECL_TARGETS) $(SAPI_TARGETS)
1120
all: $(EXT_TARGETS) $(PECL_TARGETS)
1221

1322
build_dirs: $(BUILD_DIR) $(BUILD_DIRS_SUB)
@@ -35,7 +44,10 @@ _EXTENSION_DLL=$(EXT_TARGETS)
3544
!endif
3645

3746
test: set-tmp-env
38-
"$(PHP_PREFIX)\php.exe" -d open_basedir= -d output_buffering=0 run-tests.php $(TESTS) -p "$(PHP_PREFIX)\php.exe" -d extension=$(BUILD_DIR)\$(_EXTENSION_DLL)
47+
$(DEBUGGER_CMD) $(DEBUGGER_ARGS) "$(PHP_PREFIX)\php.exe" -d open_basedir= -d output_buffering=0 run-tests.php $(TESTS) -p "$(PHP_PREFIX)\php.exe" -d extension=$(BUILD_DIR)\$(_EXTENSION_DLL)
48+
49+
run: set-tmp-env
50+
$(DEBUGGER_CMD) $(DEBUGGER_ARGS) "$(PHP_PREFIX)\php.exe" -n -d extension=$(BUILD_DIR)\\$(_EXTENSION_DLL) $(ARGS)
3951

4052
!if $(MT) == ""
4153
_VC_MANIFEST_EMBED_EXE=

0 commit comments

Comments
 (0)