move more common ldflags into function

diff --git a/win32/build/config.w32 b/win32/build/config.w32
index 2a1dd0a7c17ecbc5b01c3ae05caf8a981d30270e..7187eacca1499e10a141c34a6e6eb5b16e589d84 100644 (file)
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@ -90,12 +90,6 @@ if (VS_TOOLSET && VCVERS >= 1500 && PHP_MP != 'disable') {
 // General link flags
 toolset_setup_common_ldlags();
 
-// General DLL link flags
-DEFINE("DLL_LDFLAGS", "/dll ");
-
-// PHP DLL link flags
-DEFINE("PHP_LDFLAGS", "$(DLL_LDFLAGS)");
-
 // General libs
 // urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib comdlg32.lib
 DEFINE("LIBS", "kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib ws2_32.lib Dnsapi.lib");

diff --git a/win32/build/config.w32.phpize.in b/win32/build/config.w32.phpize.in
index 0ced9b30a0bf462a1c66f28ec2b1223f9c396584..5a7f31d5d443e85a734b60ce761763b99f215138 100644 (file)
--- a/win32/build/config.w32.phpize.in
+++ b/win32/build/config.w32.phpize.in
@@ -77,11 +77,8 @@ if (VS_TOOLSET && VCVERS >= 1500 && PHP_MP != 'disable') {
  * files that make up the snapshot template? */\r
 ARG_WITH("snapshot-template", "Path to snapshot builder template dir", "no");\r
 \r
-// General DLL link flags\r
-DEFINE("DLL_LDFLAGS", "/dll ");\r
-\r
-// PHP DLL link flags\r
-DEFINE("PHP_LDFLAGS", "$(DLL_LDFLAGS)");\r
+// General link flags\r
+toolset_setup_common_ldlags();\r
 \r
 // General libs\r
 // urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib comdlg32.lib\r

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index 9d23c83a24cf161190cae3810f8b706eb2b316fa..0f07e18120b2644d45bfd01e65994bc80d2c2119 100644 (file)
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -2567,6 +2567,12 @@ function toolset_setup_common_cflags()
 
 function toolset_setup_common_ldlags()
 {
+       // General DLL link flags
+       DEFINE("DLL_LDFLAGS", "/dll ");
+
+       // PHP DLL link flags
+       DEFINE("PHP_LDFLAGS", "$(DLL_LDFLAGS)");
+
        if (VS_TOOLSET) {
                if (VCVERS >= 1700) {
                        DEFINE("LDFLAGS", "/nologo ");