1 files changed, 6 insertions, 18 deletions
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak
index 3b5b419c8a6..740a2d68aba 100755
--- a/cpp/config/Make.rules.mak
+++ b/cpp/config/Make.rules.mak
@@ -28,10 +28,10 @@ prefix			= C:\Ice-$(VERSION)
 
 #
 # Specify your C++ compiler. Supported values are:
-# VC60, VC90, VC90_EXPRESS, VC100, VC100_EXPRESS, VC110, VC110_EXPRESS
+# VC100, VC100_EXPRESS, VC110, VC110_EXPRESS
 #
 !if "$(CPP_COMPILER)" == ""
-CPP_COMPILER		= VC90
+CPP_COMPILER		= VC100
 !endif
 
 #
@@ -97,8 +97,7 @@ SETARGV			= setargv.obj
 #
 # Compiler specific definitions
 #
-!if "$(CPP_COMPILER)" == "VC60" || \
-        "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS" || \
+!if "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS" || \
         "$(CPP_COMPILER)" == "VC100" || "$(CPP_COMPILER)" == "VC100_EXPRESS" || \
         "$(CPP_COMPILER)" == "VC110" || "$(CPP_COMPILER)" == "VC110_EXPRESS"
 !include        $(top_srcdir)/config/Make.rules.msvc
@@ -110,11 +109,8 @@ SETARGV			= setargv.obj
 !error CPP_COMPILER: $(CPP_COMPILER) not supported to build Ice for WinRT
 !endif
 
-!if "$(CPP_COMPILER)" == "VC60"
-libsuff			= \vc6
-UNIQUE_DLL_NAMES	= yes
-!elseif "$(CPP_COMPILER)" == "VC100" || "$(CPP_COMPILER)" == "VC100_EXPRESS"
-libsuff			= \vc100$(x64suffix)
+!if "$(CPP_COMPILER)" == "VC90"
+libsuff			= \vc90$(x64suffix)
 !elseif "$(CPP_COMPILER)" == "VC110" || "$(CPP_COMPILER)" == "VC110_EXPRESS"
 libsuff			= \vc110$(x64suffix)
 !else
@@ -125,20 +121,12 @@ libsuff			= $(x64suffix)
 !if "$(THIRDPARTY_HOME)" != ""
 CPPFLAGS        = -I"$(THIRDPARTY_HOME)\include" $(CPPFLAGS)
 LDFLAGS         = $(PRELIBPATH)"$(THIRDPARTY_HOME)\lib$(libsuff)" $(LDFLAGS)
-!if "$(CPP_COMPILER)" == "VC60"
-CPPFLAGS        = -I"$(THIRDPARTY_HOME)\include\stlport" $(CPPFLAGS)
-!endif
 !endif
 !else
-!if "$(CPP_COMPILER)" == "VC60"
-CPPFLAGS        = -I"$(ice_dir)\include\stlport" $(CPPFLAGS)
-!endif
 !endif
 
 !if "$(UNIQUE_DLL_NAMES)" == "yes"
-!if "$(CPP_COMPILER)" == "VC60"
-COMPSUFFIX	= vc60_
-!elseif "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS"
+!if "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS"
 COMPSUFFIX	= vc90_
 !elseif "$(CPP_COMPILER)" == "VC100" || "$(CPP_COMPILER)" == "VC100_EXPRESS"
 COMPSUFFIX	= vc100_