diff options
| author | Anatol Belski <ab@php.net> | 2014-07-17 09:26:46 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-07-17 09:26:46 +0200 |
| commit | 1a2c3bd3ad0463c5d0b0f6f86425a6be3e4807b6 (patch) | |
| tree | 005d467f7585e7a863700796fca7d5c566a241b0 | |
| parent | 7446c81aed7d085f05dae0d785c7f49109bc44ec (diff) | |
| parent | b3c608911143d75c5edb5fc57259c3de4c0a00a3 (diff) | |
| download | php-git-1a2c3bd3ad0463c5d0b0f6f86425a6be3e4807b6.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
implemented force usage of generated .h and .js deps in phpize mode
| -rw-r--r-- | win32/build/confutils.js | 3 | ||||
| -rw-r--r-- | win32/build/phpize.js.in | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 9b1e0fc891..e55e727dad 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -1354,6 +1354,9 @@ function EXTENSION(extname, file_list, shared, cflags, dllname, obj_dir) DEFINE('CFLAGS_' + EXT + '_OBJ', '$(CFLAGS_PHP) $(CFLAGS_' + EXT + ')');
}
+ if (MODE_PHPIZE && FSO.FileExists(PHP_DIR + "/include/main/config.pickle.h")) {
+ cflags = "/FI main/config.pickle.h " + cflags;
+ }
ADD_FLAG("CFLAGS_" + EXT, cflags);
if (PHP_DSP != "no") {
diff --git a/win32/build/phpize.js.in b/win32/build/phpize.js.in index 235c0816a3..a5c83bde01 100644 --- a/win32/build/phpize.js.in +++ b/win32/build/phpize.js.in @@ -210,6 +210,9 @@ C.WriteLine("var MODE_PHPIZE = true;"); C.WriteLine("var PHP_DIR = " + '"' + PHP_DIR.replace(new RegExp('(["\\\\])', "g"), '\\$1') + '"');
C.Write(file_get_contents(PHP_DIR + "//script//ext_deps.js"));
+if (FSO.FileExists(PHP_DIR + "/script/ext_pickle.js")) {
+ C.Write(file_get_contents(PHP_DIR + "//script//ext_pickle.js"));
+}
C.Write(file_get_contents(PHP_DIR + "/script/confutils.js"));
C.Write(file_get_contents(PHP_DIR + "/script/config.phpize.js"));
|