diff options
| author | Anatol Belski <ab@php.net> | 2014-07-11 15:06:56 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-07-11 15:06:56 +0200 |
| commit | b10ed89dac82f6a688257f6ef6e62417743c1387 (patch) | |
| tree | 143a5f44430c05d7186465ec9b7441c75d158391 | |
| parent | f3d565f6acc2ec0dbcf366b078cb4348b09d8abe (diff) | |
| parent | ae313b60370a1916c4f86860c19d62144beae89d (diff) | |
| download | php-git-b10ed89dac82f6a688257f6ef6e62417743c1387.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix makefile in phpize mode
| -rw-r--r-- | win32/build/Makefile.phpize | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/win32/build/Makefile.phpize b/win32/build/Makefile.phpize index 17cfc90fbd..0463d332fb 100644 --- a/win32/build/Makefile.phpize +++ b/win32/build/Makefile.phpize @@ -5,10 +5,7 @@ MT="$(MT)" PHPSDK_DIR=$(PHP_DIR)
PHPLIB=$(PHPSDK_DIR)\lib\$(PHPLIB)
-LDFLAGS=/libpath:"$(PHPSDK_DIR)\lib\;$(PHPSDK_DIR)"
-
-CFLAGS=/nologo /FD $(BASE_INCLUDES) /D _WINDOWS /D ZEND_WIN32=1 /D PHP_WIN32=1 /D WIN32 /D_USE_32BIT_TIME_T=1 /D ZEND_WIN32_FORCE_INLINE /GF /D ZEND_DEBUG=0 /D ZTS=1 /D FD_SETSIZE=256
-CFLAGS_PHP=/D _USRDLL /D PHP5DLLTS_EXPORTS /D PHP_EXPORTS /D TSRM_EXPORTS /D SAPI_EXPORTS /D WINVER=0x500 /D COMPILE_DL_AJAXMIN
+LDFLAGS=$(LDFLAGS) /libpath:"$(PHPSDK_DIR)\lib\;$(PHPSDK_DIR)"
all: $(EXT_TARGETS) $(PECL_TARGETS)
|