diff options
| author | Anatol Belski <ab@php.net> | 2014-07-21 14:48:06 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-07-21 14:48:06 +0200 |
| commit | b39f98cf81cce1eae9f665a5c7f82c93e218a577 (patch) | |
| tree | a6224b57f571df1b8952ea53899fef79f9c7b75e | |
| parent | 833e4669832137edbc4526a0d7c10f16396554a0 (diff) | |
| parent | a6ecb873b9138f4334271c6da3b9c5a6f9f3e490 (diff) | |
| download | php-git-b39f98cf81cce1eae9f665a5c7f82c93e218a577.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix nmake snap when ext name is different in target dll
| -rw-r--r-- | win32/build/confutils.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 203013e2f0..489adf34a8 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -1994,11 +1994,14 @@ function generate_makefile() } else {
MF.WriteBlankLines(1);
MF.WriteLine("build-ext-libs:");
+ MF.WriteLine(" @if not exist $(BUILD_DIR_DEV)\\lib mkdir $(BUILD_DIR_DEV)\\lib >nul");
for (var i in extensions_enabled) {
- var lib = "php_" + extensions_enabled[i][0] + ".lib";
+ var lib;
+
+ lib = "php_" + extensions_enabled[i][0] + "*.lib";
if ('shared' == extensions_enabled[i][1]) {
- MF.WriteLine(" @copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");
+ MF.WriteLine(" @if exist $(BUILD_DIR)\\" + lib + " copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");
}
}
}
|