fix phpize for /mp and more

diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in
index 878e48d02b0df5f981ad681115a9796311df40f9..9b28352c8fe0f69f5cbb97542b2ff6921c37a969 100644 (file)
--- a/win32/build/config.w32.phpize.in
+++ b/win32/build/config.w32.phpize.in
@@ -151,14 +151,17 @@ if (VCVERS >= 1400) {
 }\r
 \r
 ARG_WITH('prefix', 'PHP installation prefix', '');\r
-ARG_WITH('mp', 'Tell VC9+ use up to [n,auto,disable] processes for compilation', 'auto');\r
+ARG_WITH('mp', 'Tell Visual Studio use up to [n,auto,disable] processes for compilation', 'auto');\r
+var PHP_MP_DISABLED = true;\r
 if (VCVERS >= 1500 && PHP_MP != 'disable') {\r
                // no from disable-all \r
                if(PHP_MP == 'auto' || PHP_MP == 'no') {\r
                         ADD_FLAG('CFLAGS', ' /MP ');\r
+                       PHP_MP_DISABLED = false;\r
                } else {\r
                        if(parseInt(PHP_MP) != 0) {\r
                                ADD_FLAG('CFLAGS', ' /MP'+ PHP_MP +' ');\r
+                               PHP_MP_DISABLED = false;\r
                        } else {\r
                                STDOUT.WriteLine('WARNING: Invalid argument for MP: ' + PHP_MP);\r
                        }\r

diff --git a/win32/build/phpize.js.in b/win32/build/phpize.js.in
index b0ba0bbb82712efe32a936dd01ae8a24f6139820..1302cf7065a2ebe75cb77c97d46bf660033d95c9 100644 (file)
--- a/win32/build/phpize.js.in
+++ b/win32/build/phpize.js.in
@@ -213,6 +213,11 @@ C.WriteLine("var MODE_PHPIZE = true;");
 C.WriteLine("var PHP_DIR = " + '"' + PHP_DIR.replace(new RegExp('(["\\\\])', "g"), '\\$1') + '"');\r
 C.WriteLine("var PHP_PREFIX = " + '"' + PHP_PREFIX.replace(new RegExp('(["\\\\])', "g"), '\\$1') + '"');\r
 \r
+/* XXX this needs to be implemented for the phpize mode yet, a quick fix just to disable it for now */\r
+C.WriteLine("var PHP_ANALYZER = 'disabled';");\r
+C.WriteLine("var PHP_PGO = 'no';");\r
+C.WriteLine("var PHP_PGI = 'no';");\r
+\r
 C.Write(file_get_contents(PHP_DIR + "//script//ext_deps.js"));\r
 if (FSO.FileExists(PHP_DIR + "/script/ext_pickle.js")) {\r
        C.Write(file_get_contents(PHP_DIR + "//script//ext_pickle.js"));\r