aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ares/Makefile.msvc10
1 files changed, 8 insertions, 2 deletions
diff --git a/ares/Makefile.msvc b/ares/Makefile.msvc
index f423e0331..311b2713e 100644
--- a/ares/Makefile.msvc
+++ b/ares/Makefile.msvc
@@ -222,13 +222,19 @@ PDBTYPE_CONSOLIDATE = /pdbtype:consolidate
!UNDEF PDBTYPE_CONSOLIDATE
!ENDIF
+!IF $(CC_VERS_NUM) <= 70
+RT_ERROR_CHECKING = /GZ
+!ELSE
+RT_ERROR_CHECKING = /RTCsu
+!ENDIF
+
# ----------------------------
# Assorted commands and flags
# ----------------------------
CC_CMD_REL = cl.exe /nologo $(RTLIB) /DNDEBUG /O2
-CC_CMD_DBG = cl.exe /nologo $(RTLIBD) /D_DEBUG /Od /Zi /GZ
-CC_CFLAGS = $(CFLAGS) /I. /W3 /GX /FD
+CC_CMD_DBG = cl.exe /nologo $(RTLIBD) /D_DEBUG /Od /Zi $(RT_ERROR_CHECKING)
+CC_CFLAGS = $(CFLAGS) /I. /W3 /EHsc /FD
RC_CMD_REL = rc.exe /l 0x409 /d "NDEBUG"
RC_CMD_DBG = rc.exe /l 0x409 /d "_DEBUG"