diff options
| author | Anatol Belski <ab@php.net> | 2014-07-21 14:46:57 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-07-21 14:46:57 +0200 |
| commit | 6fcd8e586509cf6530c513c5906ce9726230d8b3 (patch) | |
| tree | ef33211eeb5610f376a613183d2b5b6dc1f6a5c9 | |
| parent | 842fde2827394e68b3ddde0cee6462a3b19d63f9 (diff) | |
| parent | dc3a5d783f92c63c1c2645b542d5f5487f3bd952 (diff) | |
| download | php-git-6fcd8e586509cf6530c513c5906ce9726230d8b3.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
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 3cb11f0642..d6dd0ebaef 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -1973,11 +1973,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");
}
}
}
|