diff options
Diffstat (limited to 'win32/build')
| -rw-r--r-- | win32/build/config.w32 | 10 | ||||
| -rw-r--r-- | win32/build/confutils.js | 47 |
2 files changed, 38 insertions, 19 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 8001334664..db080d0bcf 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -54,7 +54,7 @@ if (PHP_DEBUG == "yes") { ADD_FLAG("PHP_LDFLAGS", "/nodefaultlib:msvcrt"); } else { // Equivalent to Release_TSInline build -> best optimization - ADD_FLAG("CFLAGS", "/LD /MD /W3 /O2 /D NDebug /D NDEBUG \ + ADD_FLAG("CFLAGS", "/LD /MD /W3 /Ox /D NDebug /D NDEBUG \ /D ZEND_WIN32_FORCE_INLINE /GB /GF /D ZEND_DEBUG=0"); // if you have VS.Net /GS hardens the binary against buffer overruns // ADD_FLAG("CFLAGS", "/GS"); @@ -90,6 +90,14 @@ if (PHP_DEBUG == "yes" && PHP_ZTS == "yes") { // that we need ARG_WITH('php-build', 'Path to where you extracted http://www.php.net/extra/win32build.zip. Assumes that it is a sibling of this source dir (..\\php_build) if not specified', 'no'); +if (PHP_PHP_BUILD == 'no') { + if (FSO.FolderExists("..\\php_build")) { + PHP_PHP_BUILD = "..\\php_build"; + } else if (FSO.FolderExists("..\\win32build")) { + PHP_PHP_BUILD = "..\\win32build"; + } +} + ARG_WITH('extra-includes', 'Extra include path to use when building everything', ''); ARG_WITH('extra-libs', 'Extra library path to use when linking everything', ''); diff --git a/win32/build/confutils.js b/win32/build/confutils.js index bca6fc5082..a126817b26 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -// $Id: confutils.js,v 1.16 2003-12-04 17:03:20 fmk Exp $ +// $Id: confutils.js,v 1.17 2003-12-05 02:41:00 wez Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -362,33 +362,44 @@ function PATH_PROG(progname, def, additional_paths) return place; } -function CHECK_LIB(libname, target, path_to_check) +function CHECK_LIB(libnames, target, path_to_check) { if (path_to_check == null) { path_to_check = php_usual_lib_suspects; } else { path_to_check += ";" + php_usual_lib_suspects; } - - var p = search_paths(libname, path_to_check, "LIB"); var have = 0; + var p; + var i; + var libname; - if (typeof(p) == "string") { - ADD_FLAG("LDFLAGS_" + target.toUpperCase(), '/libpath:"' + p + '" '); - ADD_FLAG("LIBS_" + target.toUpperCase(), libname); - have = 1; - } else if (p == true) { - ADD_FLAG("LIBS_" + target.toUpperCase(), libname); - have = 1; - } else { - /* not found in the defaults or the explicit paths, - * so check the general extra libs; if we find - * it here, no need to add another /libpath: for it as we - * already have it covered, but we need to add the lib - * to LIBS_XXX */ - if (false != search_paths(libname, PHP_EXTRA_LIBS, null)) { + libnames = libnames.split(';'); + for (i = 0; i < libnames.length; i++) { + libname = libnames[i]; + p = search_paths(libname, path_to_check, "LIB"); + + if (typeof(p) == "string") { + ADD_FLAG("LDFLAGS_" + target.toUpperCase(), '/libpath:"' + p + '" '); ADD_FLAG("LIBS_" + target.toUpperCase(), libname); have = 1; + } else if (p == true) { + ADD_FLAG("LIBS_" + target.toUpperCase(), libname); + have = 1; + } else { + /* not found in the defaults or the explicit paths, + * so check the general extra libs; if we find + * it here, no need to add another /libpath: for it as we + * already have it covered, but we need to add the lib + * to LIBS_XXX */ + if (false != search_paths(libname, PHP_EXTRA_LIBS, null)) { + ADD_FLAG("LIBS_" + target.toUpperCase(), libname); + have = 1; + } + } + + if (have) { + break; } } |