diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-05-15 10:12:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-05-15 10:16:25 +0400 |
| commit | b252915b689f6f9385dbfea926c33f48683ee3cd (patch) | |
| tree | 50b92b2fad92effc41e6c7e699209b28e0801ee2 /SConstruct | |
| parent | c7ab68f1c4d02136bd70d4a17eaae4b78254db74 (diff) | |
CMake/SCons: finish removing MSVC2012 references
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/SConstruct b/SConstruct index 0258f776824..251f7eae92e 100644 --- a/SConstruct +++ b/SConstruct @@ -505,8 +505,6 @@ else: env['CPPFLAGS'].append('-DWITH_AUDASPACE') env['CPPFLAGS'].append('-DWITH_AVI') env['CPPFLAGS'].append('-DWITH_OPENNL') -if env['OURPLATFORM'] in ('win32-vc', 'win64-vc') and env['MSVC_VERSION'] == '11.0': - env['CPPFLAGS'].append('-D_ALLOW_KEYWORD_MACROS') if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'): env['CPPFLAGS'].append('-DHAVE_STDBOOL_H') @@ -1100,10 +1098,7 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'): if env['WITH_BF_OPENAL']: dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll') - if env['OURPLATFORM'] in ('win32-vc', 'win64-vc') and env['MSVC_VERSION'] == '11.0': - pass - else: - dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll') + dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll') if env['WITH_BF_SNDFILE']: dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll') |