File tree 3 files changed +8
-11
lines changed
3 files changed +8
-11
lines changed Original file line number Diff line number Diff line change @@ -90,12 +90,6 @@ if (VS_TOOLSET && VCVERS >= 1500 && PHP_MP != 'disable') {
90
90
// General link flags
91
91
toolset_setup_common_ldlags ( ) ;
92
92
93
- // General DLL link flags
94
- DEFINE ( "DLL_LDFLAGS" , "/dll " ) ;
95
-
96
- // PHP DLL link flags
97
- DEFINE ( "PHP_LDFLAGS" , "$(DLL_LDFLAGS)" ) ;
98
-
99
93
// General libs
100
94
// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib comdlg32.lib
101
95
DEFINE ( "LIBS" , "kernel32.lib ole32.lib user32.lib advapi32.lib shell32.lib ws2_32.lib Dnsapi.lib" ) ;
Original file line number Diff line number Diff line change @@ -77,11 +77,8 @@ if (VS_TOOLSET && VCVERS >= 1500 && PHP_MP != 'disable') {
77
77
* files that make up the snapshot template? */
78
78
ARG_WITH ( "snapshot-template" , "Path to snapshot builder template dir" , "no" ) ;
79
79
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 ( ) ;
85
82
86
83
// General libs
87
84
// urlmon.lib ole32.lib oleaut32.lib uuid.lib gdi32.lib winspool.lib comdlg32.lib
Original file line number Diff line number Diff line change @@ -2567,6 +2567,12 @@ function toolset_setup_common_cflags()
2567
2567
2568
2568
function toolset_setup_common_ldlags ( )
2569
2569
{
2570
+ // General DLL link flags
2571
+ DEFINE ( "DLL_LDFLAGS" , "/dll " ) ;
2572
+
2573
+ // PHP DLL link flags
2574
+ DEFINE ( "PHP_LDFLAGS" , "$(DLL_LDFLAGS)" ) ;
2575
+
2570
2576
if ( VS_TOOLSET ) {
2571
2577
if ( VCVERS >= 1700 ) {
2572
2578
DEFINE ( "LDFLAGS" , "/nologo " ) ;
You can’t perform that action at this time.
0 commit comments