Skip to content

Commit f2fcee5

Browse files
committed
- add new default dir (old still works)
1 parent 839bd43 commit f2fcee5

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

win32/build/config.w32

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -209,20 +209,24 @@ if (PHP_DEBUG == "yes" && PHP_ZTS == "yes") {
209209
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');
210210

211211
if (PHP_PHP_BUILD == 'no') {
212-
if (FSO.FolderExists("..\\php_build")) {
213-
PHP_PHP_BUILD = "..\\php_build";
212+
if (FSO.FolderExists("..\\deps")) {
213+
PHP_PHP_BUILD = "..\\deps";
214214
} else {
215-
if (X64) {
216-
if (FSO.FolderExists("..\\win64build")) {
217-
PHP_PHP_BUILD = "..\\win64build";
218-
} else if (FSO.FolderExists("..\\php-win64-dev\\php_build")) {
219-
PHP_PHP_BUILD = "..\\php-win64-dev\\php_build";
220-
}
215+
if (FSO.FolderExists("..\\php_build")) {
216+
PHP_PHP_BUILD = "..\\php_build";
221217
} else {
222-
if (FSO.FolderExists("..\\win32build")) {
223-
PHP_PHP_BUILD = "..\\win32build";
224-
} else if (FSO.FolderExists("..\\php-win32-dev\\php_build")) {
225-
PHP_PHP_BUILD = "..\\php-win32-dev\\php_build";
218+
if (X64) {
219+
if (FSO.FolderExists("..\\win64build")) {
220+
PHP_PHP_BUILD = "..\\win64build";
221+
} else if (FSO.FolderExists("..\\php-win64-dev\\php_build")) {
222+
PHP_PHP_BUILD = "..\\php-win64-dev\\php_build";
223+
}
224+
} else {
225+
if (FSO.FolderExists("..\\win32build")) {
226+
PHP_PHP_BUILD = "..\\win32build";
227+
} else if (FSO.FolderExists("..\\php-win32-dev\\php_build")) {
228+
PHP_PHP_BUILD = "..\\php-win32-dev\\php_build";
229+
}
226230
}
227231
}
228232
}

0 commit comments

Comments
 (0)