archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.6'

Browse source 
* PHP-5.6:
  fix nmake snap when ext name is different in target dll
This commit is contained in:
Anatol Belski 2014-07-21 14:48:06 +02:00
commit b39f98cf81
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
win32/build/confutils.js
View file

@ -1994,11 +1994,14 @@ function generate_makefile()
} else { } else {
MF.WriteBlankLines(1); MF.WriteBlankLines(1);
MF.WriteLine("build-ext-libs:"); 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) { 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]) { 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");
} }
} }
} }