diff options
| author | Jürgen Herrmann <shadowrom@me.com> | 2013-06-18 15:55:32 +0400 |
|---|---|---|
| committer | Jürgen Herrmann <shadowrom@me.com> | 2013-06-18 15:55:32 +0400 |
| commit | 836b91c9c711b0ce3803f64b3123cdd4d1adc47d (patch) | |
| tree | 2553eef69e1e5369b65ad0dd4a74529c91a06fb0 /SConstruct | |
| parent | c88ea1c4f895feee6163a0bf5d8541421d1c74e6 (diff) | |
Scons and BuildBot changes for MSVC 2012 support.
Thanks Brecht and Thomas for reviewing ;)
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 306a783b53c..0a7fa2aec9e 100644 --- a/SConstruct +++ b/SConstruct @@ -137,6 +137,8 @@ else: B.quickie=[] toolset = B.arguments.get('BF_TOOLSET', None) +vcver = B.arguments.get('MSVS_VERSION', '9.0') + if toolset: print "Using " + toolset if toolset=='mstoolkit': @@ -148,9 +150,9 @@ if toolset: btools.SetupSpawn(env) else: if bitness==64 and platform=='win32': - env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64', TARGET_ARCH='x86_64') + env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64', TARGET_ARCH='x86_64', MSVC_VERSION=vcver) else: - env = BlenderEnvironment(ENV = os.environ, TARGET_ARCH='x86') + env = BlenderEnvironment(ENV = os.environ, TARGET_ARCH='x86', MSVC_VERSION=vcver) if not env: print "Could not create a build environment" @@ -384,6 +386,8 @@ else: env['CPPFLAGS'].append('-DWITH_AUDASPACE') env['CPPFLAGS'].append('-DWITH_AVI') env['CPPFLAGS'].append('-DWITH_BOOL_COMPAT') +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') @@ -940,7 +944,10 @@ if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-vc', 'linuxcross'): if env['WITH_BF_OPENAL']: dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll') - dllsources.append('${LCGDIR}/openal/lib/wrap_oal.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') if env['WITH_BF_SNDFILE']: dllsources.append('${LCGDIR}/sndfile/lib/libsndfile-1.dll') |