Skip to content

Commit b3c6089

Browse files
committed
implemented force usage of generated .h and .js deps in phpize mode
1 parent ce2ad0d commit b3c6089

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

win32/build/confutils.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1339,6 +1339,9 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir)
13391339

13401340
DEFINE('CFLAGS_' + EXT + '_OBJ', '$(CFLAGS_PHP) $(CFLAGS_' + EXT + ')');
13411341
}
1342+
if (MODE_PHPIZE && FSO.FileExists(PHP_DIR + "/include/main/config.pickle.h")) {
1343+
cflags = "/FI main/config.pickle.h " + cflags;
1344+
}
13421345
ADD_FLAG("CFLAGS_" + EXT, cflags);
13431346

13441347
if (PHP_DSP != "no") {

win32/build/phpize.js.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,6 +210,9 @@ C.WriteLine("var MODE_PHPIZE = true;");
210210
C.WriteLine("var PHP_DIR = " + '"' + PHP_DIR.replace(new RegExp('(["\\\\])', "g"), '\\$1') + '"');
211211

212212
C.Write(file_get_contents(PHP_DIR + "//script//ext_deps.js"));
213+
if (FSO.FileExists(PHP_DIR + "/script/ext_pickle.js")) {
214+
C.Write(file_get_contents(PHP_DIR + "//script//ext_pickle.js"));
215+
}
213216

214217
C.Write(file_get_contents(PHP_DIR + "/script/confutils.js"));
215218
C.Write(file_get_contents(PHP_DIR + "/script/config.phpize.js"));

0 commit comments

Comments
 (0)