Skip to content

Commit 35b077f

Browse files
committed
fix copy the ext dll into the prefix path in phpize mode
1 parent 8044d06 commit 35b077f

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

win32/build/confutils.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1347,9 +1347,6 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir)
13471347
if (MODE_PHPIZE && FSO.FileExists(PHP_DIR + "/include/main/config.pickle.h")) {
13481348
cflags = "/FI main/config.pickle.h " + cflags;
13491349
}
1350-
if (MODE_PHPIZE && FSO.FileExists(PHP_DIR + "/include/main/config.pickle.h")) {
1351-
cflags = "/FI main/config.pickle.h " + cflags;
1352-
}
13531350
ADD_FLAG("CFLAGS_" + EXT, cflags);
13541351

13551352
if (PHP_DSP != "no") {
@@ -1869,6 +1866,7 @@ function generate_phpize()
18691866

18701867
var MF = FSO.CreateTextFile(dest + "/phpize.js", true);
18711868
var DEPS = FSO.CreateTextFile(dest + "/ext_deps.js", true);
1869+
18721870
prefix = get_define("PHP_PREFIX");
18731871
prefix = prefix.replace(new RegExp("/", "g"), "\\");
18741872
prefix = prefix.replace(new RegExp("\\\\", "g"), "\\\\");
@@ -1955,7 +1953,7 @@ function generate_makefile()
19551953
var lib = "php_" + extensions_enabled[i][0] + ".lib";
19561954
var dll = "php_" + extensions_enabled[i][0] + ".dll";
19571955
MF.WriteLine(" @copy $(BUILD_DIR)\\" + lib + " $(BUILD_DIR_DEV)\\lib\\" + lib);
1958-
//MF.WriteLine(" @copy $(BUILD_DIR)\\" + dll + " $(PHP_PREFIX)\\" + dll);
1956+
MF.WriteLine(" @copy $(BUILD_DIR)\\" + dll + " $(PHP_PREFIX)\\" + dll);
19591957
}
19601958
}
19611959
TF.Close();

0 commit comments

Comments
 (0)