diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.rules.mak | 7 | ||||
| -rwxr-xr-x | cpp/fixCopyright.py | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak index 60f8acfedc6..e4be229751e 100644 --- a/cpp/config/Make.rules.mak +++ b/cpp/config/Make.rules.mak @@ -104,8 +104,11 @@ SETARGV = setargv.obj !if "$(CPP_COMPILER)" == "BCC2006" !include $(top_srcdir)/config/Make.rules.bcc -!else -!include $(top_srcdir)/config/Make.rules.msvc +!elseif "$(CPP_COMPILER)" == "VC60" || "$(CPP_COMPILER)" == "VC71" || \ + "$(CPP_COMPILER)" == "VC80" || "$(CPP_COMPILER)" == "VC80_EXPRESS" +!include $(top_srcdir)/config/Make.rules.msvc +! else +!error Invalid setting for CPP_COMPILER: $(CPP_COMPILER) !endif install_libdir = $(prefix)\lib diff --git a/cpp/fixCopyright.py b/cpp/fixCopyright.py index 4feb798c8a4..0399e937a29 100755 --- a/cpp/fixCopyright.py +++ b/cpp/fixCopyright.py @@ -215,7 +215,7 @@ for x in sys.argv[1:]: sys.exit(0) elif x == "-e": patchIceE = True - path = "../icee" + path = "../cppe" elif x.startswith("-"): print sys.argv[0] + ": unknown option `" + x + "'" print |