com php-src: - fix windows build: config.w32
| From: | Dmitry Stogov | Date: | Thu, 14 Feb 2013 06:24:26 +0000 |
| Subject: | com php-src: - fix windows build: config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-71565@lists.php.net to get a copy of this message | ||
Commit: f74c938c950de1b0fcdb0ef2bd66760832b57a53
Author: Pierre Joye <pierre.php@gmail.com> Thu, 14 Feb 2013 07:24:26 +0100
Parents: 44f892080dad495098ed79f4eda4cfde91f1a7fe
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f74c938c950de1b0fcdb0ef2bd66760832b57a53
Log:
- fix windows build
Changed paths:
M config.w32
Diff:
diff --git a/config.w32 b/config.w32
index 6f3c89c..feebe41 100644
--- a/config.w32
+++ b/config.w32
@@ -2,27 +2,27 @@ ARG_ENABLE("optimizer-plus", "whether to enable Zend OptimizerPlus
support", "ye
if (PHP_OPTIMIZER_PLUS != "no") {
- PHP_PGI = "no"; // workaround
- PHP_PGO = "no"; // workaround
+ PHP_PGI = "no"; // workaround
+ PHP_PGO = "no"; // workaround
- EXTENSION('ZendOptimizerPlus', "\
- ZendAccelerator.c \
- zend_accelerator_blacklist.c \
- zend_accelerator_debug.c \
- zend_accelerator_hash.c \
- zend_accelerator_module.c \
- zend_accelerator_util_funcs.c \
- zend_persist.c \
- zend_persist_calc.c \
- zend_shared_alloc.c \
- shared_alloc_win32.c", true);
+ EXTENSION('ZendOptimizerPlus', "\
+ ZendAccelerator.c \
+ zend_accelerator_blacklist.c \
+ zend_accelerator_debug.c \
+ zend_accelerator_hash.c \
+ zend_accelerator_module.c \
+ zend_accelerator_util_funcs.c \
+ zend_persist.c \
+ zend_persist_calc.c \
+ zend_shared_alloc.c \
+ shared_alloc_win32.c", true);
- ADD_SOURCES("Optimizer", "zend_optimizer.c", "ZendOptimizerPlus",
"OptimizerObj");
+ ADD_SOURCES(configure_module_dirname + "/Optimizer", "zend_optimizer.c",
"ZendOptimizerPlus", "OptimizerObj");
- ADD_FLAG('CFLAGS_ZENDOPTIMIZERPLUS', "/I .");
- ADD_FLAG('CFLAGS_ZENDOPTIMIZERPLUS', "/D HAVE_OPTIMIZER_PLUS=1");
+ ADD_FLAG('CFLAGS_ZENDOPTIMIZERPLUS', "/I " + configure_module_dirname);
+ ADD_FLAG('CFLAGS_ZENDOPTIMIZERPLUS', "/D HAVE_OPTIMIZER_PLUS=1");
- ADD_FLAG('CFLAGS_ZENDOPTIMIZERPLUS', "/Dregexec=php_regexec
/Dregerror=php_regerror /Dregfree=php_regfree /Dregcomp=php_regcomp /Iext/ereg/regex");
+ ADD_FLAG('CFLAGS_ZENDOPTIMIZERPLUS', "/Dregexec=php_regexec /Dregerror=php_regerror
/Dregfree=php_regfree /Dregcomp=php_regcomp /Iext/ereg/regex");
}