Skip to content

Commit 12cf41c

Browse files
committed
move more common ldflags into function
1 parent af7e306 commit 12cf41c

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

win32/build/config.w32

-6
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,6 @@ if (VS_TOOLSET && VCVERS >= 1500 && PHP_MP != 'disable') {
9090
// General link flags
9191
toolset_setup_common_ldlags();
9292

93-
// General DLL link flags
94-
DEFINE("DLL_LDFLAGS", "/dll ");
95-
96-
// PHP DLL link flags
97-
DEFINE("PHP_LDFLAGS", "$(DLL_LDFLAGS)");
98-
9993
// General libs
10094
// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib comdlg32.lib
10195
DEFINE("LIBS", "kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib ws2_32.lib Dnsapi.lib");

win32/build/config.w32.phpize.in

+2-5
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,8 @@ if (VS_TOOLSET && VCVERS >= 1500 && PHP_MP != 'disable') {
7777
* files that make up the snapshot template? */
7878
ARG_WITH("snapshot-template", "Path to snapshot builder template dir", "no");
7979

80-
// General DLL link flags
81-
DEFINE("DLL_LDFLAGS", "/dll ");
82-
83-
// PHP DLL link flags
84-
DEFINE("PHP_LDFLAGS", "$(DLL_LDFLAGS)");
80+
// General link flags
81+
toolset_setup_common_ldlags();
8582

8683
// General libs
8784
// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib comdlg32.lib

win32/build/confutils.js

+6
Original file line numberDiff line numberDiff line change
@@ -2567,6 +2567,12 @@ function toolset_setup_common_cflags()
25672567

25682568
function toolset_setup_common_ldlags()
25692569
{
2570+
// General DLL link flags
2571+
DEFINE("DLL_LDFLAGS", "/dll ");
2572+
2573+
// PHP DLL link flags
2574+
DEFINE("PHP_LDFLAGS", "$(DLL_LDFLAGS)");
2575+
25702576
if (VS_TOOLSET) {
25712577
if (VCVERS >= 1700) {
25722578
DEFINE("LDFLAGS", "/nologo ");

0 commit comments

Comments
 (0)