diff options
Diffstat (limited to 'win32/build/config.w32')
| -rw-r--r-- | win32/build/config.w32 | 42 |
1 files changed, 32 insertions, 10 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32 index ce56f3ac0..ca0fc323c 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -1,22 +1,42 @@ // vim:ft=javascript -// $Id: config.w32,v 1.26.2.8 2005/02/25 23:00:17 edink Exp $ +// $Id: config.w32,v 1.26.2.9 2005/07/22 18:09:33 wez Exp $ // "Master" config file; think of it as a configure.in // equivalent. ARG_WITH('cygwin', 'Path to cygwin utilities on your system', '\\cygwin'); - PATH_PROG('cl'); -PATH_PROG('link'); + +// cygwin now ships with link.exe. Avoid searching the cygwin path +// for this, as we want the MS linker, not the fileutil +PATH_PROG('link', WshShell.Environment("Process").Item("PATH")); + PATH_PROG('nmake'); + // we don't want to define LIB, as that will override the default library path // that is set in that env var PATH_PROG('lib', null, 'MAKE_LIB'); -PATH_PROG('bison'); -PATH_PROG('flex'); +if (!PATH_PROG('bison')) { + ERROR('bison is required') +} +if (!PATH_PROG('flex')) { + ERROR('flex is required') +} PATH_PROG('re2c'); PATH_PROG('zip'); PATH_PROG('lemon'); +// avoid picking up midnight commander from cygwin +PATH_PROG('mc', WshShell.Environment("Process").Item("PATH")); + +// stick objects somewhere outside of the source tree +ARG_ENABLE('object-out-dir', 'Alternate location for binary objects during build', ''); +if (PHP_OBJECT_OUT_DIR.length) { + if (!FSO.FolderExists(PHP_OBJECT_OUT_DIR)) { + ERROR('you chosen output directory ' + PHP_OBJECT_OUT_DIR + ' does not exist'); + } + PHP_OBJECT_OUT_DIR += '\\'; +} + ARG_ENABLE('debug', 'Compile with debugging symbols', "no"); ARG_ENABLE('debug-pack', 'Release binaries with external debug symbols (--enable-debug must not be specified)', 'no'); if (PHP_DEBUG == "yes" && PHP_DEBUG_PACK == "yes") { @@ -87,19 +107,19 @@ ADD_FLAG("PHP_LDFLAGS", "/nodefaultlib:libcmt"); // set up the build dir and DLL name if (PHP_DEBUG == "yes" && PHP_ZTS == "yes") { - DEFINE("BUILD_DIR", "Debug_TS"); + DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug_TS"); DEFINE("PHPDLL", "php5ts_debug.dll"); DEFINE("PHPLIB", "php5ts_debug.lib"); } else if (PHP_DEBUG == "yes" && PHP_ZTS == "no") { - DEFINE("BUILD_DIR", "Debug"); + DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug"); DEFINE("PHPDLL", "php5_debug.dll"); DEFINE("PHPLIB", "php5_debug.lib"); } else if (PHP_DEBUG == "no" && PHP_ZTS == "yes") { - DEFINE("BUILD_DIR", "Release_TS"); + DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release_TS"); DEFINE("PHPDLL", "php5ts.dll"); DEFINE("PHPLIB", "php5ts.lib"); } else if (PHP_DEBUG == "no" && PHP_ZTS == "no") { - DEFINE("BUILD_DIR", "Release"); + DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release"); DEFINE("PHPDLL", "php5.dll"); DEFINE("PHPLIB", "php5.lib"); } @@ -228,9 +248,11 @@ ARG_ENABLE('fd-setsize', "Set maximum number of sockets for select(2)", "256"); ADD_FLAG("CFLAGS", "/D FD_SETSIZE=" + parseInt(PHP_FD_SETSIZE)); ARG_ENABLE("memory-limit", "Enable memory limit checking code", "no"); - AC_DEFINE('MEMORY_LIMIT', PHP_MEMORY_LIMIT == "yes" ? 1 : 0); +ARG_ENABLE("memory-manager", "Enable Zend memory manager", "yes"); +AC_DEFINE('USE_ZEND_ALLOC', PHP_MEMORY_MANAGER == "yes" ? 1 : 0); + ARG_ENABLE("zend-multibyte", "Enable Zend multibyte encoding support", "no"); if (PHP_ZEND_MULTIBYTE == "yes") { STDOUT.WriteLine("Enabling Zend multibyte encoding support"); |