diff options
| author | Bernard Normier <bernard@zeroc.com> | 2008-01-28 17:15:41 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2008-01-28 17:15:41 -0500 |
| commit | 71ad8c7a76994fcdf5db18976a05520ae16f9d37 (patch) | |
| tree | d72cd38007a4fbb80e41d116a10ba91dc7e23cf5 /cpp | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| download | ice-71ad8c7a76994fcdf5db18976a05520ae16f9d37.tar.bz2 ice-71ad8c7a76994fcdf5db18976a05520ae16f9d37.tar.xz ice-71ad8c7a76994fcdf5db18976a05520ae16f9d37.zip | |
VC90 third-party MSI
Diffstat (limited to 'cpp')
| -rwxr-xr-x[-rw-r--r--] | cpp/config/Make.rules.mak | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index ac386ab93d1..94175b558db 100644..100755 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -27,7 +27,7 @@ prefix = C:\Ice-$(VERSION) # # Specify your C++ compiler. Supported values are: -# VC60, VC71, VC80, VC80_EXPRESS, BCC2006 +# VC60, VC71, VC80, VC80_EXPRESS, VC90, BCC2006 # !if "$(CPP_COMPILER)" == "" CPP_COMPILER = VC80 @@ -50,17 +50,14 @@ BCB = C:\Program Files\Borland\BDS\4.0 TPH_EXT = BCC !elseif "$(CPP_COMPILER)" == "VC80_EXPRESS" TPH_EXT = VC80 +!elseif "$(CPP_COMPILER)" == "VC90_EXPRESS" +TPH_EXT = VC90 !else TPH_EXT = $(CPP_COMPILER) !endif !if "$(THIRDPARTY_HOME)" == "" THIRDPARTY_HOME = C:\Ice-$(VERSION)-ThirdParty-$(TPH_EXT) - -!if "$(AS)" == "ml64" -THIRDPARTY_HOME = $(THIRDPARTY_HOME)-x64 -!endif - !endif # @@ -76,6 +73,8 @@ THIRDPARTY_HOME = $(THIRDPARTY_HOME)-x64 MT = "$(VS80COMNTOOLS)bin\mt.exe" !elseif "$(CPP_COMPILER)" == "VC80_EXPRESS" MT = "$(PDK_HOME)\bin\mt.exe" +!else +MT = mt.exe !endif @@ -105,7 +104,8 @@ SETARGV = setargv.obj !if "$(CPP_COMPILER)" == "BCC2006" !include $(top_srcdir)/config/Make.rules.bcc !elseif "$(CPP_COMPILER)" == "VC60" || "$(CPP_COMPILER)" == "VC71" || \ - "$(CPP_COMPILER)" == "VC80" || "$(CPP_COMPILER)" == "VC80_EXPRESS" + "$(CPP_COMPILER)" == "VC80" || "$(CPP_COMPILER)" == "VC80_EXPRESS" || \ + "$(CPP_COMPILER)" == "VC90" || "$(CPP_COMPILER)" == "VC90_EXPRESS" !include $(top_srcdir)/config/Make.rules.msvc ! else !error Invalid setting for CPP_COMPILER: $(CPP_COMPILER) |