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 | bb3f003b8341b176df1103e7bc7a704d9b31e905 (patch) | |
tree | b1c2f3d44dca3e97ee33052e1b10642e5f8267f6 | |
parent | c2d3f7986be4a594339dd48be7a8483cfb9b543b (diff) | |
download | c-ares-bb3f003b8341b176df1103e7bc7a704d9b31e905.tar.gz c-ares-bb3f003b8341b176df1103e7bc7a704d9b31e905.tar.bz2 c-ares-bb3f003b8341b176df1103e7bc7a704d9b31e905.zip |
- 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.
-rw-r--r-- | Makefile.msvc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Makefile.msvc b/Makefile.msvc index f423e03..311b271 100644 --- a/Makefile.msvc +++ b/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" |