diff options
| author | Anatol Belski <ab@php.net> | 2014-07-21 14:57:51 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-07-21 14:57:51 +0200 |
| commit | 222d59aeaa8333bc24e460e38c370e4c8c4bdbcd (patch) | |
| tree | 63b2fa6cd5c993381779f5bfc0992b2100859ca6 | |
| parent | 457f1a3ad57cad31d410ef0e08e25c7ab0f4e9a8 (diff) | |
| parent | be8f557e77ccfec5d03b209fe9d394d75fd62325 (diff) | |
| download | php-git-222d59aeaa8333bc24e460e38c370e4c8c4bdbcd.tar.gz | |
Merge remote-tracking branch 'origin/str_size_and_int64_56_backport' into str_size_and_int64
* origin/str_size_and_int64_56_backport:
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");
}
}
}
|