com php-src: move more common ldflags into function: win32/build/config.w32 win32/build/config.w32.phpize.in win32/build/confutils.js

Commit: 12cf41ca356800d5ff77b08d7b2410ea6b07a71c Author: Anatol Belski <ab@php.net> Fri, 7 Nov 2014 19:58:30 +0100 Parents: af7e3064f35708fa9540ee1c18217811980f0865 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=12cf41ca356800d5ff77b08d7b2410ea6b07a71c Log: move more common ldflags into function Changed paths: M win32/build/config.w32 M win32/build/config.w32.phpize.in M win32/build/confutils.js Diff: diff --git a/win32/build/config.w32 b/win32/build/config.w32 index 2a1dd0a..7187eac 100644 --- 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 0ced9b3..5a7f31d 100644 --- 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? */ ARG_WITH("snapshot-template", "Path to snapshot builder template dir", "no"); -// General DLL link flags -DEFINE("DLL_LDFLAGS", "/dll "); - -// PHP DLL link flags -DEFINE("PHP_LDFLAGS", "$(DLL_LDFLAGS)"); +// General link flags +toolset_setup_common_ldlags(); // General libs // urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib comdlg32.lib diff --git a/win32/build/confutils.js b/win32/build/confutils.js index 9d23c83..0f07e18 100644 --- 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 ");