refactor zts related config

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 85a96f1694fdd5258f66a66497ef2e7ce608ddc7..8e63fc829a7819e9f2279b70f74bdb481717ed71 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -87,33 +87,7 @@ toolset_setup_common_libs();
 // Set some debug/release specific options
 toolset_setup_build_mode();
 
-if (PHP_ZTS == "yes") {
-       ADD_FLAG("CFLAGS", "/D ZTS=1");
-       ADD_FLAG("ZTS", "1");
-} else {
-       ADD_FLAG("ZTS", "0");
-}
-
-DEFINE("PHP_ZTS_ARCHIVE_POSTFIX", PHP_ZTS == "yes" ? '' : "-nts");
-
-// set up the build dir and DLL name
-if (PHP_DEBUG == "yes" && PHP_ZTS == "yes") {
-       DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug_TS");
-       DEFINE("PHPDLL", "php" + PHP_VERSION + "ts_debug.dll");
-       DEFINE("PHPLIB", "php" + PHP_VERSION + "ts_debug.lib");
-} else if (PHP_DEBUG == "yes" && PHP_ZTS == "no") {
-       DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug");
-       DEFINE("PHPDLL", "php" + PHP_VERSION + "_debug.dll");
-       DEFINE("PHPLIB", "php" + PHP_VERSION + "_debug.lib");
-} else if (PHP_DEBUG == "no" && PHP_ZTS == "yes") {
-       DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release_TS");
-       DEFINE("PHPDLL", "php" + PHP_VERSION + "ts.dll");
-       DEFINE("PHPLIB", "php" + PHP_VERSION + "ts.lib");
-} else if (PHP_DEBUG == "no" && PHP_ZTS == "no") {
-       DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release");
-       DEFINE("PHPDLL", "php" + PHP_VERSION + ".dll");
-       DEFINE("PHPLIB", "php" + PHP_VERSION + ".lib");
-}
+setup_zts_stuff();
 
 // CFLAGS, LDFLAGS and BUILD_DIR are defined
 // Add compiler and link flags if PGO options are selected

diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in
index 52947c1ace862912aa66c0f23836be16f8a4be3d..a82369a855416f31fa41459bd2c99ef3030cba40 100644 (file)
--- a/win32/build/config.w32.phpize.in
+++ b/win32/build/config.w32.phpize.in
@@ -77,38 +77,7 @@ toolset_setup_common_libs();
 // Set some debug/release specific options\r
 toolset_setup_build_mode();\r
 \r
-if (PHP_ZTS == "yes") {\r
-       ADD_FLAG("CFLAGS", "/D ZTS=1");\r
-}\r
-\r
-DEFINE("PHP_ZTS_ARCHIVE_POSTFIX", PHP_ZTS == "yes" ? '' : "-nts");\r
-\r
-// set up the build dir and DLL name\r
-if (PHP_DEBUG == "yes" && PHP_ZTS == "yes") {\r
-       DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug_TS");\r
-       if (!MODE_PHPIZE) {\r
-               DEFINE("PHPDLL", "php" + PHP_VERSION + "ts_debug.dll");\r
-               DEFINE("PHPLIB", "php" + PHP_VERSION + "ts_debug.lib");\r
-       }\r
-} else if (PHP_DEBUG == "yes" && PHP_ZTS == "no") {\r
-       DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug");\r
-       if (!MODE_PHPIZE) {\r
-               DEFINE("PHPDLL", "php" + PHP_VERSION + "_debug.dll");\r
-               DEFINE("PHPLIB", "php" + PHP_VERSION + "_debug.lib");\r
-       }\r
-} else if (PHP_DEBUG == "no" && PHP_ZTS == "yes") {\r
-       DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release_TS");\r
-       if (!MODE_PHPIZE) {\r
-               DEFINE("PHPDLL", "php" + PHP_VERSION + "ts.dll");\r
-               DEFINE("PHPLIB", "php" + PHP_VERSION + "ts.lib");\r
-       }\r
-} else if (PHP_DEBUG == "no" && PHP_ZTS == "no") {\r
-       DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release");\r
-       if (!MODE_PHPIZE) {\r
-               DEFINE("PHPDLL", "php" + PHP_VERSION + ".dll");\r
-               DEFINE("PHPLIB", "php" + PHP_VERSION + ".lib");\r
-       }\r
-}\r
+setup_zts_stuff();\r
 \r
 if (MODE_PHPIZE) {\r
        DEFINE("PHPDLL", PHP_DLL);\r

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index c7e8c119c02a133c9eb64cbb8ebe0aef3ea14f92..da2ffc6429350ea909c61115be9f4bda73defb7a 100644 (file)
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -2640,3 +2640,42 @@ function object_out_dir_option_handle()
        }
 }
 
+function setup_zts_stuff()
+{
+       if (PHP_ZTS == "yes") {
+               ADD_FLAG("CFLAGS", "/D ZTS=1");
+               ADD_FLAG("ZTS", "1");
+       } else {
+               ADD_FLAG("ZTS", "0");
+       }
+
+       DEFINE("PHP_ZTS_ARCHIVE_POSTFIX", PHP_ZTS == "yes" ? '' : "-nts");
+
+       // set up the build dir and DLL name
+       if (PHP_DEBUG == "yes" && PHP_ZTS == "yes") {
+               DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug_TS");
+               if (!MODE_PHPIZE) {
+                       DEFINE("PHPDLL", "php" + PHP_VERSION + "ts_debug.dll");
+                       DEFINE("PHPLIB", "php" + PHP_VERSION + "ts_debug.lib");
+               }
+       } else if (PHP_DEBUG == "yes" && PHP_ZTS == "no") {
+               DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Debug");
+               if (!MODE_PHPIZE) {
+                       DEFINE("PHPDLL", "php" + PHP_VERSION + "_debug.dll");
+                       DEFINE("PHPLIB", "php" + PHP_VERSION + "_debug.lib");
+               }
+       } else if (PHP_DEBUG == "no" && PHP_ZTS == "yes") {
+               DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release_TS");
+               if (!MODE_PHPIZE) {
+                       DEFINE("PHPDLL", "php" + PHP_VERSION + "ts.dll");
+                       DEFINE("PHPLIB", "php" + PHP_VERSION + "ts.lib");
+               }
+       } else if (PHP_DEBUG == "no" && PHP_ZTS == "no") {
+               DEFINE("BUILD_DIR", PHP_OBJECT_OUT_DIR + "Release");
+               if (!MODE_PHPIZE) {
+                       DEFINE("PHPDLL", "php" + PHP_VERSION + ".dll");
+                       DEFINE("PHPLIB", "php" + PHP_VERSION + ".lib");
+               }
+       }
+}
+