summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'base/msvccmd.mak')
-rw-r--r--base/msvccmd.mak7
1 files changed, 7 insertions, 0 deletions
diff --git a/base/msvccmd.mak b/base/msvccmd.mak
index 21299523..da0d8c2c 100644
--- a/base/msvccmd.mak
+++ b/base/msvccmd.mak
@@ -99,6 +99,8 @@ CDCC=/Zi
!if "$(CPU_FAMILY)"=="i386"
+!if ($(MSVC_VERSION) <= 12)
+# GB and QI0f were removed at (or before) VS2015
!if ($(MSVC_VERSION) >= 8) || defined(WIN64)
# MSVC 8 (2005) attempts to produce code good for all processors.
# and doesn't used /G5 or /GB.
@@ -113,6 +115,7 @@ CPFLAGS=/GB $(QI0f)
CPFLAGS=/GB $(QI0f)
!endif
!endif
+!endif
!if $(MSVC_VERSION)<5
FPFLAGS=/FPi87
@@ -200,7 +203,11 @@ COMPILE_WITH_FRAMES=/Oy-
CS=
!else
!if $(DEBUG)!=0 || $(TDEBUG)!=0
+!if $(MSVC_VERSION) < 14
+# This flag (Enable stack checks for all functions) has gone in
+# VS2015.
CS=/Ge
+!endif
!else
CS=/Gs
!endif