Skip to content

Commit dabe89c

Browse files
committed
-enable VC11 (vc2012)
1 parent 60ad16e commit dabe89c

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

win32/build/config.w32

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,13 @@ if (VCVERS >= 1500 && PHP_MP != 'disable') {
163163
}
164164

165165
// 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+
}
168173

169174
// General DLL link flags
170175
DEFINE("DLL_LDFLAGS", "/dll ");

win32/build/confutils.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ VC_VERSIONS[1310] = 'MSVC7.1 (Visual C++ 2003)';
4646
VC_VERSIONS[1400] = 'MSVC8 (Visual C++ 2005)';
4747
VC_VERSIONS[1500] = 'MSVC9 (Visual C++ 2008)';
4848
VC_VERSIONS[1600] = 'MSVC10 (Visual C++ 2010)';
49+
VC_VERSIONS[1700] = 'MSVC11 (Visual C++ 2012)';
4950

5051
var VC_VERSIONS_SHORT = new Array();
5152
VC_VERSIONS_SHORT[1200] = 'VC6';
@@ -54,6 +55,7 @@ VC_VERSIONS_SHORT[1310] = 'VC7.1';
5455
VC_VERSIONS_SHORT[1400] = 'VC8';
5556
VC_VERSIONS_SHORT[1500] = 'VC9';
5657
VC_VERSIONS_SHORT[1600] = 'VC10';
58+
VC_VERSIONS_SHORT[1700] = 'VC11';
5759

5860
if (PROGRAM_FILES == null) {
5961
PROGRAM_FILES = "C:\\Program Files";

0 commit comments

Comments
 (0)