diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 10:24:57 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 10:24:57 +0200 |
| commit | e6f5dc2c89eda44fb0a3d444223131a31867a1b2 (patch) | |
| tree | b6bddfe0a0cccef45484314f47967d95a01472bb /demoscript/Util.py | |
| parent | more Java changes & tests (diff) | |
| parent | ICE-4804 - Properties and case-mismatch (diff) | |
| download | ice-e6f5dc2c89eda44fb0a3d444223131a31867a1b2.tar.bz2 ice-e6f5dc2c89eda44fb0a3d444223131a31867a1b2.tar.xz ice-e6f5dc2c89eda44fb0a3d444223131a31867a1b2.zip | |
Merge remote-tracking branch 'origin/master' into encoding11
Conflicts:
cpp/include/Ice/Stream.h
cpp/include/Slice/Preprocessor.h
rb/ruby/Makefile.mak
Diffstat (limited to 'demoscript/Util.py')
| -rw-r--r-- | demoscript/Util.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/demoscript/Util.py b/demoscript/Util.py index 1e0d8c07490..0bd75b2a057 100644 --- a/demoscript/Util.py +++ b/demoscript/Util.py @@ -94,8 +94,6 @@ def configurePaths(): compiler = "" if os.environ.get("CPP_COMPILER", "") != "": compiler = os.environ["CPP_COMPILER"] - if compiler == "BCC2010": - binDir = binDir + "\\bcc10;" + binDir if compiler == "VC100" or compiler == "VC100_EXPRESS": binDir = os.path.join(binDir, "vc100") @@ -248,7 +246,7 @@ def isNoServices(): config = open(os.path.join(toplevel, "config", "Make.rules.mak"), "r") if config != None: compiler = re.search("CPP_COMPILER[\t\s]*= ([A-Z0-9]*)", config.read()).group(1) - return compiler == "BCC2010" or compiler == "VC60" + return compiler == "VC60" def getMapping(): """Determine the current mapping based on the cwd.""" |