Commit: bc9bbca41b6d78b99520a4efb35e299d2def94bb
Author: Martijn Berger
Date: Sat Aug 2 09:59:09 2014 +0200
Branches: master
https://developer.blender.org/rBbc9bbca41b6d78b99520a4efb35e299d2def94bb
Move to OIIO 1.4 also for windows x86
===================================================================
M CMakeLists.txt
M build_files/scons/config/win32-vc-config.py
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ef906a..4ea112b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1001,10 +1001,11 @@ elseif(WIN32)
# We want to support Vista level ABI for x64
if(NOT MSVC_VERSION VERSION_LESS 1700)
add_definitions(-D_WIN32_WINNT=0x600)
- add_definitions(-DOIIO_STATIC_BUILD)
endif()
endif()
+ add_definitions(-DOIIO_STATIC_BUILD)
+
set(CMAKE_CXX_FLAGS "/nologo /J /Gd /EHsc /MP" CACHE STRING
"MSVC MT C++ flags " FORCE)
set(CMAKE_C_FLAGS "/nologo /J /Gd /MP" CACHE STRING
"MSVC MT C++ flags " FORCE)
diff --git a/build_files/scons/config/win32-vc-config.py
b/build_files/scons/config/win32-vc-config.py
index ebe24bf..c036bf3 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']
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
