com php-src: fix makefile in phpize mode: win32/build/Makefile.phpize
| From: | Anatol Belski | Date: | Fri, 11 Jul 2014 13:05:01 +0000 |
| Subject: | com php-src: fix makefile in phpize mode: win32/build/Makefile.phpize | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79416@lists.php.net to get a copy of this message | ||
Commit: ae313b60370a1916c4f86860c19d62144beae89d
Author: Anatol Belski <ab@php.net> Fri, 11 Jul 2014 15:05:01 +0200
Parents: 9f5cf7d41a6d5efd29109c589cb665723daff122
Branches: PHP-5.4 PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ae313b60370a1916c4f86860c19d62144beae89d
Log:
fix makefile in phpize mode
- extend LDFLAGS with dynamically generated ones
- prevend dynamically generated CFLAGS to be overridden by hardcoded ones
Changed paths:
M win32/build/Makefile.phpize
Diff:
diff --git a/win32/build/Makefile.phpize b/win32/build/Makefile.phpize
index 17cfc90..0463d33 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)