diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 16:14:03 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-06 16:14:03 +0200 |
| commit | 7047b953adab26c7098cbfaea2b69f9d36231cd3 (patch) | |
| tree | 8668c830838184ebc465554b85c085da42fb6f6a /demoscript/Util.py | |
| parent | Missing files (diff) | |
| parent | Removed Stream::format method, replace with startWriteEncaps parameter (diff) | |
| download | ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.tar.bz2 ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.tar.xz ice-7047b953adab26c7098cbfaea2b69f9d36231cd3.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/src/Ice/.depend
cpp/src/Ice/.depend.mak
cpp/src/slice2cpp/Gen.cpp
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.""" |