diff options
| author | Yang Tse <yangsita@gmail.com> | 2009-12-29 01:51:57 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2009-12-29 01:51:57 +0000 |
| commit | 5b2a31ae41ad6c9f686824816903192bff1c2a16 (patch) | |
| tree | 885443351e7d8611fcec097b663302f982524dd7 /ares | |
| parent | c796f2646ed7a2c37cd3c88e6ae685ad5ad3c177 (diff) | |
- Where run-time error checks enabling compiler option /GZ was used it is now
replaced with equivalent /RTCsu for Visual Studio 2003 and newer versions.
- Compiler option /GX is now replaced with equivalent /EHsc for all versions.
Diffstat (limited to 'ares')
| -rw-r--r-- | ares/Makefile.msvc | 10 |
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" |