File tree Expand file tree Collapse file tree 2 files changed +9
-2
lines changed Expand file tree Collapse file tree 2 files changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -163,8 +163,13 @@ if (VCVERS >= 1500 && PHP_MP != 'disable') {
163
163
}
164
164
165
165
// General link flags
166
- DEFINE ( "LDFLAGS" , "/nologo /version:" +
167
- PHP_VERSION + "." + PHP_MINOR_VERSION + "." + PHP_RELEASE_VERSION ) ;
166
+
167
+ if ( VCVERS >= 1700 ) {
168
+ DEFINE ( "LDFLAGS" , "/nologo " ) ;
169
+ } else {
170
+ DEFINE ( "LDFLAGS" , "/nologo /version:" +
171
+ PHP_VERSION + "." + PHP_MINOR_VERSION + "." + PHP_RELEASE_VERSION ) ;
172
+ }
168
173
169
174
// General DLL link flags
170
175
DEFINE ( "DLL_LDFLAGS" , "/dll " ) ;
Original file line number Diff line number Diff line change @@ -46,6 +46,7 @@ VC_VERSIONS[1310] = 'MSVC7.1 (Visual C++ 2003)';
46
46
VC_VERSIONS [ 1400 ] = 'MSVC8 (Visual C++ 2005)' ;
47
47
VC_VERSIONS [ 1500 ] = 'MSVC9 (Visual C++ 2008)' ;
48
48
VC_VERSIONS [ 1600 ] = 'MSVC10 (Visual C++ 2010)' ;
49
+ VC_VERSIONS [ 1700 ] = 'MSVC11 (Visual C++ 2012)' ;
49
50
50
51
var VC_VERSIONS_SHORT = new Array ( ) ;
51
52
VC_VERSIONS_SHORT [ 1200 ] = 'VC6' ;
@@ -54,6 +55,7 @@ VC_VERSIONS_SHORT[1310] = 'VC7.1';
54
55
VC_VERSIONS_SHORT [ 1400 ] = 'VC8' ;
55
56
VC_VERSIONS_SHORT [ 1500 ] = 'VC9' ;
56
57
VC_VERSIONS_SHORT [ 1600 ] = 'VC10' ;
58
+ VC_VERSIONS_SHORT [ 1700 ] = 'VC11' ;
57
59
58
60
if ( PROGRAM_FILES == null ) {
59
61
PROGRAM_FILES = "C:\\Program Files" ;
You can’t perform that action at this time.
0 commit comments