summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/config/Make.rules.msvc15
1 files changed, 7 insertions, 8 deletions
diff --git a/cpp/config/Make.rules.msvc b/cpp/config/Make.rules.msvc
index 76916cd71e0..c7f59284ca1 100644
--- a/cpp/config/Make.rules.msvc
+++ b/cpp/config/Make.rules.msvc
@@ -28,21 +28,20 @@ GENERATE_PDB = yes
!endif
CPPFLAGS = $(CPPFLAGS) -nologo -W3 -WX -GR -EHsc -FD -D_CONSOLE
+!if "$(CPP_COMPILER)" != "VC60"
+CPPFLAGS = $(CPPFLAGS) -MP
+!endif
!if "$(OPTIMIZE)" == "yes"
-CPPFLAGS = $(CPPFLAGS) -O2 -DNDEBUG
-
-CPPFLAGS = $(CPPFLAGS) -MD
+CPPFLAGS = $(CPPFLAGS) -O2 -DNDEBUG -MD
!else
-CPPFLAGS = $(CPPFLAGS) -Zi -Gm -Od -D_DEBUG
-
-CPPFLAGS = $(CPPFLAGS) -MDd
+CPPFLAGS = $(CPPFLAGS) -Zi -Od -D_DEBUG -MDd
-!if "$(CPP_COMPILER)" == "VC60" || "$(CPP_COMPILER)" == "VC71"
-CPPFLAGS = $(CPPFLAGS) -GZ
+!if "$(CPP_COMPILER)" == "VC60"
+CPPFLAGS = $(CPPFLAGS) -GZ -Gm
!else
CPPFLAGS = $(CPPFLAGS) -RTC1
!endif