fix nmake snap when ext name is different in target dll

weltling · weltling · commit dc3a5d783f92 · 2014-07-21T14:45:49.000+02:00
diff --git a/win32/build/confutils.js b/win32/build/confutils.js
@@ -1958,11 +1958,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");
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -1958,11 +1958,14 @@ function generate_makefile()`
`1958`	`1958`	`} else {`
`1959`	`1959`	`MF.WriteBlankLines(1);`
`1960`	`1960`	`MF.WriteLine("build-ext-libs:");`
	`1961`	`+ MF.WriteLine(" @if not exist $(BUILD_DIR_DEV)\\lib mkdir $(BUILD_DIR_DEV)\\lib >nul");`
`1961`	`1962`	`for (var i in extensions_enabled) {`
`1962`		`- var lib = "php_" + extensions_enabled[i][0] + ".lib";`
	`1963`	`+ var lib;`
	`1964`	`+`
	`1965`	`+ lib = "php_" + extensions_enabled[i][0] + "*.lib";`
`1963`	`1966`
`1964`	`1967`	`if ('shared' == extensions_enabled[i][1]) {`
`1965`		`- MF.WriteLine(" @copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");`
	`1968`	`+ MF.WriteLine(" @if exist $(BUILD_DIR)\\" + lib + " copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib");`
`1966`	`1969`	`}`
`1967`	`1970`	`}`
`1968`	`1971`	`}`