Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Berger <martijn.berger@gmail.com>2014-08-02 11:59:09 +0400
committerMartijn Berger <martijn.berger@gmail.com>2014-08-02 11:59:09 +0400
commitbc9bbca41b6d78b99520a4efb35e299d2def94bb (patch)
treef5c13a4795ad754d40905b876456a2a0af71371b /CMakeLists.txt
parent9c3025cd26d547667847c81ec53b503d876be906 (diff)
Move to OIIO 1.4 also for windows x86
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ef906ad00c..4ea112bfbe7 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)