diff options
| author | Pierre Joye <pajoye@php.net> | 2008-08-01 11:25:42 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-08-01 11:25:42 +0000 |
| commit | cb10c3be6129a4942f1fbddada71a7bb287dbbc6 (patch) | |
| tree | 9899d7f0315f3ae6beb91c1fb9b028f3db4156be | |
| parent | c1ddd7bea547c0be0f4d0007cfe30cfacea2e316 (diff) | |
| download | php-git-cb10c3be6129a4942f1fbddada71a7bb287dbbc6.tar.gz | |
- MFH: add new default dir (old still works)
| -rw-r--r-- | win32/build/config.w32 | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 8b1cf8c513..e4d3145cd0 100644 --- a/win32/build/config.w32 +++ b/win32/build/config.w32 @@ -209,20 +209,24 @@ if (PHP_DEBUG == "yes" && PHP_ZTS == "yes") { 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"; + if (FSO.FolderExists("..\\deps")) { + PHP_PHP_BUILD = "..\\deps"; } else { - if (X64) { - if (FSO.FolderExists("..\\win64build")) { - PHP_PHP_BUILD = "..\\win64build"; - } else if (FSO.FolderExists("..\\php-win64-dev\\php_build")) { - PHP_PHP_BUILD = "..\\php-win64-dev\\php_build"; - } + if (FSO.FolderExists("..\\php_build")) { + PHP_PHP_BUILD = "..\\php_build"; } else { - if (FSO.FolderExists("..\\win32build")) { - PHP_PHP_BUILD = "..\\win32build"; - } else if (FSO.FolderExists("..\\php-win32-dev\\php_build")) { - PHP_PHP_BUILD = "..\\php-win32-dev\\php_build"; + if (X64) { + if (FSO.FolderExists("..\\win64build")) { + PHP_PHP_BUILD = "..\\win64build"; + } else if (FSO.FolderExists("..\\php-win64-dev\\php_build")) { + PHP_PHP_BUILD = "..\\php-win64-dev\\php_build"; + } + } else { + if (FSO.FolderExists("..\\win32build")) { + PHP_PHP_BUILD = "..\\win32build"; + } else if (FSO.FolderExists("..\\php-win32-dev\\php_build")) { + PHP_PHP_BUILD = "..\\php-win32-dev\\php_build"; + } } } } |