diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2014-08-02 11:59:09 +0400 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2014-08-02 11:59:09 +0400 |
| commit | bc9bbca41b6d78b99520a4efb35e299d2def94bb (patch) | |
| tree | f5c13a4795ad754d40905b876456a2a0af71371b /build_files | |
| parent | 9c3025cd26d547667847c81ec53b503d876be906 (diff) | |
Move to OIIO 1.4 also for windows x86
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/scons/config/win32-vc-config.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/build_files/scons/config/win32-vc-config.py b/build_files/scons/config/win32-vc-config.py index ebe24bf0644..c036bf317cb 100644 --- a/build_files/scons/config/win32-vc-config.py +++ b/build_files/scons/config/win32-vc-config.py @@ -231,6 +231,9 @@ CCFLAGS = ['/nologo', '/J', '/W3', '/Gd', '/w34062', '/wd4018', '/wd4065', '/wd4 CXXFLAGS = ['/EHsc'] BGE_CXXFLAGS = ['/O2', '/Ob2', '/EHsc', '/GR', '/fp:fast', '/arch:SSE'] +if VC_VERSION == '12.0': + CCFLAGS.append('/DOIIO_STATIC_BUILD') # OIIO api changed with 1.4 making this needed + BF_DEBUG_CCFLAGS = ['/Zi', '/Ob0', '/Od', '/FR${TARGET}.sbr'] CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-D_CRT_SECURE_NO_DEPRECATE', '-DOPJ_STATIC'] |