diff --git a/data/scons/icl12.py b/data/scons/icl12.py index ff0a1076..9521db93 100644 --- a/data/scons/icl12.py +++ b/data/scons/icl12.py @@ -111,16 +111,21 @@ def generate(env): else: raise Exception('Unknown version of visual studio!') - if 'ICPP_COMPOSER2011' in os.environ: - icpp_path = os.environ.get('ICPP_COMPOSER2011') - elif 'ICPP_COMPILER12' in os.environ: - icpp_path = os.environ.get('ICPP_COMPILER12') + if 'ICPP_COMPOSER2014' in os.environ: + icpp_path = os.environ.get('ICPP_COMPOSER2014') + elif 'ICPP_COMPILER14' in os.environ: + icpp_path = os.environ.get('ICPP_COMPILER14') elif 'ICPP_COMPOSER2013' in os.environ: icpp_path = os.environ.get('ICPP_COMPOSER2013') elif 'ICPP_COMPILER13' in os.environ: icpp_path = os.environ.get('ICPP_COMPILER13') + elif 'ICPP_COMPOSER2011' in os.environ: + icpp_path = os.environ.get('ICPP_COMPOSER2011') + elif 'ICPP_COMPILER12' in os.environ: + icpp_path = os.environ.get('ICPP_COMPILER12') else: raise Exception('Could not find any of the ICCPP_* environment variables!') + merge_script_vars(env, os.path.join(icpp_path, 'bin/iclvars.bat'), arch + ' ' + vsrelease) env['REDIST_PATH'] = os.path.join(os.path.join(os.path.join(icpp_path, 'redist'), arch_redist), 'compiler')