Collections: Initial support for animating/driving collection properties (T55233)

(Just committing this now to a temp branch so that I can continue working on this from another machine later. This is a re-based+squashed, re-pushed version of what I just pushed earlier, but now based on current 2.8 code, not from several days ago) Rationale: The Spring team needs a way to hide objects from the viewport, so that parts of the rig can be enabled/disabled per shot. An example of this is how the cornea meshes are typically hidden from the viewport so that the animators can see the irises, and hence, where the character is looking. (Another reason we may want this in future is to make it so that a bunch of objects/rigs can be keyframed together in the same action, making it easier to manage their actions) Status: * Currently all necessary data and animation editor support changes should be in place and working. Hopefully I haven't missed any - the checklist may need updating for 2.8 * Depsgraph support however is still incomplete. We still need to figure out what needs to happen with the animated values to make objects actually appear/disappear when triggered via the animation system, just like they do now from the UIwip
2018-06-02 20:03:29 +02:00
4891 changed files with 164804 additions and 247080 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,44 +0,0 @@
-# C/C++
-[*.{c,cc,h,hh,inl,glsl}]
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = tab
-indent_size = 4
-max_line_length = 120
-
-# CMake & Text
-[*.{cmake,txt}]
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = tab
-indent_size = 4
-max_line_length = 120
-
-# Python
-[*.py]
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 4
-max_line_length = 120
-
-# Shell
-[*.sh]
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = tab
-indent_size = 4
-max_line_length = 120
-
-# reStructuredText
-[*.rst]
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 3
-max_line_length = 120
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,11 +62,6 @@ if(NOT DEFINED CMAKE_BUILD_TYPE_INIT)
 	set(CMAKE_BUILD_TYPE_INIT "Release")
 endif()

-# Omit superfluous "Up-to-date" messages.
-if(NOT DEFINED CMAKE_INSTALL_MESSAGE)
-	set(CMAKE_INSTALL_MESSAGE "LAZY")
-endif()
-
 # quiet output for Makefiles, 'make -s' helps too
 # set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)

@@ -115,11 +110,7 @@ enable_testing()

 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" FORCE)
 set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE)
-if(MSVC)
-	set(TESTS_OUTPUT_DIR ${EXECUTABLE_OUTPUT_PATH}/tests/$<CONFIG>/ CACHE INTERNAL "" FORCE)
-else()
-	set(TESTS_OUTPUT_DIR ${EXECUTABLE_OUTPUT_PATH}/tests/ CACHE INTERNAL "" FORCE)
-endif()
+set(TESTS_OUTPUT_DIR ${EXECUTABLE_OUTPUT_PATH}/tests CACHE INTERNAL "" FORCE)

 #-----------------------------------------------------------------------------
 # Set default config options
@@ -205,11 +196,11 @@ mark_as_advanced(WITH_BLENDER)
 option(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)

 option(WITH_PYTHON        "Enable Embedded Python API  (only disable for development)" ON)
-option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default" ON)
-mark_as_advanced(WITH_PYTHON)  # don't want people disabling this unless they really know what they are doing.
+option(WITH_PYTHON_SECURITY "Disables execution of scripts within blend files by default" ON) 
+mark_as_advanced(WITH_PYTHON)  # dont want people disabling this unless they really know what they are doing.
 mark_as_advanced(WITH_PYTHON_SECURITY)  # some distributions see this as a security issue, rather than have them patch it, make a build option.

-option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some efficiency, only enable for development)." OFF)
+option(WITH_PYTHON_SAFETY "Enable internal API error checking to track invalid data to prevent crash on access (at the expense of some effeciency, only enable for development)." OFF)
 mark_as_advanced(WITH_PYTHON_SAFETY)
 option(WITH_PYTHON_MODULE "Enable building as a python module which runs without a user interface, like running regular blender in background mode (experimental, only enable for development), installs to PYTHON_SITE_PACKAGES (or CMAKE_INSTALL_PREFIX if WITH_INSTALL_PORTABLE is enabled)." OFF)
 if(APPLE)
@@ -221,8 +212,8 @@ if(${CMAKE_VERSION} VERSION_LESS 2.8.8)
 	# add_library OBJECT arg unsupported
 	set(WITH_BUILDINFO OFF)
 endif()
-set(BUILDINFO_OVERRIDE_DATE "" CACHE STRING "Use instead of the current date for reproducible builds (empty string disables this option)")
-set(BUILDINFO_OVERRIDE_TIME "" CACHE STRING "Use instead of the current time for reproducible builds (empty string disables this option)")
+set(BUILDINFO_OVERRIDE_DATE "" CACHE STRING "Use instead of the current date for reproducable builds (empty string disables this option)")
+set(BUILDINFO_OVERRIDE_TIME "" CACHE STRING "Use instead of the current time for reproducable builds (empty string disables this option)")
 set(CPACK_OVERRIDE_PACKAGENAME "" CACHE STRING "Use instead of the standard packagename (empty string disables this option)")
 mark_as_advanced(CPACK_OVERRIDE_PACKAGENAME)
 mark_as_advanced(BUILDINFO_OVERRIDE_DATE)
@@ -236,14 +227,13 @@ option(WITH_SYSTEM_BULLET "Use the systems bullet library (currently unsupported
 mark_as_advanced(WITH_SYSTEM_BULLET)
 option(WITH_OPENCOLORIO   "Enable OpenColorIO color management" ${_init_OPENCOLORIO})

+option(WITH_CLAY_ENGINE    "Enable Clay engine" ON)
+
 # Compositor
 option(WITH_COMPOSITOR         "Enable the tile based nodal compositor" ON)

 option(WITH_OPENSUBDIV    "Enable OpenSubdiv for surface subdivision" _init_OPENSUBDIV)

-option(WITH_OPENSUBDIV_MODIFIER    "Use OpenSubdiv for CPU side of Subsurf/Multires modifiers" OFF)
-mark_as_advanced(WITH_OPENSUBDIV_MODIFIER)
-
 option(WITH_OPENVDB       "Enable features relying on OpenVDB" OFF)
 option(WITH_OPENVDB_BLOSC "Enable blosc compression for OpenVDB, only enable if OpenVDB was built with blosc support" OFF)
 option(WITH_OPENVDB_3_ABI_COMPATIBLE "Assume OpenVDB library has been compiled with version 3 ABI compatibility" OFF)
@@ -296,6 +286,9 @@ else()
 endif()


+# (unix defaults to System OpenJPEG On)
+option(WITH_SYSTEM_OPENJPEG "Use the operating systems OpenJPEG library" OFF)
+
 if(UNIX AND NOT APPLE)
 	option(WITH_SYSTEM_EIGEN3 "Use the systems Eigen3 library" OFF)
 endif()
@@ -379,9 +372,7 @@ if(UNIX AND NOT APPLE)
 endif()

 option(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
-if(WIN32 OR APPLE)
-	# Windows and macOS have this bundled with Python libraries.
-elseif(WITH_PYTHON_INSTALL OR (WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE))
+if(WITH_PYTHON_INSTALL OR (WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE))
 	set(PYTHON_NUMPY_PATH            "" CACHE PATH "Path to python site-packages or dist-packages containing 'numpy' module")
 	mark_as_advanced(PYTHON_NUMPY_PATH)
 	set(PYTHON_NUMPY_INCLUDE_DIRS ${PYTHON_NUMPY_PATH}/numpy/core/include CACHE PATH "Path to the include directory of the numpy module")
@@ -408,8 +399,6 @@ option(WITH_CYCLES_OSL				"Build Cycles with OSL support" ${_init_CYCLES_OSL})
 option(WITH_CYCLES_OPENSUBDIV		"Build Cycles with OpenSubdiv support" ${_init_CYCLES_OPENSUBDIV})
 option(WITH_CYCLES_CUDA_BINARIES	"Build Cycles CUDA binaries" OFF)
 option(WITH_CYCLES_CUBIN_COMPILER	"Build cubins with nvrtc based compiler instead of nvcc" OFF)
-option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF)
-mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL)
 set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 CACHE STRING "CUDA architectures to build binaries for")
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
 unset(PLATFORM_DEFAULT)
@@ -452,7 +441,7 @@ mark_as_advanced(WITH_MEM_VALGRIND)
 option(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation tracking (only enable for development)" OFF)
 mark_as_advanced(WITH_CXX_GUARDEDALLOC)

-option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" ON)
+option(WITH_ASSERT_ABORT "Call abort() when raising an assertion through BLI_assert()" OFF)
 mark_as_advanced(WITH_ASSERT_ABORT)

 option(WITH_BOOST					"Enable features depending on boost" ON)
@@ -471,13 +460,11 @@ endif()

 # OpenGL

-option(WITH_OPENGL              "When off limits visibility of the opengl headers to just bf_gpu and gawain (temporary option for development purposes)" ON)
 option(WITH_GLEW_ES             "Switches to experimental copy of GLEW that has support for OpenGL ES. (temporary option for development purposes)" OFF)
 option(WITH_GL_EGL              "Use the EGL OpenGL system library instead of the platform specific OpenGL system library (CGL, glX, or WGL)"       OFF)
 option(WITH_GL_PROFILE_ES20     "Support using OpenGL ES 2.0. (thru either EGL or the AGL/WGL/XGL 'es20' profile)"                                  OFF)

 mark_as_advanced(
-	WITH_OPENGL
 	WITH_GLEW_ES
 	WITH_GL_EGL
 	WITH_GL_PROFILE_ES20
@@ -498,6 +485,26 @@ if(WIN32)
 	set(CPACK_INSTALL_PREFIX ${CMAKE_GENERIC_PROGRAM_FILES}/${})
 endif()

+# Experimental support of C11 and C++11
+#
+# We default options to whatever default standard in the current compiler.
+if(APPLE)
+	set(_c11_init ON)
+	set(_cxx11_init ON)
+	set(WITH_C11 ON)
+	set(WITH_CXX11 ON)
+elseif(CMAKE_COMPILER_IS_GNUCC AND (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "6.0") AND (NOT WITH_CXX11))
+	set(_c11_init ON)
+else()
+	set(_c11_init OFF)
+endif()
+set(_cxx11_init ON)
+
+option(WITH_C11 "Build with C11 standard enabled, for development use only!" ${_c11_init})
+mark_as_advanced(WITH_C11)
+option(WITH_CXX11 "Build with C++11 standard enabled, for development use only!" ${_cxx11_init})
+mark_as_advanced(WITH_CXX11)
+
 # Compiler toolchain
 if(CMAKE_COMPILER_IS_GNUCC)
 	option(WITH_LINKER_GOLD "Use ld.gold linker which is usually faster than ld.bfd" ON)
@@ -538,11 +545,10 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
 			find_library(COMPILER_ASAN_LIBRARY asan ${CMAKE_C_IMPLICIT_LINK_DIRECTORIES})
 		else()
 			find_library( COMPILER_ASAN_LIBRARY NAMES clang_rt.asan-x86_64
-				PATHS
-				[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/7.0.0/lib/windows
-				[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/6.0.0/lib/windows
-			)
-		endif()
+				PATHS 	[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/7.0.0/lib/windows
+						[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\LLVM\\LLVM;]/lib/clang/6.0.0/lib/windows
+						)
+		endif() 
 		mark_as_advanced(COMPILER_ASAN_LIBRARY)
 	endif()
 endif()
@@ -609,14 +615,18 @@ if(NOT WITH_BLENDER AND NOT WITH_CYCLES_STANDALONE)
 	)
 endif()

+if(NOT WITH_CXX11)
+	if(WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE)
+		message(FATAL_ERROR "WITH_AUDASPACE requires WITH_CXX11")
+	endif()
+endif()
+
 if(NOT WITH_AUDASPACE)
 	if(WITH_OPENAL)
-		message(WARNING "WITH_OPENAL requires WITH_AUDASPACE which is disabled")
-		set(WITH_OPENAL OFF)
+		message(FATAL_ERROR "WITH_OPENAL requires WITH_AUDASPACE")
 	endif()
 	if(WITH_JACK)
-		message(WARNING "WITH_JACK requires WITH_AUDASPACE which is disabled")
-		set(WITH_JACK OFF)
+		message(FATAL_ERROR "WITH_JACK requires WITH_AUDASPACE")
 	endif()
 endif()

@@ -659,8 +669,11 @@ elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_INTERNATIONAL OR
       WITH_OPENVDB OR WITH_OPENCOLORIO)
 	# Keep enabled
 else()
-	# Disable boost if not needed.
-	set(WITH_BOOST OFF)
+	# New dependency graph needs either Boost or C++11 for function bindings.
+	if(NOT WITH_CXX11)
+		# Enabled but we don't need it
+		set(WITH_BOOST OFF)
+	endif()
 endif()

 # auto enable openimageio for cycles
@@ -717,6 +730,9 @@ if(WITH_BUILDINFO)
 	endif()
 endif()

+TEST_SHARED_PTR_SUPPORT()
+TEST_UNORDERED_MAP_SUPPORT()
+
 if(WITH_AUDASPACE)
 	if(NOT WITH_SYSTEM_AUDASPACE)
 		set(AUDASPACE_C_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/audaspace/bindings/C" "${CMAKE_BINARY_DIR}/extern/audaspace")
@@ -789,8 +805,7 @@ set(C_WARNINGS)
 set(CXX_WARNINGS)

 # for gcc -Wno-blah-blah
-set(C_REMOVE_STRICT_FLAGS)
-set(CXX_REMOVE_STRICT_FLAGS)
+set(CC_REMOVE_STRICT_FLAGS)

 # libraries to link the binary with passed to target_link_libraries()
 # known as LLIBS to scons
@@ -802,20 +817,18 @@ set(PLATFORM_LINKLIBS "")
 set(PLATFORM_LINKFLAGS "")
 set(PLATFORM_LINKFLAGS_DEBUG "")

-if (NOT CMAKE_BUILD_TYPE MATCHES "Release")
-	if(WITH_COMPILER_ASAN)
-		set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMPILER_ASAN_CFLAGS}")
-		set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMPILER_ASAN_CFLAGS}")
+if(WITH_COMPILER_ASAN)
+	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMPILER_ASAN_CFLAGS}")
+	set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMPILER_ASAN_CFLAGS}")

-		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMPILER_ASAN_CXXFLAGS}")
-		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMPILER_ASAN_CXXFLAGS}")
-		if(MSVC)
-			set(COMPILER_ASAN_LINKER_FLAGS "/FUNCTIONPADMIN:6")
-		endif()
-		set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS};${COMPILER_ASAN_LIBRARY}")
-		set(PLATFORM_LINKFLAGS "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}")
-		set(PLATFORM_LINKFLAGS_DEBUG "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}")
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMPILER_ASAN_CXXFLAGS}")
+	set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMPILER_ASAN_CXXFLAGS}")
+	if(MSVC)
+		set(COMPILER_ASAN_LINKER_FLAGS "/FUNCTIONPADMIN:6") 
 	endif()
+	set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS};${COMPILER_ASAN_LIBRARY}")
+	set(PLATFORM_LINKFLAGS "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}")
+	set(PLATFORM_LINKFLAGS_DEBUG "${COMPILER_ASAN_LIBRARY} ${COMPILER_ASAN_LINKER_FLAGS}") 
 endif()

 #-----------------------------------------------------------------------------
@@ -838,7 +851,7 @@ if(WITH_X11)
 	endif()

 	if(WITH_X11_XF86VMODE)
-		# XXX, why doesn't cmake make this available?
+		# XXX, why dont cmake make this available?
 		find_library(X11_Xxf86vmode_LIB Xxf86vm   ${X11_LIB_SEARCH_PATH})
 		mark_as_advanced(X11_Xxf86vmode_LIB)
 		if(X11_Xxf86vmode_LIB)
@@ -935,7 +948,7 @@ endif()
 if(SUPPORT_SSE2_BUILD)
 	set(PLATFORM_CFLAGS " ${PLATFORM_CFLAGS} ${COMPILER_SSE2_FLAG}")
 	add_definitions(-D__SSE2__)
-	if(NOT SUPPORT_SSE_BUILD) # don't double up
+	if(NOT SUPPORT_SSE_BUILD) # dont double up
 		add_definitions(-D__MMX__)
 	endif()
 endif()
@@ -948,7 +961,7 @@ if(MSVC)

 # OSX-Note: as we do cross-compiling with specific set architecture,
 # endianess-detection and auto-setting is counterproductive
-# so we just set endianness according CMAKE_OSX_ARCHITECTURES
+# so we just set endianess according CMAKE_OSX_ARCHITECTURES

 elseif(CMAKE_OSX_ARCHITECTURES MATCHES i386 OR CMAKE_OSX_ARCHITECTURES MATCHES x86_64)
 	add_definitions(-D__LITTLE_ENDIAN__)
@@ -966,11 +979,16 @@ else()
 	unset(_SYSTEM_BIG_ENDIAN)
 endif()
 if(WITH_IMAGE_OPENJPEG)
+	if(WITH_SYSTEM_OPENJPEG)
+		# dealt with above
+		set(OPENJPEG_DEFINES "")
+	else()
+		set(OPENJPEG_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/libopenjpeg")
+		set(OPENJPEG_DEFINES "-DOPJ_STATIC")
+	endif()
 	# Special handling of Windows platform where openjpeg is always static.
 	if(WIN32)
 		set(OPENJPEG_DEFINES "-DOPJ_STATIC")
-	else()
-		set(OPENJPEG_DEFINES "")
 	endif()
 endif()

@@ -984,10 +1002,6 @@ endif()
 find_package(OpenGL)
 blender_include_dirs_sys("${OPENGL_INCLUDE_DIR}")

-if(WITH_OPENGL)
-	add_definitions(-DWITH_OPENGL)
-endif()
-
 if(WITH_SYSTEM_GLES)
 	find_package_wrapper(OpenGLES)
 endif()
@@ -1190,7 +1204,7 @@ else()

 		list(APPEND GL_DEFINITIONS -DGLEW_STATIC)

-		# This won't affect the non-experimental glew library,
+		# This won't affect the non-experimental glew library, 
 		# but is used for conditional compilation elsewhere.
 		list(APPEND GL_DEFINITIONS -DGLEW_NO_ES)

@@ -1268,8 +1282,42 @@ endif()
 # Configure Ceres

 if(WITH_LIBMV)
-	# We always have C++11 which includes unordered_map.
-	set(CERES_DEFINES -DCERES_STD_UNORDERED_MAP)
+	set(CERES_DEFINES)
+
+	if(WITH_CXX11)
+		# nothing to be done
+	elseif(SHARED_PTR_FOUND)
+		if(SHARED_PTR_TR1_MEMORY_HEADER)
+			list(APPEND CERES_DEFINES -DCERES_TR1_MEMORY_HEADER)
+		endif()
+		if(SHARED_PTR_TR1_NAMESPACE)
+			list(APPEND CERES_DEFINES -DCERES_TR1_SHARED_PTR)
+		endif()
+	else()
+		message(FATAL_ERROR "Ceres: Unable to find shared_ptr.")
+	endif()
+
+	if(WITH_CXX11)
+		list(APPEND CERES_DEFINES -DCERES_STD_UNORDERED_MAP)
+	elseif(HAVE_STD_UNORDERED_MAP_HEADER)
+		if(HAVE_UNORDERED_MAP_IN_STD_NAMESPACE)
+			list(APPEND CERES_DEFINES -DCERES_STD_UNORDERED_MAP)
+		else()
+			if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE)
+				list(APPEND CERES_DEFINES -DCERES_STD_UNORDERED_MAP_IN_TR1_NAMESPACE)
+			else()
+				list(APPEND CERES_DEFINES -DCERES_NO_UNORDERED_MAP)
+				message(STATUS "Ceres: Replacing unordered_map/set with map/set (warning: slower!)")
+			endif()
+		endif()
+	else()
+		if(HAVE_UNORDERED_MAP_IN_TR1_NAMESPACE)
+			list(APPEND CERES_DEFINES -DCERES_TR1_UNORDERED_MAP)
+		else()
+			list(APPEND CERES_DEFINES -DCERES_NO_UNORDERED_MAP)
+			message(STATUS "Ceres: Replacing unordered_map/set with map/set (warning: slower!)")
+		endif()
+	endif()
 endif()

 #-----------------------------------------------------------------------------
@@ -1360,22 +1408,16 @@ if(CMAKE_COMPILER_IS_GNUCC)
 	endif()

 	# flags to undo strict flags
-	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations)
-	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER        -Wno-unused-parameter)
-	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION         -Wno-unused-function)
-	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_TYPE_LIMITS             -Wno-type-limits)
-	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_INT_IN_BOOL_CONTEXT     -Wno-int-in-bool-context)
-	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_FORMAT                  -Wno-format)
-	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_SWITCH                  -Wno-switch)
-
-	ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_CLASS_MEMACCESS     -Wno-class-memaccess)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER        -Wno-unused-parameter)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION         -Wno-unused-function)

 	if(CMAKE_COMPILER_IS_GNUCC AND (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "7.0"))
-		ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_IMPLICIT_FALLTHROUGH    -Wno-implicit-fallthrough)
+		ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_IMPLICIT_FALLTHROUGH    -Wno-implicit-fallthrough)
 	endif()

 	if(NOT APPLE)
-		ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
+		ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
 	endif()

 elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
@@ -1404,23 +1446,23 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
 	# ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNUSED_MACROS          -Wunused-macros)

 	# flags to undo strict flags
-	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
-	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_MACROS    -Wno-unused-macros)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER -Wno-unused-parameter)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_MACROS    -Wno-unused-macros)

-	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_VARIABLE_DECLARATIONS -Wno-missing-variable-declarations)
-	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_INCOMPAT_PTR_DISCARD_QUAL -Wno-incompatible-pointer-types-discards-qualifiers)
-	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION -Wno-unused-function)
-	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_INT_TO_VOID_POINTER_CAST -Wno-int-to-void-pointer-cast)
-	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_PROTOTYPES -Wno-missing-prototypes)
-	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_DUPLICATE_ENUM -Wno-duplicate-enum)
-	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_UNDEF -Wno-undef)
-	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_NORETURN -Wno-missing-noreturn)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_VARIABLE_DECLARATIONS -Wno-missing-variable-declarations)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_INCOMPAT_PTR_DISCARD_QUAL -Wno-incompatible-pointer-types-discards-qualifiers)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_FUNCTION -Wno-unused-function)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_INT_TO_VOID_POINTER_CAST -Wno-int-to-void-pointer-cast)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_PROTOTYPES -Wno-missing-prototypes)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_DUPLICATE_ENUM -Wno-duplicate-enum)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNDEF -Wno-undef)
+	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_MISSING_NORETURN -Wno-missing-noreturn)

-	ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_PRIVATE_FIELD -Wno-unused-private-field)
-	ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_CXX11_NARROWING -Wno-c++11-narrowing)
-	ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_NON_VIRTUAL_DTOR -Wno-non-virtual-dtor)
-	ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_MACROS -Wno-unused-macros)
-	ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_REORDER -Wno-reorder)
+	ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_PRIVATE_FIELD -Wno-unused-private-field)
+	ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_CXX11_NARROWING -Wno-c++11-narrowing)
+	ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_NON_VIRTUAL_DTOR -Wno-non-virtual-dtor)
+	ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_MACROS -Wno-unused-macros)
+	ADD_CHECK_CXX_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS CXX_WARN_NO_REORDER -Wno-reorder)

 elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")

@@ -1441,7 +1483,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
 		# warning level:
 		"/W3"
 		"/w34062"  # switch statement contains 'default' but no 'case' labels
-		"/w34189"  # local variable is initialized but not referenced
 		# disable:
 		"/wd4018"  # signed/unsigned mismatch
 		"/wd4146"  # unary minus operator applied to unsigned type, result still unsigned
@@ -1453,8 +1494,7 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
 		"/wd4267"  # conversion from 'size_t' to 'type', possible loss of data
 		"/wd4305"  # truncation from 'type1' to 'type2'
 		"/wd4800"  # forcing value to bool 'true' or 'false'
-		"/wd4828"  # The file contains a character that is illegal
-		"/wd4996"  # identifier was declared deprecated
+		"/wd4828"  # The file contains a character that is illegal 
 		# errors:
 		"/we4013"  # 'function' undefined; assuming extern returning int
 		"/we4133"  # incompatible pointer types
@@ -1480,14 +1520,14 @@ if(WITH_PYTHON)
 		)
 	endif()

-	if(WIN32 OR APPLE)
-		# Windows and macOS have this bundled with Python libraries.
+	if(WIN32)
+		# pass, we have this in an archive to extract
 	elseif((WITH_PYTHON_INSTALL AND WITH_PYTHON_INSTALL_NUMPY) OR (WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE))
 		if(("${PYTHON_NUMPY_PATH}" STREQUAL "") OR (${PYTHON_NUMPY_PATH} MATCHES NOTFOUND))
 			find_python_package(numpy)
 			unset(PYTHON_NUMPY_INCLUDE_DIRS CACHE)
 			set(PYTHON_NUMPY_INCLUDE_DIRS ${PYTHON_NUMPY_PATH}/numpy/core/include CACHE PATH "Path to the include directory of the numpy module")
-			mark_as_advanced(PYTHON_NUMPY_INCLUDE_DIRS)
+		        mark_as_advanced(PYTHON_NUMPY_INCLUDE_DIRS)
 		endif()
 	endif()

@@ -1498,17 +1538,24 @@ if(WITH_PYTHON)
 	endif()
 endif()

-if(
-	CMAKE_COMPILER_IS_GNUCC OR
-	CMAKE_C_COMPILER_ID MATCHES "Clang" OR
-	CMAKE_C_COMPILER_ID MATCHES "Intel"
-)
-	# TODO(sergey): Do we want c++11 or gnu-c++11 here?
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-elseif(MSVC)
-	# Nothing special is needed, C++11 features are available by default.
+if(WITH_CXX11)
+	if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+		# TODO(sergey): Do we want c++11 or gnu-c++11 here?
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+	elseif(MSVC)
+		# Nothing special is needed, C++11 features are available by default.
+	else()
+		message(FATAL_ERROR "Compiler ${CMAKE_C_COMPILER_ID} is not supported for C++11 build yet")
+	endif()
 else()
-	message(FATAL_ERROR "Unknown compiler ${CMAKE_C_COMPILER_ID}, can't enable C++11 build")
+	# GCC-6 switched to C++11 by default, which would break linking with existing libraries
+	# by default. So we explicitly disable C++11 for a new GCC so no linking issues happens.
+	if(CMAKE_COMPILER_IS_GNUCC AND (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "6.0"))
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98")
+		# We also disable any of C++11 ABI from usage, so we wouldn't even try to
+		# link to stuff from std::__cxx11 namespace.
+		add_definitions("-D_GLIBCXX_USE_CXX11_ABI=0")
+	endif()
 endif()

 # Visual Studio has all standards it supports available by default
@@ -1518,8 +1565,12 @@ if(
 	(CMAKE_C_COMPILER_ID MATCHES "Clang" AND (NOT MSVC)) OR
 	(CMAKE_C_COMPILER_ID MATCHES "Intel")
 )
-	# Use C11 + GNU extensions, works with GCC, Clang, ICC
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
+	# Use C99 + GNU extensions, works with GCC, Clang, ICC
+	if(WITH_C11)
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu11")
+	else()
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+	endif()
 endif()

 # Include warnings first, so its possible to disable them with user defined flags
@@ -1666,6 +1717,7 @@ if(FIRST_RUN)
 	info_cfg_option(WITH_MEM_JEMALLOC)
 	info_cfg_option(WITH_MEM_VALGRIND)
 	info_cfg_option(WITH_SYSTEM_GLEW)
+	info_cfg_option(WITH_SYSTEM_OPENJPEG)

 	info_cfg_text("Image Formats:")
 	info_cfg_option(WITH_OPENIMAGEIO)
--- a/65
+++ b/65
@@ -45,18 +45,12 @@ endif

 # Dependencies DIR's
 DEPS_SOURCE_DIR:=$(BLENDER_DIR)/build_files/build_environment
+DEPS_BUILD_DIR:=$(BUILD_DIR)/deps
+DEPS_INSTALL_DIR:=$(shell dirname "$(BLENDER_DIR)")/lib/$(OS_NCASE)

-ifndef DEPS_BUILD_DIR
-	DEPS_BUILD_DIR:=$(BUILD_DIR)/deps
-endif
-
-ifndef DEPS_INSTALL_DIR
-	DEPS_INSTALL_DIR:=$(shell dirname "$(BLENDER_DIR)")/lib/$(OS_NCASE)
-
-	ifneq ($(OS_NCASE),darwin)
-		# Add processor type to directory name
-		DEPS_INSTALL_DIR:=$(DEPS_INSTALL_DIR)_$(shell uname -p)
-	endif
+ifneq ($(OS_NCASE),darwin)
+	# Add processor type to directory name
+	DEPS_INSTALL_DIR:=$(DEPS_INSTALL_DIR)_$(shell uname -p)
 endif

 # Allow to use alternative binary (pypy3, etc)
@@ -95,16 +89,6 @@ ifneq "$(findstring bpy, $(MAKECMDGOALS))" ""
 endif


-# -----------------------------------------------------------------------------
-# Blender binary path
-
-ifeq ($(OS), Darwin)
-	BLENDER_BIN="$(BUILD_DIR)/bin/blender.app/Contents/MacOS/blender"
-else
-	BLENDER_BIN="$(BUILD_DIR)/bin/blender"
-endif
-
-
 # -----------------------------------------------------------------------------
 # Get the number of cores for threaded build
 ifndef NPROCS
@@ -156,7 +140,7 @@ all: .FORCE
 	$(MAKE) -C "$(BUILD_DIR)" -s -j $(NPROCS) install
 	@echo
 	@echo edit build configuration with: "$(BUILD_DIR)/CMakeCache.txt" run make again to rebuild.
-	@echo Blender successfully built, run from: $(BLENDER_BIN)
+	@echo Blender successfully built, run from: "$(BUILD_DIR)/bin/blender"
 	@echo

 debug: all
@@ -232,12 +216,12 @@ help: .FORCE
 	@echo "                         which are tagged to use the stricter formatting"
 	@echo "  * test_deprecated    - checks for deprecation tags in our code which may need to be removed"
 	@echo "  * test_style_c       - checks C/C++ conforms with blenders style guide:"
-	@echo "                         https://wiki.blender.org/wiki/Source/Code_Style"
+	@echo "                         http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
 	@echo "  * test_style_c_qtc   - same as test_style but outputs QtCreator tasks format"
 	@echo "  * test_style_osl     - checks OpenShadingLanguage conforms with blenders style guide:"
-	@echo "                         https://wiki.blender.org/wiki/Source/Code_Style"
+	@echo "                         http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
 	@echo "  * test_style_osl_qtc - checks OpenShadingLanguage conforms with blenders style guide:"
-	@echo "                         https://wiki.blender.org/wiki/Source/Code_Style"
+	@echo "                         http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
 	@echo ""
 	@echo "Static Source Code Checking (not associated with building blender)"
 	@echo "  * check_cppcheck       - run blender source through cppcheck (C & C++)"
@@ -252,12 +236,8 @@ help: .FORCE
 	@echo "  * check_descriptions   - check for duplicate/invalid descriptions"
 	@echo ""
 	@echo "Utilities (not associated with building blender)"
-	@echo "  * icons    - Updates PNG icons from SVG files."
-	@echo "               Set environment variables 'BLENDER_BIN' and 'INKSCAPE_BIN'"
-	@echo "               to define your own commands."
-	@echo "  * icons_geom - Updates Geometry icons from BLEND file."
-	@echo "                 Set environment variable 'BLENDER_BIN'"
-	@echo "                 to define your own command."
+	@echo "  * icons      - updates PNG icons from SVG files."
+	@echo "  * icons_geom - updates Geometry icons from BLEND file."
 	@echo "  * tgz        - create a compressed archive of the source code."
 	@echo "  * update     - updates git and all submodules"
 	@echo ""
@@ -430,7 +410,7 @@ check_spelling_osl: .FORCE
 	    "$(BLENDER_DIR)/intern/cycles/kernel/shaders"

 check_descriptions: .FORCE
-	$(BLENDER_BIN) --background -noaudio --factory-startup --python \
+	"$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup --python \
 	    "$(BLENDER_DIR)/source/tools/check_source/check_descriptions.py"

 # -----------------------------------------------------------------------------
@@ -445,7 +425,7 @@ icons: .FORCE
 	"$(BLENDER_DIR)/release/datafiles/prvicons_update.py"

 icons_geom: .FORCE
-	BLENDER_BIN=$(BLENDER_BIN) \
+	BLENDER_BIN="$(BUILD_DIR)/bin/blender" \
 	    "$(BLENDER_DIR)/release/datafiles/blender_icons_geom_update.py"

 update: .FORCE
@@ -468,26 +448,33 @@ update: .FORCE

 # Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
 doc_py: .FORCE
-	ASAN_OPTIONS=halt_on_error=0 \
-	$(BLENDER_BIN) --background -noaudio --factory-startup \
+	"$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup \
 		--python doc/python_api/sphinx_doc_gen.py
 	cd doc/python_api ; sphinx-build -b html sphinx-in sphinx-out
-	@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/index.html'"
+	@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/contents.html'"

 doc_doxy: .FORCE
 	cd doc/doxygen; doxygen Doxyfile
 	@echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'"

 doc_dna: .FORCE
-	$(BLENDER_BIN) --background -noaudio --factory-startup \
+	"$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup \
 		--python doc/blender_file_format/BlendFileDnaExporter_25.py
 	@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"

 doc_man: .FORCE
-	$(PYTHON) doc/manpage/blender.1.py $(BLENDER_BIN) blender.1
+	$(PYTHON) doc/manpage/blender.1.py "$(BUILD_DIR)/bin/blender"

 help_features: .FORCE
-	@$(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_print_build_options.py" $(BLENDER_DIR)"/CMakeLists.txt"
+	@$(PYTHON) -c \
+		"import re; \
+		print('\n'.join([ \
+		w for l in open('"$(BLENDER_DIR)"/CMakeLists.txt', 'r').readlines() \
+		if not l.lstrip().startswith('#') \
+		for w in (re.sub(\
+		    r'.*\boption\s*\(\s*(WITH_[a-zA-Z0-9_]+)\s+(\".*\")\s*.*', r'\g<1> - \g<2>', l).strip('() \n'),) \
+		if w.startswith('WITH_')]))" | uniq
+

 clean: .FORCE
 	$(MAKE) -C "$(BUILD_DIR)" clean
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -19,10 +19,10 @@
 ####################################################################################################
 #
 # This is a build system used by platform maintainers to build library dependencies on
-# Windows, macOS and Linux.
+# Windows and macOS. There is some support for Linux as well, but not ready for releases.
 #
-# For users building Blender, we recommend using the precompiled libraries from lib/ on
-# Windows and macOS, and install_deps.sh on Linux.
+# Windows and macOS users should download the precompiled libraries in lib/, Linux users
+# should run install_deps.sh for building dependencies.
 #
 # WINDOWS USAGE:
 #   Don't call this cmake file your self, use build_deps.cmd
@@ -30,7 +30,7 @@
 #   build_deps 2015 x64 / build_deps 2015 x86
 #
 # MAC OS X USAGE:
-#	Install with homebrew: brew install autoconf automake libtool yasm nasm
+#	Install with homebrew: brew install autoconf automake libtool yasm openssl xz
 #   Run "make deps" from main Blender directory
 #
 # LINUX USAGE:
@@ -45,17 +45,6 @@ cmake_minimum_required(VERSION 3.5)
 include(ExternalProject)
 include(cmake/options.cmake)
 include(cmake/versions.cmake)
-
-if(ENABLE_MINGW64)
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-		include(cmake/setup_mingw64.cmake)
-	else()
-		include(cmake/setup_mingw32.cmake)
-	endif()
-else()
-	set(mingw_LIBDIR ${LIBDIR})
-endif()
-
 include(cmake/zlib.cmake)
 include(cmake/blendthumb.cmake)
 include(cmake/openal.cmake)
@@ -79,9 +68,6 @@ include(cmake/opencollada.cmake)
 include(cmake/opencolorio.cmake)
 include(cmake/llvm.cmake)
 include(cmake/clang.cmake)
-if(APPLE)
-  include(cmake/openmp.cmake)
-endif()
 include(cmake/openimageio.cmake)
 include(cmake/tiff.cmake)
 include(cmake/flexbison.cmake)
@@ -91,21 +77,21 @@ include(cmake/openvdb.cmake)
 include(cmake/python.cmake)
 include(cmake/python_site_packages.cmake)
 include(cmake/numpy.cmake)
-include(cmake/pugixml.cmake)
-
 if(WITH_WEBP)
 	include(cmake/webp.cmake)
 endif()
-
 if(WIN32)
-	# HMD branch deps
 	include(cmake/hidapi.cmake)
-	# OCIO deps
-	include(cmake/tinyxml.cmake)
-	include(cmake/yamlcpp.cmake)
-	# LCMS is an OCIO dep, but only if you build the apps, leaving it here for convenience
-	#include(cmake/lcms.cmake)
+endif()

+if(ENABLE_MINGW64)
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+		include(cmake/setup_mingw64.cmake)
+	else()
+		include(cmake/setup_mingw32.cmake)
+	endif()
+else()
+	set(mingw_LIBDIR ${LIBDIR})
 endif()

 if(NOT WIN32 OR ENABLE_MINGW64)
@@ -119,6 +105,8 @@ if(NOT WIN32 OR ENABLE_MINGW64)
 		include(cmake/vorbis.cmake)
 		include(cmake/theora.cmake)
 		include(cmake/vpx.cmake)
+		include(cmake/orc.cmake)
+		include(cmake/schroedinger.cmake)
 		include(cmake/x264.cmake)
 		include(cmake/xvidcore.cmake)
 		include(cmake/faad.cmake)
@@ -127,24 +115,17 @@ if(NOT WIN32 OR ENABLE_MINGW64)
 		include(cmake/sndfile.cmake)
 		if(WIN32)
 			include(cmake/iconv.cmake)
+			include(cmake/lapack.cmake)
 		endif()
 		if(UNIX)
 			include(cmake/flac.cmake)
-			include(cmake/xml2.cmake)
 			if(NOT APPLE)
 				include(cmake/spnav.cmake)
 				include(cmake/jemalloc.cmake)
+				include(cmake/xml2.cmake)
 			endif()
 		endif()
 	endif()
 endif()

-if(UNIX)
-	include(cmake/bzip2.cmake)
-	include(cmake/ffi.cmake)
-	include(cmake/lzma.cmake)
-	include(cmake/ssl.cmake)
-	include(cmake/sqlite.cmake)
-endif()
-
 include(cmake/harvest.cmake)
--- a/build_files/build_environment/cmake/alembic.cmake
+++ b/build_files/build_environment/cmake/alembic.cmake
@@ -26,12 +26,6 @@ if(ALEMBIC_HDF5)
 	endif()
 endif()

-if(WIN32)
-	set(ALEMBIC_ILMBASE ${LIBDIR}/openexr)
-else()
-	set(ALEMBIC_ILMBASE ${LIBDIR}/ilmbase)
-endif()
-
 set(ALEMBIC_EXTRA_ARGS
 	-DBUILDSTATIC=ON
 	-DLINKSTATIC=ON
@@ -44,13 +38,12 @@ set(ALEMBIC_EXTRA_ARGS
 	-DBoost_DEBUG=ON
 	-DBOOST_ROOT=${LIBDIR}/boost
 	-DBoost_NO_SYSTEM_PATHS=ON
-	-DILMBASE_ROOT=${ALEMBIC_ILMBASE}
-	-DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${ALEMBIC_ILMBASE}/include/OpenEXR
-	-DALEMBIC_ILMBASE_HALF_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DALEMBIC_ILMBASE_IMATH_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DALEMBIC_ILMBASE_ILMTHREAD_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DALEMBIC_ILMBASE_IEX_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DALEMBIC_ILMBASE_IEXMATH_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}IexMath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DILMBASE_ROOT=${LIBDIR}/ilmbase
+	-DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${LIBDIR}/ilmbase/include/OpenEXR
+	-DALEMBIC_ILMBASE_HALF_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${LIBEXT}
+	-DALEMBIC_ILMBASE_IMATH_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath-2_2${LIBEXT}
+	-DALEMBIC_ILMBASE_ILMTHREAD_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread-2_2${LIBEXT}
+	-DALEMBIC_ILMBASE_IEX_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex-2_2${LIBEXT}
 	-DUSE_PYILMBASE=0
 	-DUSE_PYALEMBIC=0
 	-DUSE_ARNOLD=0
@@ -79,27 +72,9 @@ ExternalProject_Add(external_alembic
 	INSTALL_DIR ${LIBDIR}/alembic
 )

-if(WIN32)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_alembic after_install
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/alembic ${HARVEST_TARGET}/alembic
-			DEPENDEES install
-		)
-	endif()
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(external_alembic after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/alembic/lib/alembic.lib ${HARVEST_TARGET}/alembic/lib/alembic_d.lib
-			DEPENDEES install
-		)
-	endif()
-endif()
-
-
-
 add_dependencies(
 	external_alembic
 	external_boost
 	external_zlib
 	external_ilmbase
-	external_openexr
 )
--- a/build_files/build_environment/cmake/blosc.cmake
+++ b/build_files/build_environment/cmake/blosc.cmake
@@ -25,18 +25,8 @@ set(BLOSC_EXTRA_ARGS
 	-DThreads_FOUND=1
 	-DPTHREAD_LIBS=${LIBDIR}/pthreads/lib/pthreadVC2.lib
 	-DPTHREAD_INCLUDE_DIR=${LIBDIR}/pthreads/inc
-	-DDEACTIVATE_SNAPPY=ON
-	-DCMAKE_POSITION_INDEPENDENT_CODE=ON
 )

-if(WIN32)
-	#prevent blosc from including it's own local copy of zlib in the object file
-	#and cause linker errors with everybody else
-	set(BLOSC_EXTRA_ARGS ${BLOSC_EXTRA_ARGS}
-		-DPREFER_EXTERNAL_ZLIB=ON
-	)
-endif()
-
 ExternalProject_Add(external_blosc
 	URL ${BLOSC_URI}
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
@@ -57,19 +47,3 @@ if(WIN32)
 		external_pthreads
 	)
 endif()
-
-if (WIN32)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_blosc after_install
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc.lib ${HARVEST_TARGET}/blosc/lib/libblosc.lib
-			COMMAND	${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/blosc/include/ ${HARVEST_TARGET}/blosc/include/
-			DEPENDEES install
-		)
-	endif()
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(external_blosc after_install
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc_d.lib ${HARVEST_TARGET}/blosc/lib/libblosc_d.lib
-			DEPENDEES install
-		)
-	endif()
-endif()
--- a/build_files/build_environment/cmake/boost.cmake
+++ b/build_files/build_environment/cmake/boost.cmake
@@ -16,8 +16,6 @@
 #
 # ***** END GPL LICENSE BLOCK *****

-set(BOOST_ADDRESS_MODEL 64)
-
 if(WIN32)
 	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
 		set(PYTHON_ARCH x64)
@@ -27,11 +25,16 @@ if(WIN32)
 		set(PYTHON_ARCH x86)
 		set(PYTHON_ARCH2 win32)
 		set(PYTHON_OUTPUTDIR ${BUILD_DIR}/python/src/external_python/pcbuild/win32/)
-		set(BOOST_ADDRESS_MODEL 32)
+	endif()
+	if(MSVC12)
+		set(BOOST_TOOLSET toolset=msvc-12.0)
+		set(BOOST_COMPILER_STRING -vc120)
+		set(PYTHON_COMPILER_STRING v120)
 	endif()
 	if(MSVC14)
 		set(BOOST_TOOLSET toolset=msvc-14.0)
 		set(BOOST_COMPILER_STRING -vc140)
+		set(PYTHON_COMPILER_STRING v140)
 	endif()
 	set(JAM_FILE ${BUILD_DIR}/boost/src/external_boost/user-config.jam)
 	set(semi_path "${PATCH_DIR}/semi.txt")
@@ -48,26 +51,22 @@ if(WIN32)
 	#set(BOOST_WITH_PYTHON --with-python)
 	set(BOOST_HARVEST_CMD 	${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ )
 	if(BUILD_MODE STREQUAL Release)
-		set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-1_68/ ${HARVEST_TARGET}/boost/include/)
+		set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-1_60/ ${HARVEST_TARGET}/boost/include/)
 	endif()
+	set(BOOST_PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/boost/src/external_boost < ${PATCH_DIR}/boost.diff)

 elseif(APPLE)
 	set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
-	set(BOOST_BUILD_COMMAND ./b2)
-	set(BOOST_BUILD_OPTIONS toolset=darwin cxxflags=${PLATFORM_CXXFLAGS} linkflags=${PLATFORM_LDFLAGS} --disable-icu boost.locale.icu=off)
+	set(BOOST_BUILD_COMMAND ./bjam)
+	set(BOOST_BUILD_OPTIONS toolset=clang cxxflags=${PLATFORM_CXXFLAGS} linkflags=${PLATFORM_LDFLAGS} --disable-icu boost.locale.icu=off)
 	set(BOOST_HARVEST_CMD echo .)
 	set(BOOST_PATCH_COMMAND echo .)
 else()
 	set(BOOST_HARVEST_CMD echo .)
 	set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
-	set(BOOST_BUILD_COMMAND ./b2)
+	set(BOOST_BUILD_COMMAND ./bjam)
 	set(BOOST_BUILD_OPTIONS cxxflags=${PLATFORM_CXXFLAGS} --disable-icu boost.locale.icu=off)
 	set(BOOST_PATCH_COMMAND echo .)
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-		set(BOOST_ADDRESS_MODEL 64)
-	else()
-		set(BOOST_ADDRESS_MODEL 32)
-	endif()
 endif()

 set(BOOST_OPTIONS
@@ -86,17 +85,23 @@ set(BOOST_OPTIONS
 	${BOOST_TOOLSET}
 )

+if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+	set(BOOST_ADDRESS_MODEL 64)
+else()
+	set(BOOST_ADDRESS_MODEL 32)
+endif()
+
 string(TOLOWER ${BUILD_MODE} BOOST_BUILD_TYPE)

 ExternalProject_Add(external_boost
 	URL ${BOOST_URI}
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${BOOST_HASH}
+	URL_HASH MD5=${BOOST_MD5}
 	PREFIX ${BUILD_DIR}/boost
 	UPDATE_COMMAND	""
 	PATCH_COMMAND ${BOOST_PATCH_COMMAND}
 	CONFIGURE_COMMAND ${BOOST_CONFIGURE_COMMAND}
-	BUILD_COMMAND ${BOOST_BUILD_COMMAND} ${BOOST_BUILD_OPTIONS} -j${MAKE_THREADS} architecture=x86 address-model=${BOOST_ADDRESS_MODEL} link=static threading=multi ${BOOST_OPTIONS}	--prefix=${LIBDIR}/boost install
+	BUILD_COMMAND ${BOOST_BUILD_COMMAND} ${BOOST_BUILD_OPTIONS} -j${MAKE_THREADS} architecture=x86 address-model=${BOOST_ADDRESS_MODEL} variant=${BOOST_BUILD_TYPE} link=static threading=multi ${BOOST_OPTIONS}	--prefix=${LIBDIR}/boost install
 	BUILD_IN_SOURCE 1
 	INSTALL_COMMAND "${BOOST_HARVEST_CMD}"
 )
--- a/build_files/build_environment/cmake/bzip2.cmake
+++ b/build_files/build_environment/cmake/bzip2.cmake
@@ -1,39 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(BZIP2_PREFIX "${LIBDIR}/bzip2")
-set(BZIP2_CONFIGURE_ENV echo .)
-set(BZIP2_CONFIGURATION_ARGS)
-
-if(UNIX AND NOT APPLE)
-	set(BZIP2_LDFLAGS "-Wl,--as-needed")
-	set(BZIP2_CFLAGS "-fPIC -Wall -Winline -O2 -g -D_FILE_OFFSET_BITS=64")
-	set(BZIP2_CONFIGURE_ENV ${BZIP2_CONFIGURE_ENV} && export LDFLAGS=${BZIP2_LDFLAGS} && export CFLAGS=${BZIP2_CFLAGS}
-		&& export PREFIX=${BZIP2_PREFIX})
-endif()
-
-ExternalProject_Add(external_bzip2
-	URL ${BZIP2_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH SHA256=${BZIP2_HASH}
-	PREFIX ${BUILD_DIR}/bzip2
-	CONFIGURE_COMMAND echo .
-	BUILD_COMMAND ${BZIP2_CONFIGURE_ENV} && cd ${BUILD_DIR}/bzip2/src/external_bzip2/ && make CFLAGS=${BZIP2_CFLAGS} LDFLAGS=${BZIP2_LDFLAGS} -j${MAKE_THREADS}
-	INSTALL_COMMAND ${BZIP2_CONFIGURE_ENV} && cd ${BUILD_DIR}/bzip2/src/external_bzip2/ && make CFLAGS=${BZIP2_CFLAGS} LDFLAGS=${BZIP2_LDFLAGS} PREFIX=${BZIP2_PREFIX} install
-	INSTALL_DIR ${LIBDIR}/bzip2
-)
--- a/build_files/build_environment/cmake/clang.cmake
+++ b/build_files/build_environment/cmake/clang.cmake
@@ -21,22 +21,13 @@ set(CLANG_EXTRA_ARGS
 	-DCLANG_PATH_TO_LLVM_BUILD=${LIBDIR}/llvm
 	-DLLVM_USE_CRT_RELEASE=MT
 	-DLLVM_USE_CRT_DEBUG=MTd
-	-DLLVM_CONFIG=${LIBDIR}/llvm/bin/llvm-config
 )
-
-if(WIN32)
-	set(CLANG_GENERATOR "Ninja")
-else()
-	set(CLANG_GENERATOR "Unix Makefiles")
-endif()
-
-
 ExternalProject_Add(external_clang
 	URL ${CLANG_URI}
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
 	URL_HASH MD5=${CLANG_HASH}
+	PATCH_COMMAND ${PATCH_CMD} -p 2 -N -R -d ${BUILD_DIR}/clang/src/external_clang < ${PATCH_DIR}/clang.diff
 	PREFIX ${BUILD_DIR}/clang
-	CMAKE_GENERATOR ${CLANG_GENERATOR}
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/clang ${DEFAULT_CMAKE_FLAGS} ${CLANG_EXTRA_ARGS}
 	INSTALL_DIR ${LIBDIR}/clang
 )
--- a/build_files/build_environment/cmake/faad.cmake
+++ b/build_files/build_environment/cmake/faad.cmake
@@ -18,18 +18,13 @@

 set(FAAD_EXTRA_ARGS)

-if (WIN32)
-	set(FAAD_EXTRA_CONFIGURE "utils\\win32\\ac2ver.exe" "faad2" "configure.ac" > libfaad\\win32_ver.h)
-else()
-	set(FAAD_EXTRA_CONFIGURE echo .)
-endif()
-
 ExternalProject_Add(external_faad
 	URL ${FAAD_URI}
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
 	URL_HASH MD5=${FAAD_HASH}
 	PREFIX ${BUILD_DIR}/faad
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && ${FAAD_EXTRA_CONFIGURE} && ${CONFIGURE_COMMAND} --disable-shared --enable-static --prefix=${LIBDIR}/faad
+	PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/faad/src/external_faad < ${PATCH_DIR}/libfaad.diff
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && ${CONFIGURE_COMMAND} --disable-shared --enable-static --prefix=${LIBDIR}/faad
 	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make -j${MAKE_THREADS}
 	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make install
 	INSTALL_DIR ${LIBDIR}/faad
--- a/build_files/build_environment/cmake/ffi.cmake
+++ b/build_files/build_environment/cmake/ffi.cmake
@@ -1,40 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-ExternalProject_Add(external_ffi
-	URL ${FFI_URI}
-	URL_HASH SHA256=${FFI_HASH}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	PREFIX ${BUILD_DIR}/ffi
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ffi/src/external_ffi/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ffi
-		--enable-shared=no
-		--enable-static=yes
-		--with-pic
-		--libdir=${LIBDIR}/ffi/lib/
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ffi/src/external_ffi/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ffi/src/external_ffi/ && make install
-	PATCH_COMMAND ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/ffi/src/external_ffi < ${PATCH_DIR}/ffi.diff
-	INSTALL_DIR ${LIBDIR}/ffi
-)
-
-if (UNIX AND NOT APPLE)
-	ExternalProject_Add_Step(external_ffi after_install
-		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/ffi/lib/libffi.a ${LIBDIR}/ffi/lib/libffi_pic.a
-		DEPENDEES install
-	)
-endif()
--- a/build_files/build_environment/cmake/ffmpeg.cmake
+++ b/build_files/build_environment/cmake/ffmpeg.cmake
@@ -16,10 +16,10 @@
 #
 # ***** END GPL LICENSE BLOCK *****

-set(FFMPEG_CFLAGS "-I${mingw_LIBDIR}/lame/include -I${mingw_LIBDIR}/openjpeg/include/ -I${mingw_LIBDIR}/ogg/include -I${mingw_LIBDIR}/vorbis/include -I${mingw_LIBDIR}/theora/include -I${mingw_LIBDIR}/vpx/include -I${mingw_LIBDIR}/x264/include -I${mingw_LIBDIR}/xvidcore/include -I${mingw_LIBDIR}/zlib/include")
-set(FFMPEG_LDFLAGS "-L${mingw_LIBDIR}/lame/lib -L${mingw_LIBDIR}/openjpeg/lib -L${mingw_LIBDIR}/ogg/lib -L${mingw_LIBDIR}/vorbis/lib -L${mingw_LIBDIR}/theora/lib -L${mingw_LIBDIR}/vpx/lib -L${mingw_LIBDIR}/x264/lib -L${mingw_LIBDIR}/xvidcore/lib -L${mingw_LIBDIR}/zlib/lib")
-set(FFMPEG_EXTRA_FLAGS --pkg-config-flags=--static --extra-cflags=${FFMPEG_CFLAGS} --extra-ldflags=${FFMPEG_LDFLAGS})
-set(FFMPEG_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/openjpeg/lib/pkgconfig:${mingw_LIBDIR}/x264/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR})
+set(FFMPEG_CFLAGS "-I${mingw_LIBDIR}/lame/include -I${mingw_LIBDIR}/openjpeg/include/ -I${mingw_LIBDIR}/ogg/include -I${mingw_LIBDIR}/vorbis/include -I${mingw_LIBDIR}/theora/include -I${mingw_LIBDIR}/vpx/include -I${mingw_LIBDIR}/x264/include -I${mingw_LIBDIR}/xvidcore/include -I${mingw_LIBDIR}/dirac/include/dirac -I${mingw_LIBDIR}/schroedinger/include/schroedinger-1.0 -I${mingw_LIBDIR}/zlib/include")
+set(FFMPEG_LDFLAGS "-L${mingw_LIBDIR}/lame/lib -L${mingw_LIBDIR}/openjpeg/lib -L${mingw_LIBDIR}/ogg/lib -L${mingw_LIBDIR}/vorbis/lib -L${mingw_LIBDIR}/theora/lib -L${mingw_LIBDIR}/vpx/lib -L${mingw_LIBDIR}/x264/lib -L${mingw_LIBDIR}/xvidcore/lib -L${mingw_LIBDIR}/dirac/lib -L${mingw_LIBDIR}/schroedinger/lib -L${mingw_LIBDIR}/orc/lib -L${mingw_LIBDIR}/zlib/lib")
+set(FFMPEG_EXTRA_FLAGS --extra-cflags=${FFMPEG_CFLAGS} --extra-ldflags=${FFMPEG_LDFLAGS})
+set(FFMPEG_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/schroedinger/lib/pkgconfig:${mingw_LIBDIR}/orc/lib/pkgconfig:${mingw_LIBDIR}/x264/lib/pkgconfig:${mingw_LIBDIR})

 if(WIN32)
 	set(FFMPEG_ENV set ${FFMPEG_ENV} &&)
@@ -31,12 +31,6 @@ if(WIN32)
 		--disable-pthreads
 		--enable-libopenjpeg
 	)
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
-		set(FFMPEG_EXTRA_FLAGS
-			${FFMPEG_EXTRA_FLAGS}
-			--x86asmexe=yasm
-		)
-	endif()
 else()
 	set(FFMPEG_EXTRA_FLAGS
 		${FFMPEG_EXTRA_FLAGS}
@@ -57,11 +51,6 @@ ExternalProject_Add(external_ffmpeg
 	URL ${FFMPEG_URI}
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
 	URL_HASH MD5=${FFMPEG_HASH}
-	# OpenJpeg is compiled with pthread support on Linux, which is all fine and is what we
-	# want for maximum runtime performance, but due to static nature of that library we
-	# need to force ffmpeg to link against pthread, otherwise test program used by autoconf
-	# will fail. This patch does that in a way that is compatible with multiple distributions.
-	PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/ffmpeg/src/external_ffmpeg < ${PATCH_DIR}/ffmpeg.diff
 	PREFIX ${BUILD_DIR}/ffmpeg
 	CONFIGURE_COMMAND ${CONFIGURE_ENV_NO_PERL} &&
 		cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ &&
@@ -74,6 +63,7 @@ ExternalProject_Add(external_ffmpeg
 		--disable-libspeex
 		--enable-libvpx
 		--prefix=${LIBDIR}/ffmpeg
+		--enable-libschroedinger
 		--enable-libtheora
 		--enable-libvorbis
 		--enable-zlib
@@ -83,6 +73,7 @@ ExternalProject_Add(external_ffmpeg
 		--disable-nonfree
 		--enable-gpl
 		--disable-postproc
+		--disable-x11grab
 		--enable-libmp3lame
 		--disable-librtmp
 		--enable-libx264
@@ -100,8 +91,9 @@ ExternalProject_Add(external_ffmpeg
 		--disable-securetransport
 		--disable-indev=avfoundation
 		--disable-indev=qtkit
-		--disable-sdl2
+		--disable-sdl
 		--disable-gnutls
+		--disable-vda
 		--disable-videotoolbox
 		--disable-libxcb
 		--disable-xlib
@@ -112,6 +104,7 @@ ExternalProject_Add(external_ffmpeg
 		--disable-indev=alsa
 		--disable-outdev=alsa
 		--disable-crystalhd
+	PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/ffmpeg/src/external_ffmpeg < ${PATCH_DIR}/ffmpeg.diff
 	BUILD_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make -j${MAKE_THREADS}
 	INSTALL_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make install
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ffmpeg ${DEFAULT_CMAKE_FLAGS}
@@ -129,6 +122,7 @@ add_dependencies(
 	external_openjpeg
 	external_xvidcore
 	external_x264
+	external_schroedinger
 	external_vpx
 	external_theora
 	external_vorbis
@@ -141,11 +135,3 @@ if(WIN32)
 		external_zlib_mingw
 	)
 endif()
-
-if(BUILD_MODE STREQUAL Release AND WIN32)
-	ExternalProject_Add_Step(external_ffmpeg after_install
-		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/include ${HARVEST_TARGET}/ffmpeg/include
-		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/bin ${HARVEST_TARGET}/ffmpeg/lib
-		DEPENDEES install
-	)
-endif()
--- a/build_files/build_environment/cmake/fftw.cmake
+++ b/build_files/build_environment/cmake/fftw.cmake
@@ -37,11 +37,4 @@ ExternalProject_Add(external_fftw3

 if(MSVC)
 	set_target_properties(external_fftw3 PROPERTIES FOLDER Mingw)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_fftw3 after_install
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/lib/libfftw3.a ${HARVEST_TARGET}/fftw3/lib/libfftw.lib
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/include/fftw3.h ${HARVEST_TARGET}/fftw3/include/fftw3.h
-			DEPENDEES install
-		)
-	endif()
 endif()
--- a/build_files/build_environment/cmake/freetype.cmake
+++ b/build_files/build_environment/cmake/freetype.cmake
@@ -16,15 +16,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****

-set(FREETYPE_EXTRA_ARGS
-	-DCMAKE_RELEASE_POSTFIX:STRING=2ST
-	-DCMAKE_DEBUG_POSTFIX:STRING=2ST_d
-	-DWITH_BZip2=OFF
-	-DWITH_HarfBuzz=OFF
-	-DFT_WITH_HARFBUZZ=OFF
-	-DFT_WITH_BZIP2=OFF
-	-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE
-	-DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE)
+set(FREETYPE_EXTRA_ARGS -DCMAKE_RELEASE_POSTFIX:STRING=2ST -DCMAKE_DEBUG_POSTFIX:STRING=2ST_d -DWITH_BZip2=OFF -DWITH_HarfBuzz=OFF)

 ExternalProject_Add(external_freetype
 	URL ${FREETYPE_URI}
@@ -32,13 +24,5 @@ ExternalProject_Add(external_freetype
 	URL_HASH MD5=${FREETYPE_HASH}
 	PREFIX ${BUILD_DIR}/freetype
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/freetype ${DEFAULT_CMAKE_FLAGS} ${FREETYPE_EXTRA_ARGS}
-	PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/freetype/src/external_freetype < ${PATCH_DIR}/freetype.diff
 	INSTALL_DIR ${LIBDIR}/freetype
 )
-
-if(BUILD_MODE STREQUAL Release AND WIN32)
-	ExternalProject_Add_Step(external_freetype after_install
-		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype ${HARVEST_TARGET}/freetype
-		DEPENDEES install
-	)
-endif()
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -28,16 +28,43 @@ message("HARVEST_TARGET = ${HARVEST_TARGET}")
 if(WIN32)
 if(BUILD_MODE STREQUAL Release)
 	add_custom_target(Harvest_Release_Results
-		COMMAND # jpeg rename libfile + copy include
+				# Zlib Rename the lib file and copy the include/bin folders
+		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstatic.lib ${HARVEST_TARGET}/zlib/lib/libz_st.lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zlib/include/ ${HARVEST_TARGET}/zlib/include/ &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zlib/bin/ ${HARVEST_TARGET}/zlib/bin/ &&
+				# jpeg rename libfile + copy include
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
+				# FreeType, straight up copy
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype ${HARVEST_TARGET}/freetype &&
+				# pthreads, rename include dir
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/inc/ ${HARVEST_TARGET}/pthreads/include/ &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/lib/ ${HARVEST_TARGET}/pthreads/lib &&
+				# ffmpeg copy include+bin
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/include ${HARVEST_TARGET}/ffmpeg/include &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/bin ${HARVEST_TARGET}/ffmpeg/lib &&
+				# sdl merge bin/lib folder, copy include
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/include/sdl2 ${HARVEST_TARGET}/sdl/include &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/lib ${HARVEST_TARGET}/sdl/lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/bin ${HARVEST_TARGET}/sdl/lib &&
+				# openal
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/lib/openal32.lib ${HARVEST_TARGET}/openal/lib/openal32.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/bin/openal32.dll ${HARVEST_TARGET}/openal/lib/openal32.dll &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openal/include/ ${HARVEST_TARGET}/openal/include/ &&
 				# OpenImageIO
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include &&
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib &&
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/idiff.exe ${HARVEST_TARGET}/OpenImageIO/bin/idiff.exe &&
+				# openEXR
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ilmbase ${HARVEST_TARGET}/openexr &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${HARVEST_TARGET}/openexr/lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/include ${HARVEST_TARGET}/openexr/include &&
 				# png
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib ${HARVEST_TARGET}/png/lib/libpng.lib &&
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/ &&
+				# fftw3
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/lib/libfftw3.a ${HARVEST_TARGET}/fftw3/lib/libfftw.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/include/fftw3.h ${HARVEST_TARGET}/fftw3/include/fftw3.h &&
 				# freeglut-> opengl
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/freeglut/lib/freeglut_static.lib ${HARVEST_TARGET}/opengl/lib/freeglut_static.lib &&
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freeglut/include/ ${HARVEST_TARGET}/opengl/include/ &&
@@ -51,9 +78,37 @@ if(BUILD_MODE STREQUAL Release)
 				# tiff
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiff.lib ${HARVEST_TARGET}/tiff/lib/libtiff.lib &&
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tiff/include/ ${HARVEST_TARGET}/tiff/include/ &&
+				# iconv
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/iconv/lib/libiconv.a ${HARVEST_TARGET}/iconv/lib/iconv.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/iconv/include/iconv.h ${HARVEST_TARGET}/iconv/include/iconv.h &&
+				# opencolorIO
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenColorIO/ ${HARVEST_TARGET}/opencolorio &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenColorIO/lib/OpenColorIO.dll ${HARVEST_TARGET}/opencolorio/bin/OpenColorIO.dll &&
+				# Osl
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/osl/ ${HARVEST_TARGET}/osl &&
+				# OpenVDB
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openVDB/ ${HARVEST_TARGET}/openVDB &&
+				# blosc
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc.lib ${HARVEST_TARGET}/blosc/lib/libblosc.lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/blosc/include/ ${HARVEST_TARGET}/blosc/include/ &&
+				# tbb
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb.lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tbb/include/ ${HARVEST_TARGET}/tbb/include/ &&
+				# opencollada
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencollada/ ${HARVEST_TARGET}/opencollada/ &&
+				# opensubdiv
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opensubdiv ${HARVEST_TARGET}/opensubdiv &&
+				# python
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/python/ ${HARVEST_TARGET}/python/ &&
+				# alembic
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/alembic ${HARVEST_TARGET}/alembic &&
 				# BlendThumb
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/BlendThumb64/bin/blendthumb.dll ${HARVEST_TARGET}/ThumbHandler/lib/BlendThumb64.dll &&
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/BlendThumb32/bin/blendthumb.dll ${HARVEST_TARGET}/ThumbHandler/lib/BlendThumb.dll &&
+				# python
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}.tar.gz &&
+				# numpy
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}.tar.gz &&
 				# hidapi
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hidapi/ ${HARVEST_TARGET}/hidapi/ &&
 				# webp, straight up copy
@@ -67,8 +122,43 @@ if(BUILD_MODE STREQUAL Debug)
 				# OpenImageIO
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_d.lib &&
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_Util.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_Util_d.lib &&
+				# ilmbase+openexr
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/ilmbase/lib/Half.lib ${HARVEST_TARGET}/openexr/lib/Half_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/ilmbase/lib/Iex-2_2.lib ${HARVEST_TARGET}/openexr/lib/Iex-2_2_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/ilmbase/lib/IexMath-2_2.lib ${HARVEST_TARGET}/openexr/lib/IexMath-2_2_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/ilmbase/lib/IlmThread-2_2.lib ${HARVEST_TARGET}/openexr/lib/IlmThread-2_2_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/ilmbase/lib/Imath-2_2.lib ${HARVEST_TARGET}/openexr/lib/Imath-2_2_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/lib/IlmImf-2_2.lib ${HARVEST_TARGET}/openexr/lib/IlmImf-2_2_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/lib/IlmImfUtil-2_2.lib ${HARVEST_TARGET}/openexr/lib/IlmImfUtil-2_2_d.lib &&
+				# opencollada
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/buffer.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/buffer_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/ftoa.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/ftoa_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/GeneratedSaxParser.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/GeneratedSaxParser_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/MathMLSolver.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/MathMLSolver_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADABaseUtils.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADABaseUtils_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADAFramework.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADAFramework_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADAStreamWriter.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADAStreamWriter_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/pcre.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/pcre_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/UTF.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/UTF_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/xml.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/xml_d.lib &&
+				# blosc
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc_d.lib ${HARVEST_TARGET}/blosc/lib/libblosc_d.lib &&
+				# osl
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslcomp.lib ${HARVEST_TARGET}/osl/lib/oslcomp_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslexec.lib ${HARVEST_TARGET}/osl/lib/oslexec_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslquery.lib ${HARVEST_TARGET}/osl/lib/oslquery_d.lib &&
+				# opensubdiv
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opensubdiv/lib/osdCPU.lib ${HARVEST_TARGET}/opensubdiv/lib/osdCPU_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opensubdiv/lib/osdGPU.lib ${HARVEST_TARGET}/opensubdiv/lib/osdGPU_d.lib &&
+				# tbb
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb_debug.lib &&
+				# openvdb
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/openvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb_d.lib &&
 				# python
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/python/ ${HARVEST_TARGET}/python/ &&
+				# alembic
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/alembic/lib/alembic.lib ${HARVEST_TARGET}/alembic/lib/alembic_d.lib &&
 				# hdf5
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hdf5/lib ${HARVEST_TARGET}/hdf5/lib &&
 				# numpy
@@ -111,6 +201,7 @@ endfunction()
 harvest(alembic/include alembic/include "*.h")
 harvest(alembic/lib/libAlembic.a alembic/lib/libAlembic.a)
 harvest(alembic/bin alembic/bin "*")
+harvest(blosc/lib openvdb/lib "*.a")
 harvest(boost/include boost/include "*")
 harvest(boost/lib boost/lib "*.a")
 harvest(ffmpeg/include ffmpeg/include "*.h")
@@ -135,24 +226,11 @@ harvest(ogg/lib ffmpeg/lib "*.a")
 harvest(openal/include openal/include "*.h")
 if(UNIX AND NOT APPLE)
 	harvest(openal/lib openal/lib "*.a")
-
-	harvest(blosc/include blosc/include "*.h")
-	harvest(blosc/lib blosc/lib "*.a")
-
-	harvest(zlib/include zlib/include "*.h")
-	harvest(zlib/lib zlib/lib "*.a")
-
-	harvest(xml2/include xml2/include "*.h")
-	harvest(xml2/lib xml2/lib "*.a")
-else()
-	harvest(blosc/lib openvdb/lib "*.a")
-	harvest(xml2/lib opencollada/lib "*.a")
 endif()
 harvest(opencollada/include/opencollada opencollada/include "*.h")
 harvest(opencollada/lib/opencollada opencollada/lib "*.a")
 harvest(opencolorio/include opencolorio/include "*.h")
 harvest(opencolorio/lib opencolorio/lib "*.a")
-harvest(opencolorio/lib/static opencolorio/lib "*.a")
 harvest(openexr/include openexr/include "*.h")
 harvest(openexr/lib openexr/lib "*.a")
 harvest(openimageio/bin openimageio/bin "idiff")
@@ -160,12 +238,13 @@ harvest(openimageio/bin openimageio/bin "maketx")
 harvest(openimageio/bin openimageio/bin "oiiotool")
 harvest(openimageio/include openimageio/include "*")
 harvest(openimageio/lib openimageio/lib "*.a")
-harvest(openjpeg/include/openjpeg-2.3 openjpeg/include "*.h")
+harvest(openjpeg/include/openjpeg-1.5 openjpeg/include "*.h")
 harvest(openjpeg/lib openjpeg/lib "*.a")
 harvest(opensubdiv/include opensubdiv/include "*.h")
 harvest(opensubdiv/lib opensubdiv/lib "*.a")
-harvest(openvdb/include/openvdb openvdb/include/openvdb "*.h")
+harvest(openvdb/include/openvdb/openvdb openvdb/include/openvdb "*.h")
 harvest(openvdb/lib openvdb/lib "*.a")
+harvest(orc/lib/liborc-0.4.a ffmpeg/lib/liborc.a)
 harvest(osl/bin osl/bin "oslc")
 harvest(osl/include osl/include "*.h")
 harvest(osl/lib osl/lib "*.a")
@@ -175,6 +254,7 @@ harvest(png/lib png/lib "*.a")
 harvest(python/bin python/bin "python${PYTHON_SHORT_VERSION}m")
 harvest(python/include python/include "*h")
 harvest(python/lib python/lib "*")
+harvest(schroedinger/lib/libschroedinger-1.0.a ffmpeg/lib/libschroedinger.a)
 harvest(sdl/include/SDL2 sdl/include "*.h")
 harvest(sdl/lib sdl/lib "libSDL2.a")
 harvest(sndfile/include sndfile/include "*.h")
@@ -190,6 +270,7 @@ harvest(vorbis/lib ffmpeg/lib "*.a")
 harvest(vpx/lib ffmpeg/lib "*.a")
 harvest(webp/lib ffmpeg/lib "*.a")
 harvest(x264/lib ffmpeg/lib "*.a")
+harvest(xml2/lib opencollada/lib "*.a")
 harvest(xvidcore/lib ffmpeg/lib "*.a")

 endif()
--- a/build_files/build_environment/cmake/iconv.cmake
+++ b/build_files/build_environment/cmake/iconv.cmake
@@ -31,11 +31,4 @@ ExternalProject_Add(external_iconv

 if(MSVC)
 	set_target_properties(external_iconv PROPERTIES FOLDER Mingw)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_iconv after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/iconv/lib/libiconv.a ${HARVEST_TARGET}/iconv/lib/iconv.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/iconv/include/iconv.h ${HARVEST_TARGET}/iconv/include/iconv.h
-			DEPENDEES install
-		)
-	endif()
 endif()
--- a/build_files/build_environment/cmake/ilmbase.cmake
+++ b/build_files/build_environment/cmake/ilmbase.cmake
@@ -18,41 +18,18 @@

 if(WIN32)
 	set(ILMBASE_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
-	set(ILMBASE_EXTRA_ARGS
-		-DBUILD_SHARED_LIBS=OFF
-		-DCMAKE_CXX_STANDARD_LIBRARIES=${ILMBASE_CMAKE_CXX_STANDARD_LIBRARIES}
-	)
-
-	ExternalProject_Add(external_ilmbase
-		URL ${ILMBASE_URI}
-		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-		URL_HASH MD5=${ILMBASE_HASH}
-		PREFIX ${BUILD_DIR}/ilmbase
-		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ilmbase ${DEFAULT_CMAKE_FLAGS} ${ILMBASE_EXTRA_ARGS}
-		INSTALL_DIR ${LIBDIR}/openexr
-	)
-
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_ilmbase after_install
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ilmbase ${HARVEST_TARGET}/openexr
-			DEPENDEES install
-		)
-	endif()
-
-else()
-	set(ILMBASE_EXTRA_ARGS
-		--enable-static
-		--disable-shared
-		--enable-cxxstd=11
-	)
-	ExternalProject_Add(external_ilmbase
-		URL ${ILMBASE_URI}
-		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-		URL_HASH MD5=${ILMBASE_HASH}
-		PREFIX ${BUILD_DIR}/ilmbase
-		CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ilmbase/src/external_ilmbase/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ilmbase ${ILMBASE_EXTRA_ARGS}
-		BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ilmbase/src/external_ilmbase/ && make -j${MAKE_THREADS}
-		INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ilmbase/src/external_ilmbase/ && make install
-		INSTALL_DIR ${LIBDIR}/openexr
-	)
 endif()
+
+set(ILMBASE_EXTRA_ARGS
+	-DBUILD_SHARED_LIBS=OFF
+	-DCMAKE_CXX_STANDARD_LIBRARIES=${ILMBASE_CMAKE_CXX_STANDARD_LIBRARIES}
+)
+
+ExternalProject_Add(external_ilmbase
+	URL ${ILMBASE_URI}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	URL_HASH MD5=${ILMBASE_HASH}
+	PREFIX ${BUILD_DIR}/ilmbase
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ilmbase ${DEFAULT_CMAKE_FLAGS} ${ILMBASE_EXTRA_ARGS}
+	INSTALL_DIR ${LIBDIR}/openexr
+)
--- a/build_files/build_environment/cmake/jpeg.cmake
+++ b/build_files/build_environment/cmake/jpeg.cmake
@@ -18,7 +18,7 @@

 if(WIN32)
 	# cmake for windows
-	set(JPEG_EXTRA_ARGS -DNASM=${NASM_PATH} -DWITH_JPEG8=ON  -DCMAKE_DEBUG_POSTFIX=d)
+	set(JPEG_EXTRA_ARGS  -DWITH_JPEG8=ON  -DCMAKE_DEBUG_POSTFIX=d)

 	ExternalProject_Add(external_jpeg
 		URL ${JPEG_URI}
--- a/build_files/build_environment/cmake/lame.cmake
+++ b/build_files/build_environment/cmake/lame.cmake
@@ -36,7 +36,7 @@ ExternalProject_Add(external_lame
 		--disable-mp3x
 		--disable-mp3rtp
 		--disable-gtktest
-		--disable-frontend
+		--enable-export=full
 	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && make -j${MAKE_THREADS}
 	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && make install
 	INSTALL_DIR ${LIBDIR}/lame
--- a/build_files/build_environment/cmake/lapack.cmake
+++ b/build_files/build_environment/cmake/lapack.cmake
@@ -0,0 +1,43 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+set(LAPACK_EXTRA_ARGS)
+
+if(WIN32)
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+		set(LAPACK_EXTRA_ARGS -G "MSYS Makefiles" -DCMAKE_Fortran_COMPILER=${DOWNLOAD_DIR}/mingw/mingw64/bin/gfortran.exe)
+	else()
+		set(LAPACK_EXTRA_ARGS -G "MSYS Makefiles" -DCMAKE_Fortran_COMPILER=${DOWNLOAD_DIR}/mingw/mingw32/bin/gfortran.exe)
+	endif()
+endif()
+
+ExternalProject_Add(external_lapack
+	URL ${LAPACK_URI}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	URL_HASH MD5=${LAPACK_HASH}
+	PREFIX ${BUILD_DIR}/lapack
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lapack/src/external_lapack/ && ${CMAKE_COMMAND} ${LAPACK_EXTRA_ARGS} -DBUILD_TESTING=Off -DCMAKE_INSTALL_PREFIX=${LIBDIR}/lapack .
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lapack/src/external_lapack/ && make -j${MAKE_THREADS}
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lapack/src/external_lapack/ && make install
+
+	INSTALL_DIR ${LIBDIR}/lapack
+)
+
+if(MSVC)
+	set_target_properties(external_lapack PROPERTIES FOLDER Mingw)
+endif()
--- a/build_files/build_environment/cmake/lcms.cmake
+++ b/build_files/build_environment/cmake/lcms.cmake
@@ -1,31 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(LCMS_EXTRA_ARGS
-)
-
-ExternalProject_Add(external_lcms
-	URL ${LCMS_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${LCMS_HASH}
-	PREFIX ${BUILD_DIR}/lcms
-	#patch taken from ocio
-	PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_lcms.txt ${BUILD_DIR}/lcms/src/external_lcms/CMakeLists.txt
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/lcms ${DEFAULT_CMAKE_FLAGS} ${LCMS_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/lcms
-)
--- a/build_files/build_environment/cmake/llvm.cmake
+++ b/build_files/build_environment/cmake/llvm.cmake
@@ -26,7 +26,7 @@ set(LLVM_EXTRA_ARGS
 )

 if(WIN32)
-	set(LLVM_GENERATOR "Ninja")
+	set(LLVM_GENERATOR "NMake Makefiles")
 else()
 	set(LLVM_GENERATOR "Unix Makefiles")
 endif()
@@ -38,6 +38,7 @@ ExternalProject_Add(ll
 	URL_HASH MD5=${LLVM_HASH}
 	CMAKE_GENERATOR ${LLVM_GENERATOR}
 	PREFIX ${BUILD_DIR}/ll
+	PATCH_COMMAND ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/ll/src/ll < ${PATCH_DIR}/llvm-alloca-fix.diff
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/llvm ${DEFAULT_CMAKE_FLAGS} ${LLVM_EXTRA_ARGS}
 	INSTALL_DIR ${LIBDIR}/llvm
 )
@@ -47,7 +48,9 @@ if(MSVC)
 		set(LLVM_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/ ${HARVEST_TARGET}/llvm/ )
 	else()
 		set(LLVM_HARVEST_COMMAND
-			${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib/ ${HARVEST_TARGET}/llvm/debug/lib/
+			${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib/ ${HARVEST_TARGET}/llvm/debug/lib/ &&
+			${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/bin/ ${HARVEST_TARGET}/llvm/debug/bin/ &&
+			${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/include/ ${HARVEST_TARGET}/llvm/debug/include/
 		)
 	endif()
 	ExternalProject_Add_Step(ll after_install
@@ -55,3 +58,4 @@ if(MSVC)
 		DEPENDEES mkdir update patch download configure build install
 	)
 endif()
+
--- a/build_files/build_environment/cmake/numpy.cmake
+++ b/build_files/build_environment/cmake/numpy.cmake
@@ -33,9 +33,10 @@ set(NUMPY_POSTFIX)
 if(WIN32)
 	set(NUMPY_INSTALL
 		${CMAKE_COMMAND} -E copy_directory "${BUILD_DIR}/python/src/external_python/run/lib/site-packages/numpy/core/include/numpy" "${LIBDIR}/python/include/python${PYTHON_SHORT_VERSION}/numpy" &&
-		${CMAKE_COMMAND} -E chdir "${BUILD_DIR}/numpy/src/external_numpy/build/lib.${PYTHON_ARCH2}-${PYTHON_SHORT_VERSION}${NUMPY_DIR_POSTFIX}"
-		${CMAKE_COMMAND} -E tar "cfvz" "${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz" "."
+		${CMAKE_COMMAND} -E chdir "${BUILD_DIR}/numpy/src/external_numpy/build/lib.${PYTHON_ARCH2}-${PYTHON_SHORT_VERSION}${NUMPY_DIR_POSTFIX}" 
+		${CMAKE_COMMAND} -E tar "cfvz" "${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz" "." 
 	)
+	set(NUMPY_PATCH ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/numpy/src/external_numpy < ${PATCH_DIR}/numpy.diff )
 else()
 	set(NUMPY_INSTALL echo .)
 	set(NUMPY_PATCH echo .)
@@ -53,13 +54,6 @@ ExternalProject_Add(external_numpy
 	INSTALL_COMMAND ${NUMPY_INSTALL}
 )

-if(WIN32)
-	ExternalProject_Add_Step(external_numpy after_install
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz
-			DEPENDEES install
-		)
-endif()
-
 add_dependencies(
 	external_numpy
 	Make_Python_Environment
--- a/build_files/build_environment/cmake/openal.cmake
+++ b/build_files/build_environment/cmake/openal.cmake
@@ -39,16 +39,5 @@ if(BUILD_MODE STREQUAL Release)
 		PREFIX ${BUILD_DIR}/openal
 		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openal ${DEFAULT_CMAKE_FLAGS} ${OPENAL_EXTRA_ARGS}
 		INSTALL_DIR ${LIBDIR}/openal
-		PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openal/src/external_openal < ${PATCH_DIR}/openal.diff
 	)
-
-	if(WIN32)
-		ExternalProject_Add_Step(external_openal after_install
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/lib/openal32.lib ${HARVEST_TARGET}/openal/lib/openal32.lib
-			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/bin/openal32.dll ${HARVEST_TARGET}/openal/lib/openal32.dll
-			COMMAND	${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openal/include/ ${HARVEST_TARGET}/openal/include/
-			DEPENDEES install
-		)
-	endif()
-
 endif()
--- a/build_files/build_environment/cmake/opencollada.cmake
+++ b/build_files/build_environment/cmake/opencollada.cmake
@@ -16,7 +16,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****

-if(UNIX)
+if(UNIX AND NOT APPLE)
 	set(OPENCOLLADA_EXTRA_ARGS
 		-DLIBXML2_INCLUDE_DIR=${LIBDIR}/xml2/include/libxml2
 		-DLIBXML2_LIBRARIES=${LIBDIR}/xml2/lib/libxml2.a)
@@ -32,34 +32,9 @@ ExternalProject_Add(external_opencollada
 	INSTALL_DIR ${LIBDIR}/opencollada
 )

-if(UNIX)
+if(UNIX AND NOT APPLE)
 	add_dependencies(
 		external_opencollada
 		external_xml2
 	)
 endif()
-
-if(WIN32)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_opencollada after_install
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencollada/ ${HARVEST_TARGET}/opencollada/
-			DEPENDEES install
-		)
-	endif()
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(external_opencollada after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/buffer.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/buffer_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/ftoa.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/ftoa_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/GeneratedSaxParser.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/GeneratedSaxParser_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/MathMLSolver.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/MathMLSolver_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADABaseUtils.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADABaseUtils_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADAFramework.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADAFramework_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADAStreamWriter.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADAStreamWriter_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/pcre.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/pcre_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/UTF.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/UTF_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/xml.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/xml_d.lib
-			DEPENDEES install
-		)
-	endif()
-endif()
--- a/build_files/build_environment/cmake/opencolorio.cmake
+++ b/build_files/build_environment/cmake/opencolorio.cmake
@@ -17,46 +17,34 @@
 # ***** END GPL LICENSE BLOCK *****

 set(OPENCOLORIO_EXTRA_ARGS
+	-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
+	-DBoost_USE_MULTITHREADED=ON
+	-DBoost_USE_STATIC_LIBS=ON
+	-DBoost_USE_STATIC_RUNTIME=ON
+	-DBOOST_ROOT=${LIBDIR}/boost
+	-DBOOST_INCLUDEDIR=${LIBDIR}/boost/include/boost_1_60/boost
+	-DBoost_NO_SYSTEM_PATHS=ON
+	-DBoost_DEBUG=ON
+	-DBoost_MAJOR_VERSION=1
+	-DBoost_MINOR_VERSION=60
 	-DOCIO_BUILD_APPS=OFF
 	-DOCIO_BUILD_PYGLUE=OFF
 	-DOCIO_BUILD_NUKE=OFF
-	-DOCIO_USE_BOOST_PTR=OFF
-	-DOCIO_BUILD_STATIC=ON
-	-DOCIO_BUILD_SHARED=OFF
-	-DOCIO_BUILD_TRUELIGHT=OFF
-	-DOCIO_BUILD_DOCS=OFF
-	-DOCIO_BUILD_PYGLUE=OFF
-	-DOCIO_BUILD_JNIGLUE=OFF
-	-DOCIO_STATIC_JNIGLUE=OFF
 )

 if(WIN32)
-	set(OCIO_PATCH opencolorio_win.diff)
 	set(OPENCOLORIO_EXTRA_ARGS
 		${OPENCOLORIO_EXTRA_ARGS}
-		-DOCIO_BUILD_TESTS=OFF
-		-DOCIO_USE_SSE=ON
-		-DOCIO_INLINES_HIDDEN=OFF
-		-DOCIO_PYGLUE_LINK=OFF
-		-DOCIO_PYGLUE_RESPECT_ABI=OFF
-		-DOCIO_PYGLUE_SONAME=OFF
-		-DOCIO_PYGLUE_LIB_PREFIX=OFF
-		-DUSE_EXTERNAL_TINYXML=ON
-		-DTINYXML_INCLUDE_DIR=${LIBDIR}/tinyxml/include
-		-DTINYXML_LIBRARY=${LIBDIR}/tinyxml/lib/tinyxml${libext}
-		-DUSE_EXTERNAL_YAML=ON
-		-DYAML_CPP_FOUND=ON
-		-DYAML_CPP_VERSION=${YAMLCPP_VERSION}
-		-DUSE_EXTERNAL_LCMS=ON
-		-DINC_1=${LIBDIR}/tinyxml/include
-		-DINC_2=${LIBDIR}/yamlcpp/include
-		#lie because ocio cmake is demanding boost even though it is not needed
-		-DYAML_CPP_VERSION=0.5.0
+		-DOCIO_USE_BOOST_PTR=ON
+		-DOCIO_BUILD_STATIC=OFF
+		-DOCIO_BUILD_SHARED=ON
 	)
 else()
-	set(OCIO_PATCH opencolorio.diff)
 	set(OPENCOLORIO_EXTRA_ARGS
 		${OPENCOLORIO_EXTRA_ARGS}
+		-DOCIO_USE_BOOST_PTR=OFF
+		-DOCIO_BUILD_STATIC=ON
+		-DOCIO_BUILD_SHARED=OFF
 	)
 endif()

@@ -65,7 +53,7 @@ ExternalProject_Add(external_opencolorio
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
 	URL_HASH MD5=${OPENCOLORIO_HASH}
 	PREFIX ${BUILD_DIR}/opencolorio
-	PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencolorio/src/external_opencolorio < ${PATCH_DIR}/${OCIO_PATCH}
+	PATCH_COMMAND ${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/opencolorio/src/external_opencolorio < ${PATCH_DIR}/opencolorio.diff
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencolorio ${DEFAULT_CMAKE_FLAGS} ${OPENCOLORIO_EXTRA_ARGS}
 	INSTALL_DIR ${LIBDIR}/opencolorio
 )
@@ -83,30 +71,3 @@ add_dependencies(
 	external_opencolorio
 	external_boost
 )
-
-if(WIN32)
-	add_dependencies(
-		external_opencolorio
-		external_tinyxml
-		external_yamlcpp
-
-	)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_opencolorio after_install
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/include ${HARVEST_TARGET}/opencolorio/include
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/lib/static ${HARVEST_TARGET}/opencolorio/lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/libyaml-cppmt.lib ${HARVEST_TARGET}/opencolorio/lib/libyaml-cpp.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tinyxml/lib/tinyxml.lib ${HARVEST_TARGET}/opencolorio/lib/tinyxml.lib
-			DEPENDEES install
-		)
-	endif()
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(external_opencolorio after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencolorio/lib/static/Opencolorio.lib ${HARVEST_TARGET}/opencolorio/lib/OpencolorIO_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/libyaml-cppmtd.lib ${HARVEST_TARGET}/opencolorio/lib/libyaml-cpp_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tinyxml/lib/tinyxml.lib ${HARVEST_TARGET}/opencolorio/lib/tinyxml_d.lib
-			DEPENDEES install
-		)
-	endif()
-
-endif()
--- a/build_files/build_environment/cmake/openexr.cmake
+++ b/build_files/build_environment/cmake/openexr.cmake
@@ -18,59 +18,26 @@

 if(WIN32)
 	set(OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
-	set(OPENEXR_EXTRA_ARGS
-		-DCMAKE_CXX_STANDARD_LIBRARIES=${OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES}
-		-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-		-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-		-DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase
-		-DOPENEXR_BUILD_ILMBASE=On
-		-DOPENEXR_BUILD_OPENEXR=On
-		-DOPENEXR_BUILD_PYTHON_LIBS=Off
-		-DOPENEXR_BUILD_STATIC=On
-		-DOPENEXR_BUILD_SHARED=Off
-		-DOPENEXR_BUILD_TESTS=Off
-		-DOPENEXR_BUILD_VIEWERS=Off
-		-DOPENEXR_BUILD_UTILS=Off
-		-DOPENEXR_NAMESPACE_VERSIONING=Off
-	)
-	ExternalProject_Add(external_openexr
-		URL ${OPENEXR_URI}
-		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-		URL_HASH MD5=${OPENEXR_HASH}
-		PREFIX ${BUILD_DIR}/openexr
-		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openexr ${DEFAULT_CMAKE_FLAGS} ${OPENEXR_EXTRA_ARGS}
-		INSTALL_DIR ${LIBDIR}/openexr
-	)
-
-	ExternalProject_Add_Step(external_openexr after_install
-		COMMAND	${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${HARVEST_TARGET}/openexr/lib
-		#libs have moved between versions, just duplicate it for now.
-		COMMAND	${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${LIBDIR}/ilmbase/lib
-		COMMAND	${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/include ${HARVEST_TARGET}/openexr/include
-		DEPENDEES install
-	)
-
-else()
-	set(OPENEXR_PKG_CONFIG_PATH ${LIBDIR}/zlib/share/pkgconfig)
-	set(OPENEXR_EXTRA_ARGS
-	  --enable-static
-	  --disable-shared
-	  --enable-cxxstd=11
-	  --with-ilmbase-prefix=${LIBDIR}/ilmbase
-	  )
-
-	ExternalProject_Add(external_openexr
-		URL ${OPENEXR_URI}
-		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-		URL_HASH MD5=${OPENEXR_HASH}
-		PREFIX ${BUILD_DIR}/openexr
-		CONFIGURE_COMMAND ${CONFIGURE_ENV} && export PKG_CONFIG_PATH=${OPENEXR_PKG_CONFIG_PATH} && cd ${BUILD_DIR}/openexr/src/external_openexr/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/openexr ${OPENEXR_EXTRA_ARGS}
-		BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openexr/src/external_openexr/ && make -j${MAKE_THREADS}
-		INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openexr/src/external_openexr/ && make install
-		INSTALL_DIR ${LIBDIR}/openexr
-	)
 endif()

+set(OPENEXR_EXTRA_ARGS
+	-DBUILD_SHARED_LIBS=OFF
+	-DCMAKE_CXX_STANDARD_LIBRARIES=${OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES}
+	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+	-DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase
+)
+
+ExternalProject_Add(external_openexr
+	URL ${OPENEXR_URI}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	URL_HASH MD5=${OPENEXR_HASH}
+	PREFIX ${BUILD_DIR}/openexr
+	PATCH_COMMAND ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/openexr/src/external_openexr < ${PATCH_DIR}/openexr.diff
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openexr ${DEFAULT_CMAKE_FLAGS} ${OPENEXR_EXTRA_ARGS}
+	INSTALL_DIR ${LIBDIR}/openexr
+)
+
 add_dependencies(
 	external_openexr
 	external_zlib
--- a/build_files/build_environment/cmake/openimageio.cmake
+++ b/build_files/build_environment/cmake/openimageio.cmake
@@ -51,8 +51,8 @@ if(MSVC)
 	set(OPENJPEG_FLAGS
 		-DOPENJPEG_HOME=${LIBDIR}/openjpeg_msvc
 		-DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg_msvc/include/openjpeg-${OPENJPEG_SHORT_VERSION}
-		-DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg_msvc/lib/openjp2${LIBEXT}
-		-DOPENJPEG_LIBRARY_DEBUG=${LIBDIR}/openjpeg_msvc/lib/openjp2${LIBEXT}
+		-DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg_msvc/lib/openjpeg${LIBEXT}
+		-DOPENJPEG_LIBRARY_DEBUG=${LIBDIR}/openjpeg_msvc/lib/openjpeg${LIBEXT}
 	)
 else()
 	set(OPENJPEG_FLAGS
@@ -65,7 +65,7 @@ set(OPENIMAGEIO_EXTRA_ARGS
 	-DBUILDSTATIC=ON
 	${OPENIMAGEIO_LINKSTATIC}
 	-DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/openexr/
-	-DOPENEXR_ILMIMF_LIBRARIES=${LIBDIR}/openexr/lib/IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_ILMIMF_LIBRARIES=${LIBDIR}/openexr/lib/IlmImf-2_2${LIBEXT}
 	-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
 	-DBoost_USE_MULTITHREADED=ON
 	-DBoost_USE_STATIC_LIBS=ON
@@ -109,12 +109,12 @@ set(OPENIMAGEIO_EXTRA_ARGS
 	-DILMBASE_INCLUDE_PATH=${LIBDIR}/ilmbase/
 	-DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase/
 	-DILMBASE_INCLUDE_DIR=${LIBDIR}/ilmbase/include/
-	-DOPENEXR_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DOPENEXR_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DOPENEXR_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${LIBEXT}
+	-DOPENEXR_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath-2_2${LIBEXT}
+	-DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread-2_2${LIBEXT}
+	-DOPENEXR_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex-2_2${LIBEXT}
 	-DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
-	-DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf-2_2${LIBEXT}
 	-DSTOP_ON_WARNING=OFF
 	${WEBP_FLAGS}
 	${OIIO_SIMD_FLAGS}
@@ -127,7 +127,7 @@ ExternalProject_Add(external_openimageio
 	PREFIX ${BUILD_DIR}/openimageio
 	PATCH_COMMAND
 		${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/src/include < ${PATCH_DIR}/openimageio_gdi.diff &&
-		${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio_static_libs.diff
+		${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio_staticexr.diff
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimageio ${DEFAULT_CMAKE_FLAGS} ${OPENIMAGEIO_EXTRA_ARGS}
 	INSTALL_DIR ${LIBDIR}/openimageio
 )
--- a/build_files/build_environment/cmake/openjpeg.cmake
+++ b/build_files/build_environment/cmake/openjpeg.cmake
@@ -22,7 +22,7 @@
 set(OPENJPEG_EXTRA_ARGS -DBUILD_SHARED_LIBS=OFF)

 if(WIN32)
-	set(OPENJPEG_EXTRA_ARGS -G "MSYS Makefiles" -DBUILD_PKGCONFIG_FILES=On)
+	set(OPENJPEG_EXTRA_ARGS -G "MSYS Makefiles")
 else()
 	set(OPENJPEG_EXTRA_ARGS ${DEFAULT_CMAKE_FLAGS})
 endif()
@@ -46,7 +46,7 @@ if(MSVC)
 		DOWNLOAD_DIR ${DOWNLOAD_DIR}
 		URL_HASH SHA256=${OPENJPEG_HASH}
 		PREFIX ${BUILD_DIR}/openjpeg_msvc
-		CMAKE_ARGS ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg_msvc -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF
+		CMAKE_ARGS ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg_msvc -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF 
 		INSTALL_DIR ${LIBDIR}/openjpeg_msvc
 	)
 	if(BUILD_MODE STREQUAL Release)
@@ -58,7 +58,7 @@ if(MSVC)
 	endif()
 endif()

-set(OPENJPEG_LIBRARY libopenjp2${LIBEXT})
+set(OPENJPEG_LIBRARY libopenjpeg${LIBEXT})
 if(MSVC)
 	set_target_properties(external_openjpeg PROPERTIES FOLDER Mingw)
 endif()
--- a/build_files/build_environment/cmake/openmp.cmake
+++ b/build_files/build_environment/cmake/openmp.cmake
@@ -1,32 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-
-ExternalProject_Add(external_openmp
-	URL ${OPENMP_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${OPENMP_HASH}
-	PREFIX ${BUILD_DIR}/openmp
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openmp ${DEFAULT_CMAKE_FLAGS}
-	INSTALL_DIR ${LIBDIR}/clang
-)
-
-add_dependencies(
-	external_openmp
-	external_clang
-)
--- a/build_files/build_environment/cmake/opensubdiv.cmake
+++ b/build_files/build_environment/cmake/opensubdiv.cmake
@@ -33,28 +33,22 @@ set(OPENSUBDIV_EXTRA_ARGS
 )

 if(WIN32)
+	#no cuda support for vc15 yet
+	if(msvc15)
+		set(OPENSUBDIV_CUDA ON)
+	else()
+		set(OPENSUBDIV_CUDA ON)
+	endif()
+
 	set(OPENSUBDIV_EXTRA_ARGS
 		${OPENSUBDIV_EXTRA_ARGS}
-		-DTBB_INCLUDE_DIR=${LIBDIR}/tbb/include
-		-DTBB_LIBRARIES=${LIBDIR}/tbb/lib/tbb_static.lib
+		-DNO_CUDA=${OPENSUBDIV_CUDA}
 		-DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL
 		-DCLEW_LIBRARY=${LIBDIR}/clew/lib/clew${LIBEXT}
 		-DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include
 		-DCUEW_LIBRARY=${LIBDIR}/cuew/lib/cuew${LIBEXT}
 		-DCMAKE_EXE_LINKER_FLAGS_RELEASE=libcmt.lib
 	)
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-		set(OPENSUBDIV_EXTRA_ARGS
-			${OPENSUBDIV_EXTRA_ARGS}
-			-DNO_CUDA=OFF
-		)
-	else()
-		set(OPENSUBDIV_EXTRA_ARGS
-			${OPENSUBDIV_EXTRA_ARGS}
-			-DNO_CUDA=ON
-		)
-	endif()
-
 else()
 	set(OPENSUBDIV_EXTRA_ARGS
 		${OPENSUBDIV_EXTRA_ARGS}
@@ -75,28 +69,10 @@ ExternalProject_Add(external_opensubdiv
 	INSTALL_DIR ${LIBDIR}/opensubdiv
 )

-if(WIN32)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_opensubdiv after_install
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opensubdiv/lib ${HARVEST_TARGET}/opensubdiv/lib
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opensubdiv/include ${HARVEST_TARGET}/opensubdiv/include
-			DEPENDEES install
-		)
-	endif()
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(external_opensubdiv after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opensubdiv/lib/osdCPU.lib ${HARVEST_TARGET}/opensubdiv/lib/osdCPU_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opensubdiv/lib/osdGPU.lib ${HARVEST_TARGET}/opensubdiv/lib/osdGPU_d.lib
-			DEPENDEES install
-		)
-	endif()
-endif()
-
 add_dependencies(
 	external_opensubdiv
 	external_glew
 	external_glfw
 	external_clew
 	external_cuew
-	external_tbb
 )
--- a/build_files/build_environment/cmake/openvdb.cmake
+++ b/build_files/build_environment/cmake/openvdb.cmake
@@ -21,6 +21,23 @@ if(BUILD_MODE STREQUAL Debug)
 endif()

 set(OPENVDB_EXTRA_ARGS
+	-DILMBASE_HOME=${LIBDIR}/ilmbase/
+	-DILMBASE_CUSTOM=ON
+	-DILMBASE_CUSTOM_LIBRARIES=Half;Imath-2_2;IlmThread-2_2;Iex-2_2
+	-DILMBASE_INCLUDE_DIR=${LIBDIR}/ilmbase/include/
+	-DILMBASE_HALF_LIBRARIES=${LIBDIR}/ilmbase/lib/Half${LIBEXT}
+	-DILMBASE_IMATH_LIBRARIES=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath-2_2${LIBEXT}
+	-DILMBASE_ILMTHREAD_LIBRARIES=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread-2_2${LIBEXT}
+	-DILMBASE_IEX_LIBRARIES=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex-2_2${LIBEXT}
+	-DOPENEXR_HOME=${LIBDIR}/openexr/
+	-DOPENEXR_USE_STATIC_LIBS=ON
+	-DOPENEXR_CUSTOM=ON
+	-DOPENEXR_CUSTOM_LIBRARY=IlmImf-2_2
+	-DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
+	-DOPENEXR_ILMIMF_LIBRARIES=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf-2_2${LIBEXT}
+	-DTBB_ROOT_DIR=${LIBDIR}/tbb/
+	-DTBB_INCLUDE_DIRS=${LIBDIR}/tbb/include
+	-DTBB_LIBRARY=${LIBDIR}/tbb/lib/tbb_static${LIBEXT}
 	-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
 	-DBoost_USE_MULTITHREADED=ON
 	-DBoost_USE_STATIC_LIBS=ON
@@ -29,48 +46,25 @@ set(OPENVDB_EXTRA_ARGS
 	-DBoost_NO_SYSTEM_PATHS=ON
 	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
 	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+	-DWITH_BLOSC=ON
 	-DBLOSC_INCLUDE_DIR=${LIBDIR}/blosc/include/
-	-DBLOSC_blosc_LIBRARY=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
-	-DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF
-	-DOPENVDB_BUILD_UNITTESTS=Off
-	-DOPENVDB_BUILD_PYTHON_MODULE=Off
-	-DGLEW_LOCATION=${LIBDIR}/glew/
-	-DBLOSC_LOCATION=${LIBDIR}/blosc/
-	-DTBB_LOCATION=${LIBDIR}/tbb/
-	-DTBB_ROOT=${LIBDIR}/tbb/
-	-DOPENEXR_LOCATION=${LIBDIR}/openexr
-	-DILMBASE_LOCATION=${LIBDIR}/ilmbase
-	-DIlmbase_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DIlmbase_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DIlmbase_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DOpenexr_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-	-DTBB_LIBRARYDIR=${LIBDIR}/tbb/lib
-	-DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
-	-DTBB_LIBRARY_PATH=${LIBDIR}/tbb/lib
+	-DBLOSC_LIBRARY=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
 )

-if(WIN32)
-	# Namespaces seem to be buggy and cause linker errors due to things not
-	# being in the correct namespace
-	# needs to link pthreads due to it being a blosc dependency
-	set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
-		-DOPENEXR_NAMESPACE_VERSIONING=OFF
-		-DEXTRA_LIBS:FILEPATH=${LIBDIR}/pthreads/lib/pthreadVC2.lib
-	)
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
-		set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
-			-DCMAKE_SHARED_LINKER_FLAGS="/safeseh:no"
-			-DCMAKE_EXE_LINKER_FLAGS="/safeseh:no"
-		)
-	endif()
-endif()
+set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS})
+
+# CMake script for OpenVDB based on https://raw.githubusercontent.com/diekev/openvdb-cmake/master/CMakeLists.txt
+# can't be in external_openvdb because of how the includes are setup.

 ExternalProject_Add(openvdb
 	URL ${OPENVDB_URI}
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
 	URL_HASH MD5=${OPENVDB_HASH}
 	PREFIX ${BUILD_DIR}/openvdb
-	PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb.diff
+	PATCH_COMMAND COMMAND
+		${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_openvdb.txt  ${BUILD_DIR}/openvdb/src/openvdb/CMakeLists.txt &&
+		${CMAKE_COMMAND} -E copy_directory ${PATCH_DIR}/cmake/  ${BUILD_DIR}/openvdb/src/openvdb/cmake/ &&
+		${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb_vc2013.diff
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openvdb ${DEFAULT_CMAKE_FLAGS} ${OPENVDB_EXTRA_ARGS}
 	INSTALL_DIR ${LIBDIR}/openvdb
 )
@@ -84,19 +78,3 @@ add_dependencies(
 	external_zlib
 	external_blosc
 )
-
-if(WIN32)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(openvdb after_install
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openvdb/include ${HARVEST_TARGET}/openvdb/include
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/libopenvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb.lib
-			DEPENDEES install
-		)
-	endif()
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(openvdb after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/libopenvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb_d.lib
-			DEPENDEES install
-		)
-	endif()
-endif()
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -56,27 +56,24 @@ if(WIN32)
 	# For OIIO and OSL
 	set(COMMON_DEFINES /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS)

-	if(MSVC_VERSION GREATER 1909)
-		set(COMMON_MSVC_FLAGS "/Wv:18") #some deps with warnings as error aren't quite ready for dealing with the new 2017 warnings.
-	endif()
-	set(COMMON_MSVC_FLAGS "${COMMON_MSVC_FLAGS} /bigobj")
+	# TODO FIXME highly MSVC specific
 	if(WITH_OPTIMIZED_DEBUG)
-		set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+		set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
 	else()
-		set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /D_DEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+		set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd /Zi /Ob0 /Od /RTC1 /D_DEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
 	endif()
-	set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "/MT ${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-	set(BLENDER_CMAKE_C_FLAGS_RELEASE "/MT ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-	set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "/MT ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+	set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "/MT /O1 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+	set(BLENDER_CMAKE_C_FLAGS_RELEASE "/MT /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+	set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")

 	if(WITH_OPTIMIZED_DEBUG)
-		set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/MTd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+		set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/MTd /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
 	else()
-		set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /D PLATFORM_WINDOWS /MTd  ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+		set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /D PLATFORM_WINDOWS /MTd /Zi /Ob0 /Od /RTC1 /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
 	endif()
-	set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "/MT /${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG  /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-	set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "/MT ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-	set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MT ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+	set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "/MT /O1 /Ob1 /D NDEBUG  /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+	set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "/MT /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+	set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")

 	set(PLATFORM_FLAGS)
 	set(PLATFORM_CXX_FLAGS)
@@ -126,7 +123,7 @@ else()
 		)
 		set(OSX_ARCHITECTURES x86_64)
 		set(OSX_DEPLOYMENT_TARGET 10.9)
-		set(OSX_SDK_VERSION 10.13)
+		set(OSX_SDK_VERSION 10.12)
 		set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OSX_SDK_VERSION}.sdk)

 		set(PLATFORM_CFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}")
@@ -143,17 +140,17 @@ else()
 		set(PLATFORM_CXXFLAGS "-std=c++11 -fPIC")
 		set(PLATFORM_LDFLAGS)
 		set(PLATFORM_BUILD_TARGET)
-		set(PLATFORM_CMAKE_FLAGS -DCMAKE_INSTALL_LIBDIR=lib)
+		set(PLATFORM_CMAKE_FLAGS)
 	endif()

 	if(WITH_OPTIMIZED_DEBUG)
-		set(BLENDER_CMAKE_C_FLAGS_DEBUG "-O2 -DNDEBUG ${PLATFORM_CFLAGS}")
+		set(BLENDER_CMAKE_C_FLAGS_DEBUG "-O2 -DNDEBUG")
 	else()
-		set(BLENDER_CMAKE_C_FLAGS_DEBUG "-g ${PLATFORM_CFLAGS}")
+		set(BLENDER_CMAKE_C_FLAGS_DEBUG "-g")
 	endif()
-	set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG ${PLATFORM_CFLAGS}")
-	set(BLENDER_CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${PLATFORM_CFLAGS}")
-	set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${PLATFORM_CFLAGS}")
+	set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG")
+	set(BLENDER_CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
+	set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG")

 	if(WITH_OPTIMIZED_DEBUG)
 		set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "-O2 -DNDEBUG ${PLATFORM_CXXFLAGS}")
@@ -202,11 +199,7 @@ endif()


 if(WIN32)
-	if(BUILD_MODE STREQUAL Debug)
-		set(ZLIB_LIBRARY zlibstaticd${LIBEXT})
-	else()
-		set(ZLIB_LIBRARY zlibstatic${LIBEXT})
-	endif()
+	set(ZLIB_LIBRARY zlibstatic${LIBEXT})
 else()
 	set(ZLIB_LIBRARY libz${LIBEXT})
 endif()
--- a/build_files/build_environment/cmake/lzma.cmake
+++ b/build_files/build_environment/cmake/lzma.cmake
@@ -16,17 +16,17 @@
 #
 # ***** END GPL LICENSE BLOCK *****

-set(LZMA_PATCH_CMD echo .)
-
-ExternalProject_Add(external_lzma
-	URL ${LZMA_URI}
+ExternalProject_Add(external_orc
+	URL ${ORC_URI}
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH SHA256=${LZMA_HASH}
-	PREFIX ${BUILD_DIR}/lzma
-	PATCH_COMMAND ${LZMA_PATCH_CMD}
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/lzma
-		--disable-shared
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && make install
-	INSTALL_DIR ${LIBDIR}/lzma
+	URL_HASH SHA256=${ORC_HASH}
+	PREFIX ${BUILD_DIR}/orc
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/orc/src/external_orc/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/orc --disable-shared --enable-static
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/orc/src/external_orc/ && make -j${MAKE_THREADS}
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/orc/src/external_orc/ && make install
+	INSTALL_DIR ${LIBDIR}/orc
 )
+
+if(MSVC)
+	set_target_properties(external_orc PROPERTIES FOLDER Mingw)
+endif()
--- a/build_files/build_environment/cmake/osl.cmake
+++ b/build_files/build_environment/cmake/osl.cmake
@@ -19,22 +19,20 @@
 if(WIN32)
 	set(OSL_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
 	set(OSL_FLEX_BISON -DFLEX_EXECUTABLE=${LIBDIR}/flexbison/win_flex.exe -DFLEX_EXTRA_OPTIONS="--wincompat" -DBISON_EXECUTABLE=${LIBDIR}/flexbison/win_bison.exe)
-	set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/libpng16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
+	set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/libpng16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf-2_2${LIBEXT}")
 	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
 		set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=0)
 	else()
 		set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=sse2)
 	endif()
-	SET(OSL_PLATFORM_FLAGS -DLINKSTATIC=ON)
 else()
 	set(OSL_CMAKE_CXX_STANDARD_LIBRARIES)
 	set(OSL_FLEX_BISON)
-	set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/${LIBPREFIX}png16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
-	SET(OSL_PLATFORM_FLAGS)
+	set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/${LIBPREFIX}png16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf-2_2${LIBEXT}")
 endif()

-set(OSL_ILMBASE_CUSTOM_LIBRARIES "${LIBDIR}/ilmbase/lib/Imath${ILMBASE_VERSION_POSTFIX}.lib^^${LIBDIR}/ilmbase/lib/Half{ILMBASE_VERSION_POSTFIX}.lib^^${LIBDIR}/ilmbase/lib/IlmThread${ILMBASE_VERSION_POSTFIX}.lib^^${LIBDIR}/ilmbase/lib/Iex${ILMBASE_VERSION_POSTFIX}.lib")
-set(OSL_LLVM_LIBRARY "${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMAnalysis${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMAsmParser${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMAsmPrinter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMBitReader${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMBitWriter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMCodeGen${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMCore${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMDebugInfo${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMExecutionEngine${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMInstCombine${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMInstrumentation${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMInterpreter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMJIT${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMLinker${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMC${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMCDisassembler${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMCJIT${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMCParser${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMObject${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMRuntimeDyld${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMScalarOpts${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMSelectionDAG${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMSupport${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMTableGen${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMTarget${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMTransformUtils${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMVectorize${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86AsmParser${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86AsmPrinter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86CodeGen${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Desc${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Disassembler${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Info${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Utils${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMipa${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMipo${LIBEXT}")
+set(OSL_ILMBASE_CUSTOM_LIBRARIES "${LIBDIR}/ilmbase/lib/Imath-2_2.lib^^${LIBDIR}/ilmbase/lib/Half.lib^^${LIBDIR}/ilmbase/lib/IlmThread-2_2.lib^^${LIBDIR}/ilmbase/lib/Iex-2_2.lib")
+set(OSL_LLVM_LIBRARY "${LIBDIR}/llvm/lib/LLVMAnalysis${LIBEXT};${LIBDIR}/llvm/lib/LLVMAsmParser${LIBEXT};${LIBDIR}/llvm/lib/LLVMAsmPrinter${LIBEXT};${LIBDIR}/llvm/lib/LLVMBitReader${LIBEXT};${LIBDIR}/llvm/lib/LLVMBitWriter${LIBEXT};${LIBDIR}/llvm/lib/LLVMCodeGen${LIBEXT};${LIBDIR}/llvm/lib/LLVMCore${LIBEXT};${LIBDIR}/llvm/lib/LLVMDebugInfo${LIBEXT};${LIBDIR}/llvm/lib/LLVMExecutionEngine${LIBEXT};${LIBDIR}/llvm/lib/LLVMInstCombine${LIBEXT};${LIBDIR}/llvm/lib/LLVMInstrumentation${LIBEXT};${LIBDIR}/llvm/lib/LLVMInterpreter${LIBEXT};${LIBDIR}/llvm/lib/LLVMJIT${LIBEXT};${LIBDIR}/llvm/lib/LLVMLinker${LIBEXT};${LIBDIR}/llvm/lib/LLVMMC${LIBEXT};${LIBDIR}/llvm/lib/LLVMMCDisassembler${LIBEXT};${LIBDIR}/llvm/lib/LLVMMCJIT${LIBEXT};${LIBDIR}/llvm/lib/LLVMMCParser${LIBEXT};${LIBDIR}/llvm/lib/LLVMObject${LIBEXT};${LIBDIR}/llvm/lib/LLVMRuntimeDyld${LIBEXT};${LIBDIR}/llvm/lib/LLVMScalarOpts${LIBEXT};${LIBDIR}/llvm/lib/LLVMSelectionDAG${LIBEXT};${LIBDIR}/llvm/lib/LLVMSupport${LIBEXT};${LIBDIR}/llvm/lib/LLVMTableGen${LIBEXT};${LIBDIR}/llvm/lib/LLVMTarget${LIBEXT};${LIBDIR}/llvm/lib/LLVMTransformUtils${LIBEXT};${LIBDIR}/llvm/lib/LLVMVectorize${LIBEXT};${LIBDIR}/llvm/lib/LLVMX86AsmParser${LIBEXT};${LIBDIR}/llvm/lib/LLVMX86AsmPrinter${LIBEXT};${LIBDIR}/llvm/lib/LLVMX86CodeGen${LIBEXT};${LIBDIR}/llvm/lib/LLVMX86Desc${LIBEXT};${LIBDIR}/llvm/lib/LLVMX86Disassembler${LIBEXT};${LIBDIR}/llvm/lib/LLVMX86Info${LIBEXT};${LIBDIR}/llvm/lib/LLVMX86Utils${LIBEXT};${LIBDIR}/llvm/lib/LLVMipa${LIBEXT};${LIBDIR}/llvm/lib/LLVMipo${LIBEXT}")

 set(OSL_EXTRA_ARGS
 	-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
@@ -52,12 +50,11 @@ set(OSL_EXTRA_ARGS
 	-DOPENEXR_HOME=${LIBDIR}/openexr/
 	-DILMBASE_HOME=${LIBDIR}/ilmbase/
 	-DILMBASE_INCLUDE_DIR=${LIBDIR}/ilmbase/include/
-	-DOPENEXR_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DOPENEXR_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-	-DOPENEXR_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath-2_2${LIBEXT}
+	-DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread-2_2${LIBEXT}
+	-DOPENEXR_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex-2_2${LIBEXT}
 	-DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
-	-DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf-2_2${LIBEXT}
 	-DOSL_BUILD_TESTS=OFF
 	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
 	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
@@ -67,36 +64,23 @@ set(OSL_EXTRA_ARGS
 	${OSL_FLEX_BISON}
 	-DCMAKE_CXX_STANDARD_LIBRARIES=${OSL_CMAKE_CXX_STANDARD_LIBRARIES}
 	-DBUILDSTATIC=ON
-	${OSL_PLATFORM_FLAGS}
+	-DLINKSTATIC=ON
 	-DOSL_BUILD_PLUGINS=Off
 	-DSTOP_ON_WARNING=OFF
+	-DOSL_BUILD_CPP11=ON
 	-DUSE_LLVM_BITCODE=OFF
-	-DUSE_PARTIO=OFF
 	${OSL_SIMD_FLAGS}
-	-DPARTIO_LIBRARIES=
 )

-if(WIN32)
-	set(OSL_EXTRA_ARGS
-		${OSL_EXTRA_ARGS}
-		-DPUGIXML_HOME=${LIBDIR}/pugixml
-	)
-elseif(APPLE)
-	# Make symbol hiding consistent with OIIO which defaults to OFF,
-	# avoids linker warnings on macOS
-	set(OSL_EXTRA_ARGS
-		${OSL_EXTRA_ARGS}
-		-DHIDE_SYMBOLS=OFF
-	)
-endif()
-
 ExternalProject_Add(external_osl
 	URL ${OSL_URI}
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
 	LIST_SEPARATOR ^^
 	URL_HASH MD5=${OSL_HASH}
 	PREFIX ${BUILD_DIR}/osl
-	PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl.diff
+	PATCH_COMMAND
+		${PATCH_CMD} -p 3 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl.diff &&
+		${PATCH_CMD} -p 0 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl_simd_oiio.diff
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/osl -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${DEFAULT_CMAKE_FLAGS} ${OSL_EXTRA_ARGS}
 	INSTALL_DIR ${LIBDIR}/osl
 )
@@ -111,22 +95,4 @@ add_dependencies(
 	external_zlib
 	external_flexbison
 	external_openimageio
-	external_pugixml
 )
-
-if(WIN32)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_osl after_install
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/osl/ ${HARVEST_TARGET}/osl
-			DEPENDEES install
-		)
-	endif()
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(external_osl after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslcomp.lib ${HARVEST_TARGET}/osl/lib/oslcomp_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslexec.lib ${HARVEST_TARGET}/osl/lib/oslexec_d.lib
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslquery.lib ${HARVEST_TARGET}/osl/lib/oslquery_d.lib
-			DEPENDEES install
-		)
-	endif()
-endif()
--- a/build_files/build_environment/cmake/pthreads.cmake
+++ b/build_files/build_environment/cmake/pthreads.cmake
@@ -43,13 +43,4 @@ if(WIN32)
 				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/semaphore.h ${LIBDIR}/pthreads/inc/semaphore.h
 			INSTALL_DIR ${LIBDIR}/pthreads
 		)
-
-		if(BUILD_MODE STREQUAL Release)
-			ExternalProject_Add_Step(external_pthreads after_install
-				COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/inc/ ${HARVEST_TARGET}/pthreads/include/
-				COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/lib/ ${HARVEST_TARGET}/pthreads/lib
-				DEPENDEES install
-			)
-		endif()
-
 endif()
--- a/build_files/build_environment/cmake/pugixml.cmake
+++ b/build_files/build_environment/cmake/pugixml.cmake
@@ -1,43 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(PUGIXML_EXTRA_ARGS
-)
-
-ExternalProject_Add(external_pugixml
-	URL ${PUGIXML_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${PUGIXML_HASH}
-	PREFIX ${BUILD_DIR}/pugixml
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/pugixml ${DEFAULT_CMAKE_FLAGS} ${PUGIXML_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/pugixml
-)
-if(WIN32)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_pugixml after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib ${HARVEST_TARGET}/osl/lib/pugixml.lib
-			DEPENDEES install
-		)
-	endif()
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(external_pugixml after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib ${HARVEST_TARGET}/osl/lib/pugixml_d.lib
-			DEPENDEES install
-		)
-	endif()	
-endif()
--- a/build_files/build_environment/cmake/python.cmake
+++ b/build_files/build_environment/cmake/python.cmake
@@ -22,12 +22,6 @@ if(BUILD_MODE STREQUAL Debug)
 endif()

 if(WIN32)
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-		set(SSL_POSTFIX -x64)
-	else()
-		set(SSL_POSTFIX)
-	endif()
-
 	set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe)

 	macro(cmake_to_dos_path MsysPath ResultingPath)
@@ -52,12 +46,13 @@ if(WIN32)
 		PREFIX ${BUILD_DIR}/python
 		PATCH_COMMAND
 			echo mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}" &&
-			mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}"
+			mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}" &&
+			${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python.diff &&
+			${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/python/src/external_python/pc < ${PATCH_DIR}/pyshell.diff
 		CONFIGURE_COMMAND ""
-		BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p ${PYTHON_ARCH} -c ${BUILD_MODE}
+		BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p ${PYTHON_ARCH} -c ${BUILD_MODE} -k ${PYTHON_COMPILER_STRING}
 		INSTALL_COMMAND COMMAND
 			${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll &&
-			${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb &&
 			${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib &&
 			${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.exp ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.exp &&
 			${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/include ${LIBDIR}/python/include/Python${PYTHON_SHORT_VERSION} &&
@@ -67,43 +62,24 @@ if(WIN32)
 	message("POutput = ${PYTHON_OUTPUTDIR}")
 else()
 	if(APPLE)
-		# disable functions that can be in 10.13 sdk but aren't available on 10.9 target
-		set(PYTHON_FUNC_CONFIGS
-		  export ac_cv_func_futimens=no &&
-		  export ac_cv_func_utimensat=no &&
-		  export ac_cv_func_basename_r=no &&
-		  export ac_cv_func_clock_getres=no &&
-		  export ac_cv_func_clock_gettime=no &&
-		  export ac_cv_func_clock_settime=no &&
-		  export ac_cv_func_dirname_r=no &&
-		  export ac_cv_func_getentropy=no &&
-		  export ac_cv_func_mkostemp=no &&
-		  export ac_cv_func_mkostemps=no &&
-		  export ac_cv_func_timingsafe_bcmp=no)
-		set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV} && ${PYTHON_FUNC_CONFIGS})
+		# we need to manually add homebrew headers to get ssl module building
+		set(PYTHON_CFLAGS "-I/usr/local/opt/openssl/include -I${OSX_SYSROOT}/usr/include ${PLATFORM_CFLAGS}")
+		set(PYTHON_LDFLAGS "-L/usr/local/opt/openssl/lib ${PLATFORM_LDFLAGS}")
+		set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV} && export CFLAGS=${PYTHON_CFLAGS} && export LDFLAGS=${PYTHON_LDFLAGS})
 		set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python.exe)
+		set(PYTHON_PATCH ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_apple.diff)
 	else()
 		set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV})
 		set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python)
 	endif()

-	set(PYTHON_CONFIGURE_EXTRA_ARGS "--with-openssl=${LIBDIR}/ssl")
-	set(PYTHON_CFLAGS "-I${LIBDIR}/sqlite/include -I${LIBDIR}/bzip2/include -I${LIBDIR}/lzma/include -I${LIBDIR}/zlib/include")
-	set(PYTHON_LDFLAGS "-L${LIBDIR}/ffi/lib -L${LIBDIR}/sqlite/lib -L${LIBDIR}/bzip2/lib -L${LIBDIR}/lzma/lib -L${LIBDIR}/zlib/lib")
-	set(PYTHON_CONFIGURE_EXTRA_ENV
-		export CFLAGS=${PYTHON_CFLAGS} &&
-		export CPPFLAGS=${PYTHON_CFLAGS} &&
-		export LDFLAGS=${PYTHON_LDFLAGS} &&
-		export PKG_CONFIG_PATH=${LIBDIR}/ffi/lib/pkgconfig)
-	set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_linux.diff)
-
 	ExternalProject_Add(external_python
 		URL ${PYTHON_URI}
 		DOWNLOAD_DIR ${DOWNLOAD_DIR}
 		URL_HASH MD5=${PYTHON_HASH}
 		PREFIX ${BUILD_DIR}/python
 		PATCH_COMMAND ${PYTHON_PATCH}
-		CONFIGURE_COMMAND ${PYTHON_CONFIGURE_ENV} && ${PYTHON_CONFIGURE_EXTRA_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/python ${PYTHON_CONFIGURE_EXTRA_ARGS}
+		CONFIGURE_COMMAND ${PYTHON_CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/python
 		BUILD_COMMAND ${PYTHON_CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && make -j${MAKE_THREADS}
 		INSTALL_COMMAND ${PYTHON_CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && make install
 		INSTALL_DIR ${LIBDIR}/python)
@@ -116,44 +92,39 @@ if(MSVC)
 		OUTPUT ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz
 		OUTPUT ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe
 		COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/lib ${BUILD_DIR}/python/src/external_python/redist/lib
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_asyncio${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_asyncio${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_POSTFIX}.exe" ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe
 		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_bz2${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_bz2${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_contextvars${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_contextvars${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_hashlib${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_hashlib${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_lzma${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_lzma${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_sqlite3${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_sqlite3${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ssl${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ssl${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/pyexpat${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/pyexpat${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/select${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/select${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/unicodedata${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/unicodedata${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/winsound${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/winsound${PYTHON_POSTFIX}.pyd
 		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ctypes${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ctypes${PYTHON_POSTFIX}.pyd
 		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ctypes_test${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ctypes_test${PYTHON_POSTFIX}.pyd
 		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_decimal${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_decimal${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_distutils_findvs${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_distutils_findvs${PYTHON_POSTFIX}.pyd
 		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_elementtree${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_elementtree${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_hashlib${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_hashlib${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_lzma${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_lzma${PYTHON_POSTFIX}.pyd
 		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_msi${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_msi${PYTHON_POSTFIX}.pyd
 		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_multiprocessing${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_multiprocessing${PYTHON_POSTFIX}.pyd
 		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_overlapped${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_overlapped${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_queue${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_queue${PYTHON_POSTFIX}.pyd
 		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_socket${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_socket${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_sqlite3${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_sqlite3${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ssl${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ssl${PYTHON_POSTFIX}.pyd
 		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testbuffer${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testbuffer${PYTHON_POSTFIX}.pyd
 		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testcapi${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testcapi${PYTHON_POSTFIX}.pyd
 		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testimportmultiple${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testimportmultiple${PYTHON_POSTFIX}.pyd
 		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testmultiphase${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testmultiphase${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/pyexpat${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/pyexpat${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_POSTFIX}.exe" ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/select${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/select${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/unicodedata${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/unicodedata${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/winsound${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/winsound${PYTHON_POSTFIX}.pyd
-		#xxlimited is an example extension module, we don't need to ship it and debug doesn't build it
-		#leaving it commented out, so I won't get confused again with the next update.
-		#COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/xxlimited${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/xxlimited${PYTHON_POSTFIX}.pyd
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/libssl-1_1${SSL_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/redist/lib/libssl-1_1${SSL_POSTFIX}.dll
-		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/libcrypto-1_1${SSL_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/redist/lib/libcrypto-1_1${SSL_POSTFIX}.dll
 		COMMAND ${CMAKE_COMMAND} -E chdir "${BUILD_DIR}/python/src/external_python/redist" ${CMAKE_COMMAND} -E tar "cfvz" "${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz" "."
-		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/python/ ${HARVEST_TARGET}/python/
-		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz
 	)

 	add_custom_target(Package_Python ALL DEPENDS external_python ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe)

+	if(MSVC12)
+		set(PYTHON_DISTUTIL_PATCH ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/python/src/external_python/run/lib/distutils < ${PATCH_DIR}/python_runtime_vc2013.diff)
+	else()
+		set(PYTHON_DISTUTIL_PATCH echo "No patch needed")
+	endif()
+
 	add_custom_command(OUTPUT ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe
 		COMMAND	${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/redist ${BUILD_DIR}/python/src/external_python/run
 		COMMAND	${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/include ${BUILD_DIR}/python/src/external_python/run/include
@@ -163,18 +134,7 @@ if(MSVC)
 		COMMAND	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib" ${BUILD_DIR}/python/src/external_python/run/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib  #other things like numpy still want it though.
 		COMMAND	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_POSTFIX}.exe" ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe
 		COMMAND	${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe -m ensurepip --upgrade
+		COMMAND	${PYTHON_DISTUTIL_PATCH}
 	)
 	add_custom_target(Make_Python_Environment ALL DEPENDS ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe Package_Python)
 endif()
-
-if(UNIX)
-	add_dependencies(
-		external_python
-		external_bzip2
-		external_ffi
-		external_lzma
-		external_ssl
-		external_sqlite
-		external_zlib
-	)
-endif()
--- a/build_files/build_environment/cmake/python.map
+++ b/build_files/build_environment/cmake/python.map
@@ -1,9 +0,0 @@
-{
-global:
-    Py*;
-    _Py*;
-    _py*;
-local:
-    *;
-};
-
--- a/build_files/build_environment/cmake/schroedinger.cmake
+++ b/build_files/build_environment/cmake/schroedinger.cmake
@@ -0,0 +1,48 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+if(WIN32)
+	set(SCHROEDINGER_EXTRA_FLAGS "CFLAGS=-g -I./ -I${LIBDIR}/orc/include/orc-0.4" "LDFLAGS=-Wl,--as-needed -static-libgcc -L${LIBDIR}/orc/lib" ORC_CFLAGS=-I${LIBDIR}/orc/include/orc-0.4 ORC_LDFLAGS=-L${LIBDIR}/orc/lib ORC_LIBS=${LIBDIR}/orc/lib/liborc-0.4.a ORCC=${LIBDIR}/orc/bin/orcc.exe)
+else()
+	set(SCHROEDINGER_CFLAGS "${PLATFORM_CFLAGS} -I./ -I${LIBDIR}/orc/include/orc-0.4")
+	set(SCHROEDINGER_LDFLAGS "${PLATFORM_LDFLAGS} -L${LIBDIR}/orc/lib")
+	set(SCHROEDINGER_EXTRA_FLAGS CFLAGS=${SCHROEDINGER_CFLAGS} LDFLAGS=${SCHROEDINGER_LDFLAGS} ORC_CFLAGS=-I${LIBDIR}/orc/include/orc-0.4 ORC_LDFLAGS=-L${LIBDIR}/orc/lib ORCC=${LIBDIR}/orc/bin/orcc) # ORC_LIBS=${LIBDIR}/orc/lib/liborc-0.4.a
+endif()
+
+ExternalProject_Add(external_schroedinger
+	URL ${SCHROEDINGER_URI}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	URL_HASH SHA256=${SCHROEDINGER_HASH}
+	PREFIX ${BUILD_DIR}/schroedinger
+	PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/schroedinger/src/external_schroedinger < ${PATCH_DIR}/schroedinger.diff
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
+		cd ${BUILD_DIR}/schroedinger/src/external_schroedinger/ &&
+		${CONFIGURE_COMMAND} --prefix=${LIBDIR}/schroedinger --disable-shared --enable-static ${SCHROEDINGER_EXTRA_FLAGS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/schroedinger/src/external_schroedinger/ && make -j${MAKE_THREADS}
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/schroedinger/src/external_schroedinger/ && make install
+	INSTALL_DIR ${LIBDIR}/schroedinger
+)
+
+add_dependencies(
+	external_schroedinger
+	external_orc
+)
+
+if(MSVC)
+	set_target_properties(external_schroedinger PROPERTIES FOLDER Mingw)
+endif()
--- a/build_files/build_environment/cmake/sdl.cmake
+++ b/build_files/build_environment/cmake/sdl.cmake
@@ -37,12 +37,3 @@ ExternalProject_Add(external_sdl
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/sdl ${DEFAULT_CMAKE_FLAGS} ${SDL_EXTRA_ARGS}
 	INSTALL_DIR ${LIBDIR}/sdl
 )
-
-if(BUILD_MODE STREQUAL Release AND WIN32)
-	ExternalProject_Add_Step(external_sdl after_install
-		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/include/sdl2 ${HARVEST_TARGET}/sdl/include
-		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/lib ${HARVEST_TARGET}/sdl/lib
-		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/bin ${HARVEST_TARGET}/sdl/lib
-		DEPENDEES install
-	)
-endif()
--- a/build_files/build_environment/cmake/setup_mingw32.cmake
+++ b/build_files/build_environment/cmake/setup_mingw32.cmake
@@ -35,9 +35,9 @@ message("mingw_LIBDIR = ${mingw_LIBDIR}")

 message("Checking for mingw32")
 # download mingw32
-if(NOT EXISTS "${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z")
+if(NOT EXISTS "${DOWNLOAD_DIR}/i686-w64-mingw32-gcc-4.8.0-win32_rubenvb.7z")
 	message("Downloading mingw32")
-	file(DOWNLOAD "https://astuteinternet.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.4/threads-win32/sjlj/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z" "${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z")
+	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win32/Personal%20Builds/rubenvb/gcc-4.8-release/i686-w64-mingw32-gcc-4.8.0-win32_rubenvb.7z" "${DOWNLOAD_DIR}/i686-w64-mingw32-gcc-4.8.0-win32_rubenvb.7z")
 endif()

 # make mingw root directory
@@ -49,10 +49,10 @@ if(NOT EXISTS "${DOWNLOAD_DIR}/mingw")
 endif()

 # extract mingw32
-if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd") AND (EXISTS "${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z"))
+if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/mingw32env.cmd") AND (EXISTS "${DOWNLOAD_DIR}/i686-w64-mingw32-gcc-4.8.0-win32_rubenvb.7z"))
 	message("Extracting mingw32")
 	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z
+		COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/i686-w64-mingw32-gcc-4.8.0-win32_rubenvb.7z
 		WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw
 	)
 endif()
@@ -78,24 +78,24 @@ if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/pkg-config.exe") AND (EXISTS "
 endif()

 message("Checking for nasm")
-if(NOT EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip")
+if(NOT EXISTS "${DOWNLOAD_DIR}/nasm-2.12.01-win32.zip")
 	message("Downloading nasm")
-	file(DOWNLOAD "http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/win32/nasm-2.13.02-win32.zip" "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip")
+	file(DOWNLOAD "http://www.nasm.us/pub/nasm/releasebuilds/2.12.01/win32/nasm-2.12.01-win32.zip" "${DOWNLOAD_DIR}/nasm-2.12.01-win32.zip")
 endif()

 # extract nasm
-if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe") AND (EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip"))
+if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe") AND (EXISTS "${DOWNLOAD_DIR}/nasm-2.12.01-win32.zip"))
 	message("Extracting nasm")
 	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip"
+		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/nasm-2.12.01-win32.zip"
 		WORKING_DIRECTORY ${DOWNLOAD_DIR}/
 	)
 	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/nasm-2.13.02/nasm.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/nasm-2.12.01/nasm.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe"
 	)

 endif()
-SET(NASM_PATH ${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe)
+
 message("Checking for mingwGet")
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
 	message("Downloading mingw-get")
@@ -119,15 +119,6 @@ if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get.exe") AND (NOT EXISTS "$
 	)
 endif()

-if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/mktemp.exe"))
-	message("Installing mktemp")
-	execute_process(
-		COMMAND ${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get install msys msys-mktemp
-		WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw32/bin/
-	)
-endif()
-
-
 message("Checking for CoreUtils")
 # download old core_utils for pr.exe (ffmpeg needs it to build)
 if(NOT EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
@@ -225,3 +216,4 @@ if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ranlib.exe")
 		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/ranlib.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ranlib.exe"
 	)
 endif()
+
--- a/build_files/build_environment/cmake/setup_mingw64.cmake
+++ b/build_files/build_environment/cmake/setup_mingw64.cmake
@@ -35,9 +35,9 @@ message("mingw_LIBDIR = ${mingw_LIBDIR}")

 message("Checking for mingw64")
 # download ming64
-if(NOT EXISTS "${DOWNLOAD_DIR}/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z")
+if(NOT EXISTS "${DOWNLOAD_DIR}/x86_64-w64-mingw32-gcc-4.8.0-win64_rubenvb.7z")
 	message("Downloading mingw64")
-	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/4.9.4/threads-win32/seh/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z" "${DOWNLOAD_DIR}/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z")
+	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win64/Personal%20Builds/rubenvb/gcc-4.8-release/x86_64-w64-mingw32-gcc-4.8.0-win64_rubenvb.7z" "${DOWNLOAD_DIR}/x86_64-w64-mingw32-gcc-4.8.0-win64_rubenvb.7z")
 endif()

 # make mingw root directory
@@ -49,10 +49,10 @@ if(NOT EXISTS "${DOWNLOAD_DIR}/mingw")
 endif()

 # extract mingw64
-if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/ming64sh.cmd") AND (EXISTS "${DOWNLOAD_DIR}/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z"))
+if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/mingw64env.cmd") AND (EXISTS "${DOWNLOAD_DIR}/x86_64-w64-mingw32-gcc-4.8.0-win64_rubenvb.7z"))
 	message("Extracting mingw64")
 	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z
+		COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/x86_64-w64-mingw32-gcc-4.8.0-win64_rubenvb.7z
 		WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw
 	)
 endif()
@@ -78,24 +78,23 @@ if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/pkg-config.exe") AND (EXISTS "
 endif()

 message("Checking for nasm")
-if(NOT EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win64.zip")
+if(NOT EXISTS "${DOWNLOAD_DIR}/nasm-2.12.01-win64.zip")
 	message("Downloading nasm")
-	file(DOWNLOAD "http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/win64/nasm-2.13.02-win64.zip" "${DOWNLOAD_DIR}/nasm-2.13.02-win64.zip")
+	file(DOWNLOAD "http://www.nasm.us/pub/nasm/releasebuilds/2.12.01/win64/nasm-2.12.01-win64.zip" "${DOWNLOAD_DIR}/nasm-2.12.01-win64.zip")
 endif()

 # extract nasm
-if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/nasm.exe") AND (EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win64.zip"))
+if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/nasm.exe") AND (EXISTS "${DOWNLOAD_DIR}/nasm-2.12.01-win64.zip"))
 	message("Extracting nasm")
 	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/nasm-2.13.02-win64.zip"
+		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/nasm-2.12.01-win64.zip"
 		WORKING_DIRECTORY ${DOWNLOAD_DIR}/
 	)
 	execute_process(
-		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/nasm-2.13.02/nasm.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/nasm.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/nasm-2.12.01/nasm.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/nasm.exe"
 	)

 endif()
-SET(NASM_PATH ${DOWNLOAD_DIR}/mingw/mingw64/bin/nasm.exe)

 message("Checking for mingwGet")
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
@@ -120,14 +119,6 @@ if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get.exe") AND (NOT EXISTS "$
 	)
 endif()

-if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/mktemp.exe"))
-	message("Installing mktemp")
-	execute_process(
-		COMMAND ${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get install msys msys-mktemp
-		WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw64/bin/
-	)
-endif()
-
 message("Checking for CoreUtils")
 # download old core_utils for pr.exe (ffmpeg needs it to build)
 if(NOT EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
@@ -225,3 +216,4 @@ if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-ranlib.exe")
 		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/ranlib.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-ranlib.exe"
 	)
 endif()
+
--- a/build_files/build_environment/cmake/sqlite.cmake
+++ b/build_files/build_environment/cmake/sqlite.cmake
@@ -1,57 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(SQLITE_CONFIGURE_ENV echo .)
-set(SQLITE_CONFIGURATION_ARGS)
-
-if(UNIX AND NOT APPLE)
-	set(SQLITE_LDFLAGS -Wl,--as-needed)
-	set(SQLITE_CFLAGS
-		"-DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_COLUMN_METADATA \
-		-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
-		-DSQLITE_ENABLE_RTREE=1 -DSQLITE_SOUNDEX=1 \
-		-DSQLITE_ENABLE_UNLOCK_NOTIFY \
-		-DSQLITE_OMIT_LOOKASIDE=1 -DSQLITE_ENABLE_DBSTAT_VTAB \
-		-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1 \
-		-DSQLITE_ENABLE_LOAD_EXTENSION \
-		-DSQLITE_ENABLE_JSON1 \
-		-DSQLITE_LIKE_DOESNT_MATCH_BLOBS \
-		-DSQLITE_THREADSAFE=1 \
-		-DSQLITE_ENABLE_FTS3_TOKENIZER=1 \
-		-DSQLITE_MAX_SCHEMA_RETRY=25 \
-		-DSQLITE_ENABLE_PREUPDATE_HOOK \
-		-DSQLITE_ENABLE_SESSION \
-		-DSQLITE_ENABLE_STMTVTAB \
-		-DSQLITE_MAX_VARIABLE_NUMBER=250000 \
-		-fPIC")
-	set(SQLITE_CONFIGURE_ENV ${SQLITE_CONFIGURE_ENV} && export LDFLAGS=${SQLITE_LDFLAGS} && export CFLAGS=${SQLITE_CFLAGS})
-	set(SQLITE_CONFIGURATION_ARGS ${SQLITE_CONFIGURATION_ARGS} --enable-threadsafe --enable-load-extension --enable-json1 --enable-fts4 --enable-fts5
-	    --enable-shared=no)
-endif()
-
-ExternalProject_Add(external_sqlite
-	URL ${SQLITE_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH SHA1=${SQLITE_HASH}
-	PREFIX ${BUILD_DIR}/sqlite
-	PATCH_COMMAND ${SQLITE_PATCH_CMD}
-	CONFIGURE_COMMAND ${SQLITE_CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/sqlite ${SQLITE_CONFIGURATION_ARGS}
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && make install
-	INSTALL_DIR ${LIBDIR}/sqlite
-)
--- a/build_files/build_environment/cmake/ssl.cmake
+++ b/build_files/build_environment/cmake/ssl.cmake
@@ -1,48 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(SSL_CONFIGURE_COMMAND ./Configure)
-set(SSL_PATCH_CMD echo .)
-
-if (APPLE)
-	set(SSL_OS_COMPILER "blender-darwin-x86_64")
-else()
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-		set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)
-		set(SSL_OS_COMPILER "blender-linux-x86_64")
-	else()
-		set(SSL_OS_COMPILER "blender-linux-x86")
-	endif()
-endif()
-
-ExternalProject_Add(external_ssl
-	URL ${SSL_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH SHA256=${SSL_HASH}
-	PREFIX ${BUILD_DIR}/ssl
-	PATCH_COMMAND ${SSL_PATCH_CMD}
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && ${SSL_CONFIGURE_COMMAND} --prefix=${LIBDIR}/ssl
-		--openssldir=${LIBDIR}/ssl
-		no-shared
-		no-idea no-mdc2 no-rc5 no-zlib no-ssl3 enable-unit-test no-ssl3-method enable-rfc3779 enable-cms
-		--config=${CMAKE_CURRENT_SOURCE_DIR}/cmake/ssl.conf
-		${SSL_OS_COMPILER}
-	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make -j${MAKE_THREADS}
-	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make install
-	INSTALL_DIR ${LIBDIR}/ssl
-)
--- a/build_files/build_environment/cmake/ssl.conf
+++ b/build_files/build_environment/cmake/ssl.conf
@@ -1,15 +0,0 @@
-%targets = (
-
-  "blender-linux-x86" => {
-    inherit_from     => [ "linux-x86" ],
-    cflags => add("-fPIC"),
-  },
-  "blender-linux-x86_64" => {
-    inherit_from     => [ "linux-x86_64" ],
-    cflags => add("-fPIC"),
-  },
-  "blender-darwin-x86_64" => {
-    inherit_from     => [ "darwin64-x86_64-cc" ],
-    cflags => add("-fPIC"),
-  },
-);
--- a/build_files/build_environment/cmake/tbb.cmake
+++ b/build_files/build_environment/cmake/tbb.cmake
@@ -23,6 +23,14 @@ set(TBB_EXTRA_ARGS
 	-DTBB_BUILD_STATIC=On
 )

+if(TBB_VERSION MATCHES 2018)
+	set(TBB_VS_VERSION vs2013)
+elseif(TBB_VERSION MATCHES 2017)
+	set(TBB_VS_VERSION vs2012)
+else()
+	set(TBB_VS_VERSION vs2010)
+endif()
+
 # CMake script for TBB from https://github.com/wjakob/tbb/blob/master/CMakeLists.txt
 ExternalProject_Add(external_tbb
 	URL ${TBB_URI}
@@ -30,23 +38,7 @@ ExternalProject_Add(external_tbb
 	URL_HASH MD5=${TBB_HASH}
 	PREFIX ${BUILD_DIR}/tbb
 	PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_tbb.txt ${BUILD_DIR}/tbb/src/external_tbb/CMakeLists.txt &&
-	${CMAKE_COMMAND} -E copy ${BUILD_DIR}/tbb/src/external_tbb/build/vs2013/version_string.ver ${BUILD_DIR}/tbb/src/external_tbb/src/tbb/version_string.ver
+		${CMAKE_COMMAND} -E copy ${BUILD_DIR}/tbb/src/external_tbb/build/${TBB_VS_VERSION}/version_string.ver ${BUILD_DIR}/tbb/src/external_tbb/src/tbb/version_string.ver
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tbb ${DEFAULT_CMAKE_FLAGS} ${TBB_EXTRA_ARGS}
 	INSTALL_DIR ${LIBDIR}/tbb
 )
-
-if (WIN32)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_tbb after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb.lib
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tbb/include/ ${HARVEST_TARGET}/tbb/include/
-			DEPENDEES install
-		)
-	endif()
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(external_tbb after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb_debug.lib
-			DEPENDEES install
-		)
-	endif()
-endif()
--- a/build_files/build_environment/cmake/tinyxml.cmake
+++ b/build_files/build_environment/cmake/tinyxml.cmake
@@ -1,31 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(TINYXML_EXTRA_ARGS
-)
-
-ExternalProject_Add(external_tinyxml
-	URL ${TINYXML_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${TINYXML_HASH}
-	PREFIX ${BUILD_DIR}/tinyxml
-	#patch taken from ocio
-	PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/tinyxml/src/external_tinyxml < ${PATCH_DIR}/tinyxml.diff
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tinyxml ${DEFAULT_CMAKE_FLAGS} ${TINYXML_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/tinyxml
-)
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -16,63 +16,46 @@
 #
 # ***** END GPL LICENSE BLOCK *****

-set(ZLIB_VERSION 1.2.11)
-set(ZLIB_URI https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz)
-set(ZLIB_HASH 1c9f62f0778697a09d36121ead88e08e)
+set(ZLIB_VERSION 1.2.8)
+set(ZLIB_URI https://netcologne.dl.sourceforge.net/project/libpng/zlib/${ZLIB_VERSION}/zlib-${ZLIB_VERSION}.tar.gz)
+set(ZLIB_HASH 44d667c142d7cda120332623eab69f40)

-set(OPENAL_VERSION 1.18.2)
+set(OPENAL_VERSION 1.17.2)
 set(OPENAL_URI http://kcat.strangesoft.net/openal-releases/openal-soft-${OPENAL_VERSION}.tar.bz2)
-set(OPENAL_HASH d4eeb0889812e2fdeaa1843523d76190)
+set(OPENAL_HASH 1764e0d8fec499589b47ebc724e0913d)

-set(PNG_VERSION 1.6.35)
-set(PNG_URI http://prdownloads.sourceforge.net/libpng/libpng-${PNG_VERSION}.tar.xz)
-set(PNG_HASH 678b7e696a62a193ed3503b04bf449d6)
+set(PNG_VERSION 1.6.21)
+set(PNG_URI http://prdownloads.sourceforge.net/libpng/libpng-${PNG_VERSION}.tar.gz)
+set(PNG_HASH aca36ec8e0a3b406a5912243bc243717)

-set(JPEG_VERSION 1.5.3)
+set(JPEG_VERSION 1.4.2)
 set(JPEG_URI https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${JPEG_VERSION}.tar.gz)
-set(JPEG_HASH 5b7549d440b86c98a517355c102d155e)
+set(JPEG_HASH f9804884c1c41eb7f4febb9353a2cb27)

-set(BOOST_VERSION 1.68.0)
-set(BOOST_VERSION_NODOTS 1_68_0)
-set(BOOST_URI https://dl.bintray.com/boostorg/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_NODOTS}.tar.gz)
-set(BOOST_HASH 5d8b4503582fffa9eefdb9045359c239)
+set(BOOST_VERSION 1.60.0)
+set(BOOST_VERSION_NODOTS 1_60_0)
+set(BOOST_URI http://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/boost_${BOOST_VERSION_NODOTS}.tar.bz2/download)
+set(BOOST_MD5 65a840e1a0b13a558ff19eeb2c4f0cbe)

-set(BLOSC_VERSION 1.14.4)
-set(BLOSC_URI https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.tar.gz)
-set(BLOSC_HASH e80dfc71e4cba03b8d01ed0876547ffe)
+set(BLOSC_VERSION 1.7.1)
+set(BLOSC_URI https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.zip)
+set(BLOSC_HASH ff5cc729a5a25934ef714217218eed26)

 set(PTHREADS_VERSION 2-9-1)
 set(PTHREADS_URI ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-${PTHREADS_VERSION}-release.tar.gz)
 set(PTHREADS_SHA512 9c06e85310766834370c3dceb83faafd397da18a32411ca7645c8eb6b9495fea54ca2872f4a3e8d83cb5fdc5dea7f3f0464be5bb9af3222a6534574a184bd551)

-set(ILMBASE_VERSION 2.3.0)
-if (WIN32)
-	if(BUILD_MODE STREQUAL Release)
-		set(ILMBASE_VERSION_POSTFIX _s)
-		set(OPENEXR_VERSION_POSTFIX _s)
-	else()
-		set(ILMBASE_VERSION_POSTFIX _s_d)
-		set(OPENEXR_VERSION_POSTFIX _s_d)
-	endif()
-else()
-	set(ILMBASE_VERSION_POSTFIX)
-endif()
-set(ILMBASE_URI https://github.com/openexr/openexr/releases/download/v${ILMBASE_VERSION}/ilmbase-${ILMBASE_VERSION}.tar.gz)
-set(ILMBASE_HASH 354bf86de3b930ab87ac63619d60c860)
+set(ILMBASE_VERSION 2.2.0)
+set(ILMBASE_URI http://download.savannah.nongnu.org/releases/openexr/ilmbase-${ILMBASE_VERSION}.tar.gz)
+set(ILMBASE_HASH b540db502c5fa42078249f43d18a4652)

-set(OPENEXR_VERSION 2.3.0)
-if (WIN32) #release 2.3.0 tarball has broken cmake support
-	set(OPENEXR_URI https://github.com/openexr/openexr/archive/0ac2ea34c8f3134148a5df4052e40f155b76f6fb.tar.gz)
-	set(OPENEXR_HASH ed159435d508240712fbaaa21d94bafb)
-else()
-	set(OPENEXR_VERSION_POSTFIX)
-	set(OPENEXR_URI https://github.com/openexr/openexr/releases/download/v${OPENEXR_VERSION}/openexr-${OPENEXR_VERSION}.tar.gz)
-	set(OPENEXR_HASH a157e8a46596bc185f2472a5a4682174)
-endif()
+set(OPENEXR_VERSION 2.2.0)
+set(OPENEXR_URI http://download.savannah.nongnu.org/releases/openexr/openexr-2.2.0.tar.gz)
+set(OPENEXR_HASH b64e931c82aa3790329c21418373db4e)

-set(FREETYPE_VERSION 2.9.1)
-set(FREETYPE_URI http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz)
-set(FREETYPE_HASH 3adb0e35d3c100c456357345ccfa8056)
+set(FREETYPE_VERSION 263)
+set(FREETYPE_URI http://download.savannah.gnu.org/releases/freetype/ft${FREETYPE_VERSION}.zip)
+set(FREETYPE_HASH 0db2a43301572e5c2b4a0864f237aeeb)

 set(GLEW_VERSION 1.13.0)
 set(GLEW_URI http://prdownloads.sourceforge.net/glew/glew/${GLEW_VERSION}/glew-${GLEW_VERSION}.tgz)
@@ -86,9 +69,9 @@ set(HDF5_VERSION 1.8.17)
 set(HDF5_URI https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-${HDF5_VERSION}/src/hdf5-${HDF5_VERSION}.tar.gz)
 set(HDF5_HASH 7d572f8f3b798a628b8245af0391a0ca)

-set(ALEMBIC_VERSION 1.7.8)
-set(ALEMBIC_URI https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.tar.gz)
-set(ALEMBIC_MD5 d095c2feb5e183b824904db7b63c1d30)
+set(ALEMBIC_VERSION 1.7.1)
+set(ALEMBIC_URI https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.zip)
+set(ALEMBIC_MD5 cf7705055501d5ea0cb8256866496f79)

 ## hash is for 3.1.2
 set(GLFW_GIT_UID 30306e54705c3adae9fe082c816a3be71963485c)
@@ -105,122 +88,141 @@ set(CUEW_GIT_UID 1744972026de9cf27c8a7dc39cf39cd83d5f922f)
 set(CUEW_URI https://github.com/CudaWrangler/cuew/archive/${CUEW_GIT_UID}.zip)
 set(CUEW_HASH 86760d62978ebfd96cd93f5aa1abaf4a)

-set(OPENSUBDIV_VERSION v3_3_3)
-set(OPENSUBDIV_Hash 29c79dc01ef616aab02670bed5544ddd)
-set(OPENSUBDIV_URI https://github.com/PixarAnimationStudios/OpenSubdiv/archive/${OPENSUBDIV_VERSION}.tar.gz)
+set(OPENSUBDIV_VERSION v3_1_1)
+set(OPENSUBDIV_Hash 25a9a6a94136b0eb85ce69e9c8cb6ab3)
+set(OPENSUBDIV_URI https://github.com/PixarAnimationStudios/OpenSubdiv/archive/${OPENSUBDIV_VERSION}.zip)

-set(SDL_VERSION 2.0.8)
+set(SDL_VERSION 2.0.4)
 set(SDL_URI https://www.libsdl.org/release/SDL2-${SDL_VERSION}.tar.gz)
-set(SDL_HASH 3800d705cef742c6a634f202c37f263f)
+set(SDL_HASH 44fc4a023349933e7f5d7a582f7b886e)

-set(OPENCOLLADA_VERSION v1.6.63)
+set(OPENCOLLADA_VERSION v1.6.51)
 set(OPENCOLLADA_URI https://github.com/KhronosGroup/OpenCOLLADA/archive/${OPENCOLLADA_VERSION}.tar.gz)
-set(OPENCOLLADA_HASH e937c3897b86fc0da53cde97257f5156)
+set(OPENCOLLADA_HASH 23db5087faed4bc4cc1dfe456c0d4701)

-set(OPENCOLORIO_VERSION 1.1.0)
-set(OPENCOLORIO_URI https://github.com/imageworks/OpenColorIO/archive/v${OPENCOLORIO_VERSION}.tar.gz)
-set(OPENCOLORIO_HASH 802d8f5b1d1fe316ec5f76511aa611b8)
+set(OPENCOLORIO_URI https://github.com/imageworks/OpenColorIO/archive/6de971097c7f552300f669ed69ca0b6cf5a70843.zip)
+set(OPENCOLORIO_HASH c9de0fd98f26ce6f2e08d617ca68b8e4)

-set(LLVM_VERSION 6.0.1)
-set(LLVM_URI http://releases.llvm.org/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz)
-set(LLVM_HASH c88c98709300ce2c285391f387fecce0)
+set(LLVM_VERSION 3.4.2)
+set(LLVM_URI http://releases.llvm.org/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.gz)
+set(LLVM_HASH a20669f75967440de949ac3b1bad439c)

-set(CLANG_URI http://releases.llvm.org/${LLVM_VERSION}/cfe-${LLVM_VERSION}.src.tar.xz)
-set(CLANG_HASH 4e419bd4e3b55aa06d872320f754bd85)
+set(CLANG_URI http://releases.llvm.org/${LLVM_VERSION}/cfe-${LLVM_VERSION}.src.tar.gz)
+set(CLANG_HASH 87945973b7c73038871c5f849a818588)

-set(OPENMP_URI http://releases.llvm.org/${LLVM_VERSION}/openmp-${LLVM_VERSION}.src.tar.xz)
-set(OPENMP_HASH 4826402ae3633c36c51ba4d0e5527d30)
+set(OPENIMAGEIO_VERSION 1.7.15)
+set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/Release-${OPENIMAGEIO_VERSION}.zip)
+set(OPENIMAGEIO_HASH_178 e156e3669af0e1373142ab5e8f13de66)
+set(OPENIMAGEIO_HASH_179 4121cb0e0433bda6a7ef32c8628a149f)
+set(OPENIMAGEIO_HASH_1713 42a662775b834161ba88c6abdb299360)
+set(OPENIMAGEIO_HASH_1715 e2ece0f62c013d64c478f82265988b0b)
+set(OPENIMAGEIO_HASH ${OPENIMAGEIO_HASH_1715})

-set(OPENIMAGEIO_VERSION 1.8.13)
-set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/Release-${OPENIMAGEIO_VERSION}.tar.gz)
-set(OPENIMAGEIO_HASH f5526c3c9878029ee900d84856683f93)

-set(TIFF_VERSION 4.0.9)
+set(TIFF_VERSION 4.0.6)
 set(TIFF_URI http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz)
-set(TIFF_HASH 54bad211279cc93eb4fca31ba9bfdc79)
+set(TIFF_HASH d1d2e940dea0b5ad435f21f03d96dd72)

-set(OSL_VERSION 1.9.9)
-set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.tar.gz)
-set(OSL_HASH 44ad511e424965a10fce051a053b0605)
+set(FLEXBISON_VERSION 2.5.5)
+set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison//win_flex_bison-2.5.5.zip)
+set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce)

-set(PYTHON_VERSION 3.7.0)
-set(PYTHON_SHORT_VERSION 3.7)
-set(PYTHON_SHORT_VERSION_NO_DOTS 37)
+set(OSL_VERSION 1.7.5)
+set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.zip)
+set(OSL_HASH 6924dd5d453159e7b6eb106a08c358cf)
+
+set(PYTHON_VERSION 3.6.2)
+set(PYTHON_SHORT_VERSION 3.6)
+set(PYTHON_SHORT_VERSION_NO_DOTS 36)
 set(PYTHON_URI https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz)
-set(PYTHON_HASH eb8c2a6b1447d50813c02714af4681f3)
+set(PYTHON_HASH 2c68846471994897278364fc18730dd9)

-set(TBB_VERSION 2018_U5)
-set(TBB_URI https://github.com/01org/tbb/archive/${TBB_VERSION}.tar.gz)
-set(TBB_HASH ff3ae09f8c23892fbc3008c39f78288f)
+if(UNIX AND NOT APPLE)
+	# Needed to be compatible with GCC 7, other platforms can upgrade later
+	set(TBB_VERSION 2017_U7)
+	set(TBB_URI https://github.com/01org/tbb/archive/${TBB_VERSION}.tar.gz)
+	set(TBB_HASH 364f2a4b80e978f38a69cbf7c466b898)
+else()
+	set(TBB_VERSION 44_20160128)
+	set(TBB_URI https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${TBB_VERSION}oss_src_0.tgz)
+	set(TBB_HASH 9d8a4cdf43496f1b3f7c473a5248e5cc)
+endif()

-set(OPENVDB_VERSION 5.1.0)
+set(OPENVDB_VERSION 3.1.0)
 set(OPENVDB_URI https://github.com/dreamworksanimation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz)
-set(OPENVDB_HASH 5310101f874dcfd2165f9cee68c22624)
+set(OPENVDB_HASH 30a7e9571a03ab7bcf1a39fb62aa436f)

-set(IDNA_VERSION 2.7)
-set(CHARDET_VERSION 3.0.4)
-set(URLLIB3_VERSION 1.23)
-set(CERTIFI_VERSION 2018.8.13)
-set(REQUESTS_VERSION 2.19.1)
+set(IDNA_VERSION 2.6)
+set(CHARDET_VERSION 3.0.2)
+set(URLLIB3_VERSION 1.22)
+set(CERTIFI_VERSION 2017.7.27.1)
+set(REQUESTS_VERSION 2.18.4)

-set(NUMPY_VERSION v1.15.0)
-set(NUMPY_SHORT_VERSION 1.15)
-set(NUMPY_URI https://files.pythonhosted.org/packages/3a/20/c81632328b1a4e1db65f45c0a1350a9c5341fd4bbb8ea66cdd98da56fe2e/numpy-1.15.0.zip)
-set(NUMPY_HASH 20e13185089011116a98e11c9bf8aa07)
+set(NUMPY_VERSION v1.13.1)
+set(NUMPY_SHORT_VERSION 1.13)
+set(NUMPY_URI https://pypi.python.org/packages/c0/3a/40967d9f5675fbb097ffec170f59c2ba19fc96373e73ad47c2cae9a30aed/numpy-1.13.1.zip)
+set(NUMPY_HASH 2c3c0f4edf720c3a7b525dacc825b9ae)

-set(LAME_VERSION 3.100)
-set(LAME_URI http://downloads.sourceforge.net/project/lame/lame/3.100/lame-${LAME_VERSION}.tar.gz)
-set(LAME_HASH 83e260acbe4389b54fe08e0bdbf7cddb)
+set(LAME_VERSION 3.99.5)
+set(LAME_URI http://downloads.sourceforge.net/project/lame/lame/3.99/lame-${LAME_VERSION}.tar.gz)
+set(LAME_HASH 84835b313d4a8b68f5349816d33e07ce)

-set(OGG_VERSION 1.3.3)
+set(OGG_VERSION 1.3.2)
 set(OGG_URI http://downloads.xiph.org/releases/ogg/libogg-${OGG_VERSION}.tar.gz)
-set(OGG_HASH c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985)
+set(OGG_HASH e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692)

-set(VORBIS_VERSION 1.3.6)
+set(VORBIS_VERSION 1.3.5)
 set(VORBIS_URI http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS_VERSION}.tar.gz)
-set(VORBIS_HASH 6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb)
+set(VORBIS_HASH 6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce)

 set(THEORA_VERSION 1.1.1)
 set(THEORA_URI http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2)
 set(THEORA_HASH b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc)

-set(FLAC_VERSION 1.3.2)
+set(FLAC_VERSION 1.3.1)
 set(FLAC_URI http://downloads.xiph.org/releases/flac/flac-${FLAC_VERSION}.tar.xz)
-set(FLAC_HASH 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f)
+set(FLAC_HASH 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c)

-set(VPX_VERSION 1.7.0)
-set(VPX_URI https://github.com/webmproject/libvpx/archive/v${VPX_VERSION}/libvpx-v${VPX_VERSION}.tar.gz)
-set(VPX_HASH 1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238)
+set(VPX_VERSION 1.5.0)
+set(VPX_URI http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-${VPX_VERSION}.tar.bz2)
+set(VPX_HASH 306d67908625675f8e188d37a81fbfafdf5068b09d9aa52702b6fbe601c76797)

-set(X264_URI http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20180811-2245-stable.tar.bz2)
-set(X264_HASH ae8a868a0e236a348b35d79f3ee80294b169d1195408b689f9851383661ed7aa)
+set(ORC_VERSION 0.4.25)
+set(ORC_URI https://gstreamer.freedesktop.org/src/orc/orc-${ORC_VERSION}.tar.xz)
+set(ORC_HASH c1b1d54a58f26d483f0b3881538984789fe5d5460ab8fab74a1cacbd3d1c53d1)

-set(XVIDCORE_VERSION 1.3.5)
+set(SCHROEDINGER_VERSION 1.0.11)
+set(SCHROEDINGER_URI https://download.videolan.org/contrib/schroedinger/schroedinger-${SCHROEDINGER_VERSION}.tar.gz)
+set(SCHROEDINGER_HASH 1e572a0735b92aca5746c4528f9bebd35aa0ccf8619b22fa2756137a8cc9f912)
+
+set(X264_URI http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20160401-2245-stable.tar.bz2)
+set(X264_HASH 1e9a7b835e80313aade53a9b6ff353e099de3856bf5f30a4d8dfc91281f786f5)
+
+set(XVIDCORE_VERSION 1.3.4)
 set(XVIDCORE_URI http://downloads.xvid.org/downloads/xvidcore-${XVIDCORE_VERSION}.tar.gz)
-set(XVIDCORE_HASH 165ba6a2a447a8375f7b06db5a3c91810181f2898166e7c8137401d7fc894cf0)
+set(XVIDCORE_HASH 4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f)

 #this has to be in sync with the version in blenders /extern folder
-set(OPENJPEG_VERSION 2.3.0)
-set(OPENJPEG_SHORT_VERSION 2.3)
-# Use slightly newer commit after release which includes a cmake fix
-set(OPENJPEG_URI https://github.com/uclouvain/openjpeg/archive/66297f07a43.zip)
-set(OPENJPEG_HASH 8242b18d908c7c42174e4231a741cfa7ce7c26b6ed5c9644feb9df7b3054310b)
+set(OPENJPEG_VERSION 1.5.2)
+set(OPENJPEG_SHORT_VERSION 1.5)
+set(OPENJPEG_URI https://github.com/uclouvain/openjpeg/archive/version.${OPENJPEG_VERSION}.tar.gz)
+set(OPENJPEG_HASH 3734e95edd0bef6e056815591755efd822228dc3cd866894e00a2c929026b16d)

-set(FAAD_VERSION 2-2.8.8)
-set(FAAD_URI http://downloads.sourceforge.net/faac/faad${FAAD_VERSION}.tar.gz)
-set(FAAD_HASH 28f6116efdbe9378269f8a6221767d1f)
+set(FAAD_VERSION 2-2.7)
+set(FAAD_URI http://downloads.sourceforge.net/faac/faad${FAAD_VERSION}.tar.bz2)
+set(FAAD_HASH 4c332fa23febc0e4648064685a3d4332)

-set(FFMPEG_VERSION 4.0.2)
+set(FFMPEG_VERSION 3.2.1)
 set(FFMPEG_URI http://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2)
-set(FFMPEG_HASH 5576e8a22f80b6a336db39808f427cfb)
+set(FFMPEG_HASH cede174178e61f882844f5870c35ce72)

-set(FFTW_VERSION 3.3.8)
+set(FFTW_VERSION 3.3.4)
 set(FFTW_URI http://www.fftw.org/fftw-${FFTW_VERSION}.tar.gz)
-set(FFTW_HASH 8aac833c943d8e90d51b697b27d4384d)
+set(FFTW_HASH 2edab8c06b24feeb3b82bbb3ebf3e7b3)

-set(ICONV_VERSION 1.15)
+set(ICONV_VERSION 1.14)
 set(ICONV_URI http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz)
-set(ICONV_HASH ace8b5f2db42f7b3b3057585e80d9808)
+set(ICONV_HASH e34509b1623cec449dfeb73d7ce9c6c6)

 set(LAPACK_VERSION 3.6.0)
 set(LAPACK_URI http://www.netlib.org/lapack/lapack-${LAPACK_VERSION}.tgz)
@@ -238,9 +240,9 @@ set(HIDAPI_UID 89a6c75dc6f45ecabd4ddfbd2bf5ba6ad8ba38b5)
 set(HIDAPI_URI https://github.com/TheOnlyJoey/hidapi/archive/${HIDAPI_UID}.zip)
 set(HIDAPI_HASH b6e22f6b514f8bcf594989f20ffc46fb)

-set(WEBP_VERSION 0.6.1)
+set(WEBP_VERSION 0.5.1)
 set(WEBP_URI https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz)
-set(WEBP_HASH b49ce9c3e3e9acae4d91bca44bb85a72)
+set(WEBP_HASH 3d7db92ebba5b4f679413d25c6040881)

 set(SPNAV_VERSION 0.2.3)
 set(SPNAV_URI http://downloads.sourceforge.net/project/spacenav/spacenav%20library%20%28SDK%29/libspnav%20${SPNAV_VERSION}/libspnav-${SPNAV_VERSION}.tar.gz)
@@ -253,48 +255,3 @@ set(JEMALLOC_HASH 507f7b6b882d868730d644510491d18f)
 set(XML2_VERSION 2.9.4)
 set(XML2_URI ftp://xmlsoft.org/libxml2/libxml2-${XML2_VERSION}.tar.gz)
 set(XML2_HASH ae249165c173b1ff386ee8ad676815f5)
-
-set(TINYXML_VERSION 2_6_2)
-set(TINYXML_VERSION_DOTS 2.6.2)
-set(TINYXML_URI https://nchc.dl.sourceforge.net/project/tinyxml/tinyxml/${TINYXML_VERSION_DOTS}/tinyxml_${TINYXML_VERSION}.tar.gz)
-set(TINYXML_HASH c1b864c96804a10526540c664ade67f0)
-
-set(YAMLCPP_VERSION 0.6.2)
-set(YAMLCPP_URI https://codeload.github.com/jbeder/yaml-cpp/tar.gz/yaml-cpp-${YAMLCPP_VERSION})
-set(YAMLCPP_HASH 5b943e9af0060d0811148b037449ef82)
-
-set(LCMS_VERSION 2.9)
-set(LCMS_URI https://nchc.dl.sourceforge.net/project/lcms/lcms/${LCMS_VERSION}/lcms2-${LCMS_VERSION}.tar.gz)
-set(LCMS_HASH 8de1b7724f578d2995c8fdfa35c3ad0e)
-
-set(PUGIXML_VERSION 1.9)
-set(PUGIXML_URI https://github.com/zeux/pugixml/archive/v1.9.tar.gz)
-set(PUGIXML_HASH 9346ca1dce2c48f1748c12fdac41a714)
-
-set(FLEXBISON_VERSION 2.5.5)
-set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison//win_flex_bison-2.5.5.zip)
-set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce)
-
-# Libraries to keep Python modules static on Linux.
-
-# NOTE: bzip.org domain does no longer belong to BZip 2 project, so we download
-# sources from Debian packaging.
-set(BZIP2_VERSION 1.0.6)
-set(BZIP2_URI http://http.debian.net/debian/pool/main/b/bzip2/bzip2_${BZIP2_VERSION}.orig.tar.bz2)
-set(BZIP2_HASH d70a9ccd8bdf47e302d96c69fecd54925f45d9c7b966bb4ef5f56b770960afa7)
-
-set(FFI_VERSION 3.2.1)
-set(FFI_URI ftp://sourceware.org/pub/libffi/libffi-${FFI_VERSION}.tar.gz)
-set(FFI_HASH d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37)
-
-set(LZMA_VERSION 5.2.4)
-set(LZMA_URI https://tukaani.org/xz/xz-${LZMA_VERSION}.tar.bz2)
-set(LZMA_HASH 3313fd2a95f43d88e44264e6b015e7d03053e681860b0d5d3f9baca79c57b7bf)
-
-set(SSL_VERSION 1.1.0i)
-set(SSL_URI https://www.openssl.org/source/openssl-${SSL_VERSION}.tar.gz)
-set(SSL_HASH ebbfc844a8c8cc0ea5dc10b86c9ce97f401837f3fa08c17b2cdadc118253cf99)
-
-set(SQLITE_VERSION 3.24.0)
-set(SQLITE_URI https://www.sqlite.org/2018/sqlite-src-3240000.zip)
-set(SQLITE_HASH fb558c49ee21a837713c4f1e7e413309aabdd9c7)
--- a/build_files/build_environment/cmake/vpx.cmake
+++ b/build_files/build_environment/cmake/vpx.cmake
@@ -18,9 +18,9 @@

 if(WIN32)
 	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-		set(VPX_EXTRA_FLAGS --target=x86_64-win64-gcc --disable-multithread)
+		set(VPX_EXTRA_FLAGS --target=x86_64-win64-gcc)
 	else()
-		set(VPX_EXTRA_FLAGS --target=x86-win32-gcc --disable-multithread)
+		set(VPX_EXTRA_FLAGS --target=x86-win32-gcc)
 	endif()
 else()
 	if(APPLE)
--- a/build_files/build_environment/cmake/webp.cmake
+++ b/build_files/build_environment/cmake/webp.cmake
@@ -37,5 +37,14 @@ ExternalProject_Add(external_webp
 	URL_HASH MD5=${WEBP_HASH}
 	PREFIX ${BUILD_DIR}/webp
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/webp -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${WEBP_EXTRA_ARGS}
+	INSTALL_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/webp/src/external_webp-build/${WEBP_BUILD_DIR}${LIBPREFIX}webp${LIBEXT} ${LIBDIR}/webp/lib/${LIBPREFIX}webp${LIBEXT} &&
+		${CMAKE_COMMAND} -E copy ${BUILD_DIR}/webp/src/external_webp/src/webp/decode.h ${LIBDIR}/webp/include/webp/decode.h &&
+		${CMAKE_COMMAND} -E copy ${BUILD_DIR}/webp/src/external_webp/src/webp/encode.h ${LIBDIR}/webp/include/webp/encode.h &&
+		${CMAKE_COMMAND} -E copy ${BUILD_DIR}/webp/src/external_webp/src/webp/demux.h ${LIBDIR}/webp/include/webp/demux.h &&
+		${CMAKE_COMMAND} -E copy ${BUILD_DIR}/webp/src/external_webp/src/webp/extras.h ${LIBDIR}/webp/include/webp/extras.h &&
+		${CMAKE_COMMAND} -E copy ${BUILD_DIR}/webp/src/external_webp/src/webp/format_constants.h ${LIBDIR}/webp/include/webp/format_constants.h &&
+		${CMAKE_COMMAND} -E copy ${BUILD_DIR}/webp/src/external_webp/src/webp/mux.h ${LIBDIR}/webp/include/webp/mux.h &&
+		${CMAKE_COMMAND} -E copy ${BUILD_DIR}/webp/src/external_webp/src/webp/mux_types.h ${LIBDIR}/webp/include/webp/mux_types.h &&
+		${CMAKE_COMMAND} -E copy ${BUILD_DIR}/webp/src/external_webp/src/webp/types.h ${LIBDIR}/webp/include/webp/types.h
 	INSTALL_DIR ${LIBDIR}/webp
 )
--- a/build_files/build_environment/cmake/x264.cmake
+++ b/build_files/build_environment/cmake/x264.cmake
@@ -18,19 +18,14 @@

 if(WIN32)
 	set(X264_EXTRA_ARGS --enable-win32thread --cross-prefix=${MINGW_HOST}- --host=${MINGW_HOST})
-	set(X264_PATCH_CMD ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/x264/src/external_x264 < ${PATCH_DIR}/x264.diff)
-else()
-	set(X264_PATCH_CMD echo .)
 endif()

-
 ExternalProject_Add(external_x264
 	URL ${X264_URI}
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
 	URL_HASH SHA256=${X264_HASH}
 	PREFIX ${BUILD_DIR}/x264
-	PATCH_COMMAND ${X264_PATCH_CMD}
-	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/x264
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/x264 
 		--enable-static
 		--enable-pic
 		--disable-lavf
--- a/build_files/build_environment/cmake/yamlcpp.cmake
+++ b/build_files/build_environment/cmake/yamlcpp.cmake
@@ -1,34 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(YAMLCPP_EXTRA_ARGS
-	-DBUILD_GMOCK=OFF
-	-DYAML_CPP_BUILD_TESTS=OFF
-	-DYAML_CPP_BUILD_TOOLS=OFF
-	-DYAML_CPP_BUILD_CONTRIB=OFF
-	-DMSVC_SHARED_RT=OFF
-)
-
-ExternalProject_Add(external_yamlcpp
-	URL ${YAMLCPP_URI}
-	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-	URL_HASH MD5=${YAMLCPP_HASH}
-	PREFIX ${BUILD_DIR}/yamlcpp
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/yamlcpp ${DEFAULT_CMAKE_FLAGS} ${YAMLCPP_EXTRA_ARGS}
-	INSTALL_DIR ${LIBDIR}/yamlcpp
-)
--- a/build_files/build_environment/cmake/zlib.cmake
+++ b/build_files/build_environment/cmake/zlib.cmake
@@ -25,31 +25,9 @@ ExternalProject_Add(external_zlib
 	INSTALL_DIR ${LIBDIR}/zlib
 )

-if (WIN32)
-	if(BUILD_MODE STREQUAL Release)
-		ExternalProject_Add_Step(external_zlib after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstatic${LIBEXT} ${HARVEST_TARGET}/zlib/lib/libz_st${LIBEXT}
-			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zlib/include/ ${HARVEST_TARGET}/zlib/include/
-			DEPENDEES install
-		)
-	endif()
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(external_zlib after_install
-		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstaticd${LIBEXT} ${HARVEST_TARGET}/zlib/lib/libz_st_d${LIBEXT}
+if(BUILD_MODE STREQUAL Debug)
+	ExternalProject_Add_Step(external_zlib after_install
+		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstaticd${LIBEXT} ${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
 		DEPENDEES install
-		)
-	endif()
-else()
-	if(BUILD_MODE STREQUAL Debug)
-		ExternalProject_Add_Step(external_zlib after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstaticd${LIBEXT} ${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-			DEPENDEES install
-		)
-	endif()
-	if (UNIX)
-		ExternalProject_Add_Step(external_zlib after_install
-			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/libz.a ${LIBDIR}/zlib/lib/libz_pic.a
-			DEPENDEES install
-		)
-	endif()
+	)
 endif()
--- a/build_files/build_environment/cmake/zlib_mingw.cmake
+++ b/build_files/build_environment/cmake/zlib_mingw.cmake
@@ -37,3 +37,4 @@ endif()
 if(MSVC)
 	set_target_properties(external_zlib_mingw PROPERTIES FOLDER Mingw)
 endif()
+
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -285,91 +285,91 @@ SUDO="sudo"

 NO_BUILD=false
 NO_CONFIRM=false
-USE_CXX11=true
+USE_CXX11=true  # Mandatory in blender2.8

-PYTHON_VERSION="3.7.0"
-PYTHON_VERSION_MIN="3.7"
+PYTHON_VERSION="3.6.2"
+PYTHON_VERSION_MIN="3.6"
 PYTHON_FORCE_BUILD=false
 PYTHON_FORCE_REBUILD=false
 PYTHON_SKIP=false

-NUMPY_VERSION="1.15.0"
+NUMPY_VERSION="1.13.1"
 NUMPY_VERSION_MIN="1.8"
 NUMPY_FORCE_BUILD=false
 NUMPY_FORCE_REBUILD=false
 NUMPY_SKIP=false

-BOOST_VERSION="1.68.0"
+BOOST_VERSION="1.60.0"
 BOOST_VERSION_MIN="1.49"
 BOOST_FORCE_BUILD=false
 BOOST_FORCE_REBUILD=false
 BOOST_SKIP=false

-OCIO_VERSION="1.1.0"
+OCIO_VERSION="1.0.9"
 OCIO_VERSION_MIN="1.0"
 OCIO_FORCE_BUILD=false
 OCIO_FORCE_REBUILD=false
 OCIO_SKIP=false

-OPENEXR_VERSION="2.3.0"
+OPENEXR_VERSION="2.2.0"
 OPENEXR_VERSION_MIN="2.0.1"
-ILMBASE_VERSION="2.3.0"
-ILMBASE_VERSION_MIN="2.3"
+ILMBASE_VERSION="2.2.0"
+ILMBASE_VERSION_MIN="2.2"
 OPENEXR_FORCE_BUILD=false
 OPENEXR_FORCE_REBUILD=false
 OPENEXR_SKIP=false
 _with_built_openexr=false

-OIIO_VERSION="1.8.13"
-OIIO_VERSION_MIN="1.8.13"
-OIIO_VERSION_MAX="99.99.0"  # UNKNOWN currently # Not supported by current OSL...
+OIIO_VERSION="1.7.15"
+OIIO_VERSION_MIN="1.7.15"
+OIIO_VERSION_MAX="1.9.0"  # UNKNOWN currently # Not supported by current OSL...
 OIIO_FORCE_BUILD=false
 OIIO_FORCE_REBUILD=false
 OIIO_SKIP=false

-LLVM_VERSION="6.0.1"
-LLVM_VERSION_MIN="6.0"
+LLVM_VERSION="3.4"
+LLVM_VERSION_MIN="3.4"
 LLVM_VERSION_FOUND=""
 LLVM_FORCE_BUILD=false
 LLVM_FORCE_REBUILD=false
 LLVM_SKIP=false

 # OSL needs to be compiled for now!
-OSL_VERSION="1.9.9"
+OSL_VERSION="1.7.5"
 OSL_VERSION_MIN=$OSL_VERSION
 OSL_FORCE_BUILD=false
 OSL_FORCE_REBUILD=false
 OSL_SKIP=false

 # OpenSubdiv needs to be compiled for now
-OSD_VERSION="3.3.3"
+OSD_VERSION="3.1.1"
 OSD_VERSION_MIN=$OSD_VERSION
 OSD_FORCE_BUILD=false
 OSD_FORCE_REBUILD=false
 OSD_SKIP=false

 # OpenVDB needs to be compiled for now
-OPENVDB_BLOSC_VERSION="1.14.4"
+OPENVDB_BLOSC_VERSION="1.7.0"

-OPENVDB_VERSION="5.1.0"
+OPENVDB_VERSION="3.1.0"
 OPENVDB_VERSION_MIN=$OPENVDB_VERSION
 OPENVDB_FORCE_BUILD=false
 OPENVDB_FORCE_REBUILD=false
 OPENVDB_SKIP=false

 # Alembic needs to be compiled for now
-ALEMBIC_VERSION="1.7.8"
+ALEMBIC_VERSION="1.7.1"
 ALEMBIC_VERSION_MIN=$ALEMBIC_VERSION
 ALEMBIC_FORCE_BUILD=false
 ALEMBIC_FORCE_REBUILD=false
 ALEMBIC_SKIP=false

-OPENCOLLADA_VERSION="1.6.63"
+OPENCOLLADA_VERSION="1.6.51"
 OPENCOLLADA_FORCE_BUILD=false
 OPENCOLLADA_FORCE_REBUILD=false
 OPENCOLLADA_SKIP=false

-FFMPEG_VERSION="4.0.2"
+FFMPEG_VERSION="3.2.1"
 FFMPEG_VERSION_MIN="2.8.4"
 FFMPEG_FORCE_BUILD=false
 FFMPEG_FORCE_REBUILD=false
@@ -737,45 +737,43 @@ _boost_version_nodots=`echo "$BOOST_VERSION" | sed -r 's/\./_/g'`
 BOOST_SOURCE=( "http://sourceforge.net/projects/boost/files/boost/$BOOST_VERSION/boost_$_boost_version_nodots.tar.bz2/download" )
 BOOST_BUILD_MODULES="--with-system --with-filesystem --with-thread --with-regex --with-locale --with-date_time --with-wave --with-iostreams --with-python --with-program_options"

-OCIO_USE_REPO=false
-OCIO_SOURCE=( "https://github.com/imageworks/OpenColorIO/archive/v$OCIO_VERSION.tar.gz")
-#~ OCIO_SOURCE_REPO=( "https://github.com/imageworks/OpenColorIO.git" )
-#~ OCIO_SOURCE_REPO_UID="6de971097c7f552300f669ed69ca0b6cf5a70843"
+OCIO_USE_REPO=true
+OCIO_SOURCE=( "https://github.com/imageworks/OpenColorIO/tarball/v$OCIO_VERSION" )
+OCIO_SOURCE_REPO=( "https://github.com/imageworks/OpenColorIO.git" )
+OCIO_SOURCE_REPO_UID="6de971097c7f552300f669ed69ca0b6cf5a70843"

 OPENEXR_USE_REPO=false
-#~ OPENEXR_SOURCE=( "https://github.com/openexr/openexr/releases/download/v$OPENEXR_VERSION/openexr-$OPENEXR_VERSION.tar.gz" )
-OPENEXR_SOURCE_REPO_UID="0ac2ea34c8f3134148a5df4052e40f155b76f6fb"
-OPENEXR_SOURCE=( "https://github.com/openexr/openexr/archive/$OPENEXR_SOURCE_REPO_UID.tar.gz" )
-#~ OPENEXR_SOURCE_REPO=( "https://github.com/mont29/openexr.git" )
-ILMBASE_SOURCE=( "https://github.com/openexr/openexr/releases/download/v$ILMBASE_VERSION/ilmbase-$ILMBASE_VERSION.tar.gz" )
+OPENEXR_SOURCE=( "http://download.savannah.nongnu.org/releases/openexr/openexr-$OPENEXR_VERSION.tar.gz" )
+OPENEXR_SOURCE_REPO=( "https://github.com/mont29/openexr.git" )
+OPENEXR_SOURCE_REPO_UID="2787aa1cf652d244ed45ae124eb1553f6cff11ee"
+ILMBASE_SOURCE=( "http://download.savannah.nongnu.org/releases/openexr/ilmbase-$ILMBASE_VERSION.tar.gz" )

 OIIO_USE_REPO=false
 OIIO_SOURCE=( "https://github.com/OpenImageIO/oiio/archive/Release-$OIIO_VERSION.tar.gz" )
-#~ OIIO_SOURCE_REPO=( "https://github.com/OpenImageIO/oiio.git" )
-#~ OIIO_SOURCE_REPO_UID="c9e67275a0b248ead96152f6d2221cc0c0f278a4"
+OIIO_SOURCE_REPO=( "https://github.com/OpenImageIO/oiio.git" )
+OIIO_SOURCE_REPO_UID="c9e67275a0b248ead96152f6d2221cc0c0f278a4"

-LLVM_SOURCE=( "http://releases.llvm.org/$LLVM_VERSION/llvm-$LLVM_VERSION.src.tar.xz" )
-LLVM_CLANG_SOURCE=( "http://releases.llvm.org/$LLVM_VERSION/clang-$LLVM_VERSION.src.tar.xz" "http://llvm.org/releases/$LLVM_VERSION/cfe-$LLVM_VERSION.src.tar.xz" )
+LLVM_SOURCE=( "http://releases.llvm.org/$LLVM_VERSION/llvm-$LLVM_VERSION.src.tar.gz" )
+LLVM_CLANG_SOURCE=( "http://releases.llvm.org/$LLVM_VERSION/clang-$LLVM_VERSION.src.tar.gz" "http://llvm.org/releases/$LLVM_VERSION/cfe-$LLVM_VERSION.src.tar.gz" )

 OSL_USE_REPO=false
 OSL_SOURCE=( "https://github.com/imageworks/OpenShadingLanguage/archive/Release-$OSL_VERSION.tar.gz" )
-#~ OSL_SOURCE_REPO=( "https://github.com/imageworks/OpenShadingLanguage.git" )
-#~ OSL_SOURCE_REPO_BRANCH="master"
-#~ OSL_SOURCE_REPO_UID="85179714e1bc69cd25ecb6bb711c1a156685d395"
 #~ OSL_SOURCE=( "https://github.com/Nazg-Gul/OpenShadingLanguage/archive/Release-1.5.11.tar.gz" )
+#~ OSL_SOURCE_REPO=( "https://github.com/imageworks/OpenShadingLanguage.git" )
 #~ OSL_SOURCE_REPO=( "https://github.com/mont29/OpenShadingLanguage.git" )
 #~ OSL_SOURCE_REPO_UID="85179714e1bc69cd25ecb6bb711c1a156685d395"
-#~ OSL_SOURCE_REPO=( "https://github.com/Nazg-Gul/OpenShadingLanguage.git" )
-#~ OSL_SOURCE_REPO_UID="7d40ff5fe8e47b030042afb92d0e955f5aa96f48"
-#~ OSL_SOURCE_REPO_BRANCH="blender-fixes"
+#~ OSL_SOURCE_REPO_BRANCH="master"
+OSL_SOURCE_REPO=( "https://github.com/Nazg-Gul/OpenShadingLanguage.git" )
+OSL_SOURCE_REPO_UID="7d40ff5fe8e47b030042afb92d0e955f5aa96f48"
+OSL_SOURCE_REPO_BRANCH="blender-fixes"

 OSD_USE_REPO=false
 # Script foo to make the version string compliant with the archive name:
 # ${Varname//SearchForThisChar/ReplaceWithThisChar}
 OSD_SOURCE=( "https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${OSD_VERSION//./_}.tar.gz" )
-#~ OSD_SOURCE_REPO=( "https://github.com/PixarAnimationStudios/OpenSubdiv.git" )
-#~ OSD_SOURCE_REPO_UID="404659fffa659da075d1c9416e4fc939139a84ee"
-#~ OSD_SOURCE_REPO_BRANCH="dev"
+OSD_SOURCE_REPO=( "https://github.com/PixarAnimationStudios/OpenSubdiv.git" )
+OSD_SOURCE_REPO_UID="404659fffa659da075d1c9416e4fc939139a84ee"
+OSD_SOURCE_REPO_BRANCH="dev"

 OPENVDB_USE_REPO=false
 OPENVDB_BLOSC_SOURCE=( "https://github.com/Blosc/c-blosc/archive/v${OPENVDB_BLOSC_VERSION}.tar.gz" )
@@ -790,18 +788,26 @@ ALEMBIC_SOURCE=( "https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.
 # ALEMBIC_SOURCE_REPO_UID="e6c90d4faa32c4550adeaaf3f556dad4b73a92bb"
 # ALEMBIC_SOURCE_REPO_BRANCH="master"

-OPENCOLLADA_USE_REPO=false
-OPENCOLLADA_SOURCE=( "https://github.com/KhronosGroup/OpenCOLLADA/archive/v${OPENCOLLADA_VERSION}.tar.gz" )
-#~ OPENCOLLADA_SOURCE_REPO=( "https://github.com/KhronosGroup/OpenCOLLADA.git" )
-#~ OPENCOLLADA_REPO_UID="e937c3897b86fc0da53cde97257f5156"
-#~ OPENCOLLADA_REPO_BRANCH="master"
+OPENCOLLADA_SOURCE=( "https://github.com/KhronosGroup/OpenCOLLADA.git" )
+OPENCOLLADA_REPO_UID="0c2cdc17c22cf42050e4d42154bed2176363549c"
+OPENCOLLADA_REPO_BRANCH="master"

 FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" )

-# C++11 is required now
 CXXFLAGS_BACK=$CXXFLAGS
-CXXFLAGS="$CXXFLAGS -std=c++11"
-export CXXFLAGS
+if [ "$USE_CXX11" = true ]; then
+  WARNING "C++11 is now mandatory for blender2.8, this *should* go smoothly with any very recent distribution.
+However, if you are experiencing linking errors (also when building Blender itself), please try the following:
+    * Re-run this script with '--build-all --force-all' options.
+    * Ensure your gcc version is at the very least 4.8, if possible you should really rather use gcc-5.1 or above.
+
+Please note that until the transition to C++11-built libraries if completed in your distribution, situation will
+remain fuzzy and incompatibilities may happen..."
+  PRINT ""
+  PRINT ""
+  CXXFLAGS="$CXXFLAGS -std=c++11"
+  export CXXFLAGS
+fi

 #### Show Dependencies ####

@@ -811,7 +817,7 @@ DEPS_COMMON_INFO="\"COMMON DEPENDENCIES:
 Those libraries should be available as packages in all recent distributions (optional ones are [between brackets]):

    * Basics of dev environment (cmake, gcc, svn , git, ...).
-    * libjpeg, libpng, libtiff, [openjpeg2], [libopenal].
+    * libjpeg, libpng, libtiff, [libopenjpeg], [libopenal].
    * libx11, libxcursor, libxi, libxrandr, libxinerama (and other libx... as needed).
    * libsqlite3, libbz2, libssl, libfftw3, libxml2, libtinyxml, yasm, libyaml-cpp.
    * libsdl1.2, libglew, [libglewmx].\""
@@ -835,7 +841,7 @@ You may also want to build them yourself (optional ones are [between brackets]):
    * [OpenShadingLanguage $OSL_VERSION_MIN] (from $OSL_SOURCE_REPO, branch $OSL_SOURCE_REPO_BRANCH, commit $OSL_SOURCE_REPO_UID).
    * [OpenSubDiv $OSD_VERSION_MIN] (from $OSD_SOURCE_REPO, branch $OSD_SOURCE_REPO_BRANCH, commit $OSD_SOURCE_REPO_UID).
    * [OpenVDB $OPENVDB_VERSION_MIN] (from $OPENVDB_SOURCE), [Blosc $OPENVDB_BLOSC_VERSION] (from $OPENVDB_BLOSC_SOURCE).
-    * [OpenCollada $OPENCOLLADA_VERSION] (from $OPENCOLLADA_SOURCE).
+    * [OpenCollada] (from $OPENCOLLADA_SOURCE, branch $OPENCOLLADA_REPO_BRANCH, commit $OPENCOLLADA_REPO_UID).
    * [Alembic $ALEMBIC_VERSION] (from $ALEMBIC_SOURCE).\""

 if [ "$DO_SHOW_DEPS" = true ]; then
@@ -1200,7 +1206,7 @@ compile_Boost() {
  if [ ! -d $_inst ]; then
    INFO "Building Boost-$BOOST_VERSION"

-    # Rebuild dependencies as well!
+    # Rebuild dependecies as well!
    OIIO_FORCE_BUILD=true
    OIIO_FORCE_REBUILD=true
    OSL_FORCE_BUILD=true
@@ -1319,14 +1325,12 @@ compile_OCIO() {
    cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst"
    cmake_d="$cmake_d -D OCIO_BUILD_APPS=OFF"
    cmake_d="$cmake_d -D OCIO_BUILD_PYGLUE=OFF"
-    cmake_d="$cmake_d -D STOP_ON_WARNING=OFF"

    if file /bin/cp | grep -q '32-bit'; then
      cflags="-fPIC -m32 -march=i686"
    else
      cflags="-fPIC"
    fi
-    cflags="$cflags -Wno-error=unused-function -Wno-error=deprecated-declarations"

    cmake $cmake_d -D CMAKE_CXX_FLAGS="$cflags" -D CMAKE_EXE_LINKER_FLAGS="-lgcc_s -lgcc" ..

@@ -1393,7 +1397,7 @@ compile_ILMBASE() {
  if [ ! -d $_openexr_inst ]; then
    INFO "Building ILMBase-$ILMBASE_VERSION"

-    # Rebuild dependencies as well!
+    # Rebuild dependecies as well!
    OPENEXR_FORCE_BUILD=true
    OPENEXR_FORCE_REBUILD=true

@@ -1489,7 +1493,7 @@ compile_OPENEXR() {
  if [ ! -d $_inst ]; then
    INFO "Building OpenEXR-$OPENEXR_VERSION"

-    # Rebuild dependencies as well!
+    # Rebuild dependecies as well!
    OIIO_FORCE_BUILD=true
    OIIO_FORCE_REBUILD=true

@@ -1603,7 +1607,7 @@ compile_OIIO() {
  if [ ! -d $_inst ]; then
    INFO "Building OpenImageIO-$OIIO_VERSION"

-    # Rebuild dependencies as well!
+    # Rebuild dependecies as well!
    OSL_FORCE_BUILD=true
    OSL_FORCE_REBUILD=true

@@ -1661,7 +1665,6 @@ compile_OIIO() {
    cmake_d="$cmake_d -D USE_QT=OFF"
    cmake_d="$cmake_d -D USE_PYTHON=OFF"
    cmake_d="$cmake_d -D USE_FFMPEG=OFF"
-    cmake_d="$cmake_d -D USE_OPENCV=OFF"
    cmake_d="$cmake_d -D BUILD_TESTING=OFF"
    cmake_d="$cmake_d -D OIIO_BUILD_TESTS=OFF"
    cmake_d="$cmake_d -D OIIO_BUILD_TOOLS=OFF"
@@ -1679,7 +1682,9 @@ compile_OIIO() {
 #    fi
    cmake_d="$cmake_d -D USE_OCIO=OFF"

-    cmake_d="$cmake_d -D OIIO_BUILD_CPP11=ON"
+    if [ "$USE_CXX11" = true ]; then
+      cmake_d="$cmake_d -D OIIO_BUILD_CPP11=ON"
+    fi

    if file /bin/cp | grep -q '32-bit'; then
      cflags="-fPIC -m32 -march=i686"
@@ -1745,7 +1750,7 @@ compile_LLVM() {
  if [ ! -d $_inst ]; then
    INFO "Building LLVM-$LLVM_VERSION (CLANG included!)"

-    # Rebuild dependencies as well!
+    # Rebuild dependecies as well!
    OSL_FORCE_BUILD=true
    OSL_FORCE_REBUILD=true

@@ -1753,20 +1758,23 @@ compile_LLVM() {

    if [ ! -d $_src -o true ]; then
      mkdir -p $SRC
-      download LLVM_SOURCE[@] "$_src.tar.xz"
-      download LLVM_CLANG_SOURCE[@] "$_src_clang.tar.xz"
+      download LLVM_SOURCE[@] "$_src.tar.gz"
+      download LLVM_CLANG_SOURCE[@] "$_src_clang.tar.gz"

      INFO "Unpacking LLVM-$LLVM_VERSION"
      tar -C $SRC --transform "s,([^/]*/?)llvm-[^/]*(.*),\1LLVM-$LLVM_VERSION\2,x" \
-          -xf $_src.tar.xz
+          -xf $_src.tar.gz
      INFO "Unpacking CLANG-$LLVM_VERSION to $_src/tools/clang"
      # Stupid clang guys renamed 'clang' to 'cfe' for now handle both cases... :(
      tar -C $_src/tools \
          --transform "s,([^/]*/?)(clang|cfe)-[^/]*(.*),\1clang\3,x" \
-          -xf $_src_clang.tar.xz
+          -xf $_src_clang.tar.gz

      cd $_src

+      # XXX Ugly patching hack!
+      patch -p1 -i "$SCRIPT_DIR/patches/install_deps_llvm.diff"
+
      cd $CWD

    fi
@@ -1869,6 +1877,9 @@ compile_OSL() {
      # Stick to same rev as windows' libs...
      git checkout $OSL_SOURCE_REPO_UID
      git reset --hard
+
+      # XXX Ugly patching hack!
+      patch -p1 -i "$SCRIPT_DIR/patches/install_deps_osl.diff"
    fi

    # Always refresh the whole build!
@@ -1886,7 +1897,9 @@ compile_OSL() {
    cmake_d="$cmake_d -D OSL_BUILD_PLUGINS=OFF"
    cmake_d="$cmake_d -D OSL_BUILD_TESTS=OFF"
    cmake_d="$cmake_d -D USE_SIMD=sse2"
-    cmake_d="$cmake_d -D OSL_BUILD_CPP11=1"
+    if [ "$USE_CXX11" = true ]; then
+        cmake_d="$cmake_d -D OSL_BUILD_CPP11=1"
+    fi

    #~ cmake_d="$cmake_d -D ILMBASE_VERSION=$ILMBASE_VERSION"

@@ -2071,7 +2084,7 @@ compile_BLOSC() {
  if [ ! -d $_inst ]; then
    INFO "Building Blosc-$OPENVDB_BLOSC_VERSION"

-    # Rebuild dependencies as well!
+    # Rebuild dependecies as well!
    OPENVDB_FORCE_BUILD=true
    OPENVDB_FORCE_REBUILD=true

@@ -2272,6 +2285,12 @@ compile_ALEMBIC() {

    cmake_d="-D CMAKE_INSTALL_PREFIX=$_inst"

+    # Without Boost or TR1, Alembic requires C++11.
+    if [ "$USE_CXX11" != true ]; then
+      cmake_d="$cmake_d -D ALEMBIC_LIB_USES_BOOST=ON"
+      cmake_d="$cmake_d -D ALEMBIC_LIB_USES_TR1=OFF"
+    fi
+
    if [ -d $INST/boost ]; then
      if [ -d $INST/boost ]; then
        cmake_d="$cmake_d -D BOOST_ROOT=$INST/boost"
@@ -2355,24 +2374,17 @@ compile_OpenCOLLADA() {

    if [ ! -d $_src ]; then
      mkdir -p $SRC
-      if [ "$OPENCOLLADA_USE_REPO" = true ]; then
-        git clone $OPENCOLLADA_SOURCE_REPO $_src
-      else
-        download OPENCOLLADA_SOURCE[@] "$_src.tar.gz"
-        INFO "Unpacking OpenCOLLADA-$OPENCOLLADA_VERSION"
-        tar -C $SRC -xf $_src.tar.gz
-      fi
+      git clone $OPENCOLLADA_SOURCE $_src
    fi

    cd $_src

-    if [ "$OPENCOLLADA_USE_REPO" = true ]; then
-      git pull origin $OPENCOLLADA_REPO_BRANCH
+    # XXX For now, always update from latest repo...
+    git pull origin $OPENCOLLADA_REPO_BRANCH

-      # Stick to same rev as windows' libs...
-      git checkout $OPENCOLLADA_REPO_UID
-      git reset --hard
-    fi
+    # Stick to same rev as windows' libs...
+    git checkout $OPENCOLLADA_REPO_UID
+    git reset --hard

    # Always refresh the whole build!
    if [ -d build ]; then
@@ -2628,8 +2640,8 @@ install_DEB() {
  THEORA_USE=true

  PRINT ""
-  # We need openjp2, libopenjpeg is an old version
-  OPENJPEG_DEV="libopenjp2-7-dev"
+  # New Ubuntu crap (17.04 and more) have no openjpeg lib!
+  OPENJPEG_DEV="libopenjpeg-dev"
  check_package_DEB $OPENJPEG_DEV
  if [ $? -eq 0 ]; then
    _packages="$_packages $OPENJPEG_DEV"
@@ -2774,7 +2786,6 @@ install_DEB() {
  fi

  if $_do_compile_python; then
-    install_packages_DEB libffi-dev
    compile_Python
    PRINT ""
    if [ "$NUMPY_SKIP" = true ]; then
@@ -2871,11 +2882,11 @@ install_DEB() {
    INFO "Forced LLVM building, as requested..."
    _do_compile_llvm=true
  else
-    check_package_DEB clang-$LLVM_VERSION_MIN
+    check_package_DEB clang-$LLVM_VERSION
    if [ $? -eq 0 ]; then
-      install_packages_DEB llvm-$LLVM_VERSION_MIN-dev clang-$LLVM_VERSION_MIN
+      install_packages_DEB llvm-$LLVM_VERSION-dev clang-$LLVM_VERSION
      have_llvm=true
-      LLVM_VERSION_FOUND=$LLVM_VERSION_MIN
+      LLVM_VERSION_FOUND=$LLVM_VERSION
      clean_LLVM
    else
      _do_compile_llvm=true
@@ -3166,7 +3177,7 @@ install_RPM() {
  fi

  # These libs should always be available in fedora/suse official repository...
-  OPENJPEG_DEV="openjpeg2-devel"
+  OPENJPEG_DEV="openjpeg-devel"
  VORBIS_DEV="libvorbis-devel"
  OGG_DEV="libogg-devel"
  THEORA_DEV="libtheora-devel"
@@ -3313,7 +3324,6 @@ install_RPM() {
  fi

  if [ "$_do_compile_python" = true ]; then
-    install_packages_RPM libffi-devel
    compile_Python
    PRINT ""
    if [ "$NUMPY_SKIP" = true ]; then
@@ -3424,15 +3434,16 @@ install_RPM() {
    else
      CLANG_DEV="clang-devel"
    fi
-    check_package_version_match_RPM $CLANG_DEV $LLVM_VERSION
-    if [ $? -eq 0 ]; then
-      install_packages_RPM llvm-devel $CLANG_DEV
-      have_llvm=true
-      LLVM_VERSION_FOUND=$LLVM_VERSION
-      clean_LLVM
-    else
+    # XXX RHEL has 3.4 in repo but OSL complains about not finding MCJIT_LIBRARY, so compile for now...
+    #check_package_version_match_RPM $CLANG_DEV $LLVM_VERSION
+    #if [ $? -eq 0 ]; then
+    #  install_packages_RPM llvm-devel $CLANG_DEV
+    #  have_llvm=true
+    #  LLVM_VERSION_FOUND=$LLVM_VERSION
+    #  clean_LLVM
+    #else
      _do_compile_llvm=true
-    fi
+    #fi
  fi

  if [ "$_do_compile_llvm" = true ]; then
@@ -3636,7 +3647,7 @@ install_ARCH() {
  fi

  # These libs should always be available in arch official repository...
-  OPENJPEG_DEV="openjpeg2"
+  OPENJPEG_DEV="openjpeg"
  VORBIS_DEV="libvorbis"
  OGG_DEV="libogg"
  THEORA_DEV="libtheora"
@@ -3742,7 +3753,6 @@ install_ARCH() {
  fi

  if [ "$_do_compile_python" = true ]; then
-    install_packages_ARCH libffi
    compile_Python
    PRINT ""
    if [ "$NUMPY_SKIP" = true ]; then
@@ -3833,11 +3843,11 @@ install_ARCH() {
    INFO "Forced LLVM building, as requested..."
    _do_compile_llvm=true
  else
-    check_package_version_match_ARCH llvm $LLVM_VERSION_MIN
+    check_package_version_match_ARCH llvm35 $LLVM_VERSION_MIN
    if [ $? -eq 0 ]; then
-      install_packages_ARCH llvm clang
+      install_packages_ARCH llvm35 clang35
      have_llvm=true
-      LLVM_VERSION=`get_package_version_ARCH llvm`
+      LLVM_VERSION=`get_package_version_ARCH llvm35`
      LLVM_VERSION_FOUND=$LLVM_VERSION
      clean_LLVM
    else
@@ -4217,6 +4227,12 @@ print_info() {
  _buildargs="$_buildargs -U *OPENCOLORIO* -U *OPENEXR* -U *OPENIMAGEIO* -U *LLVM* -U *CYCLES*"
  _buildargs="$_buildargs -U *OPENSUBDIV* -U *OPENVDB* -U *COLLADA* -U *FFMPEG* -U *ALEMBIC*"

+  if [ "$USE_CXX11" = true ]; then
+    _1="-D WITH_CXX11=ON"
+    PRINT "  $_1"
+    _buildargs="$_buildargs $_1"
+  fi
+
  _1="-D WITH_CODEC_SNDFILE=ON"
  PRINT "  $_1"
  _buildargs="$_buildargs $_1"
@@ -4362,10 +4378,6 @@ print_info() {
  PRINT ""
  PRINT "Or even simpler, just run (in your blender-source dir):"
  PRINT "  make -j$THREADS BUILD_CMAKE_ARGS=\"$_buildargs\""
-
-  PRINT ""
-  PRINT "Or in all your build directories:"
-  PRINT "  cmake $_buildargs ."
 }

 #### "Main" ####
--- a/build_files/build_environment/patches/alembic.diff
+++ b/build_files/build_environment/patches/alembic.diff
@@ -0,0 +1,35 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3e09c57..26565ae 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -116,7 +116,7 @@ IF (NOT ${ALEMBIC_LIB_USES_TR1} AND NOT ${ALEMBIC_LIB_USES_BOOST})
+     INCLUDE(CheckCXXCompilerFlag)
+     CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+     CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
+-    IF (COMPILER_SUPPORTS_CXX1X)
+    IF (COMPILER_SUPPORTS_CXX11)
+         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+     ELSEIF (COMPILER_SUPPORTS_CXX0X)
+         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+--- a/lib/Alembic/AbcCoreOgawa/StreamManager.cpp
+++ b/lib/Alembic/AbcCoreOgawa/StreamManager.cpp
+@@ -47,7 +47,18 @@
+ #define COMPARE_EXCHANGE( V, COMP, EXCH ) V.compare_exchange_weak( COMP, EXCH, std::memory_order_seq_cst, std::memory_order_seq_cst )
+ // Windows
+ #elif defined( _MSC_VER )
+-#define COMPARE_EXCHANGE( V, COMP, EXCH ) InterlockedCompareExhange64( &V, EXCH, COMP ) == COMP
+#define COMPARE_EXCHANGE( V, COMP, EXCH ) InterlockedCompareExchange64( &V, EXCH, COMP ) == COMP
+int ffsll(long	long value)
+{
+	if (!value)
+		return 0;
+
+	for (int bit = 0; bit < 63; bit++)
+	{
+		if (value & (1 << bit))
+			return bit + 1;
+	}
+}
+ // gcc 4.8 and above not using C++11
+ #elif defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 8
+ #define COMPARE_EXCHANGE( V, COMP, EXCH ) __atomic_compare_exchange_n( &V, &COMP, EXCH, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST )
--- a/build_files/build_environment/patches/blosc.diff
+++ b/build_files/build_environment/patches/blosc.diff
@@ -10,22 +10,24 @@ diff -Naur src/blosc/CMakeLists.txt external_blosc/blosc/CMakeLists.txt
     endif(NOT Threads_FOUND)
 else(WIN32)
     find_package(Threads REQUIRED)
-diff -Naur external_blosc.orig/blosc/blosc.c external_blosc/blosc/blosc.c
--- external_blosc.orig/blosc/blosc.c   2018-07-30 04:56:38 -0600
-+++ external_blosc/blosc/blosc.c        2018-08-11 15:27:26 -0600
-@@ -56,14 +56,7 @@
+diff -Naur src/blosc/blosc.c external_blosc/blosc/blosc.c
+--- src/blosc/blosc.c	2016-02-03 10:26:28 -0700
+++ external_blosc/blosc/blosc.c	2017-03-03 09:01:50 -0700
+@@ -49,12 +49,12 @@
   #include <inttypes.h>
 #endif  /* _WIN32 */
-
-/* Include the win32/pthread.h library for all the Windows builds. See #224. */
-#if defined(_WIN32)
+ 
+-#if defined(_WIN32) && !defined(__GNUC__)
 -  #include "win32/pthread.h"
 -  #include "win32/pthread.c"
 -#else
-  #include <pthread.h>
+//#if defined(_WIN32) && !defined(__GNUC__)
+//  #include "win32/pthread.h"
+  //#include "win32/pthread.c"
+//#else
+   #include <pthread.h>
 -#endif
-
-+#include <pthread.h>
-
- /* Some useful units */
- #define KB 1024
+//#endif
+ 
+ /* If C11 is supported, use it's built-in aligned allocation. */
+ #if __STDC_VERSION__ >= 201112L
--- a/build_files/build_environment/patches/boost.diff
+++ b/build_files/build_environment/patches/boost.diff
@@ -0,0 +1,37 @@
+--- a/boost/config/compiler/visualc.hpp       2015-12-08 11:55:19 -0700
+++ b/boost/config/compiler/visualc.hpp    2018-03-17 10:29:52 -0600
+@@ -287,12 +287,3 @@
+ #  define BOOST_COMPILER "Microsoft Visual C++ version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION)
+ #endif
+
+-//
+-// last known and checked version is 19.00.23026 (VC++ 2015 RTM):
+-#if (_MSC_VER > 1900)
+-#  if defined(BOOST_ASSERT_CONFIG)
+-#     error "Unknown compiler version - please run the configure tests and report the results"
+-#  else
+-#     pragma message("Unknown compiler version - please run the configure tests and report the results")
+-#  endif
+-#endif
+--- a/boost/type_traits/has_nothrow_assign.hpp	2015-12-13 05:49:42 -0700
+++ b/boost/type_traits/has_nothrow_assign.hpp	2018-05-27 11:11:02 -0600
+@@ -24,7 +24,7 @@
+ #include <boost/type_traits/remove_reference.hpp>
+ #endif
+ #endif
+-#if defined(__GNUC__) || defined(__SUNPRO_CC)
+#if defined(__GNUC__) || defined(__SUNPRO_CC) || defined(__clang__)
+ #include <boost/type_traits/is_const.hpp>
+ #include <boost/type_traits/is_volatile.hpp>
+ #include <boost/type_traits/is_assignable.hpp>
+--- a/boost/type_traits/has_nothrow_constructor.hpp	2015-12-13 05:49:42 -0700
+++ b/boost/type_traits/has_nothrow_constructor.hpp	2018-05-27 11:11:02 -0600
+@@ -17,7 +17,7 @@
+ #if defined(BOOST_MSVC) || defined(BOOST_INTEL)
+ #include <boost/type_traits/has_trivial_constructor.hpp>
+ #endif
+-#if defined(__GNUC__ ) || defined(__SUNPRO_CC)
+#if defined(__GNUC__ ) || defined(__SUNPRO_CC) || defined(__clang__)
+ #include <boost/type_traits/is_default_constructible.hpp>
+ #endif
+ 
--- a/build_files/build_environment/patches/clang.diff
+++ b/build_files/build_environment/patches/clang.diff
@@ -0,0 +1,127 @@
+--- cfe/trunk/lib/Serialization/ASTWriter.cpp
+++ cfe/trunk/lib/Serialization/ASTWriter.cpp
+@@ -56,14 +56,14 @@
+ using namespace clang::serialization;
+ 
+ template <typename T, typename Allocator>
+-static StringRef bytes(const std::vector<T, Allocator> &v) {
+static StringRef data(const std::vector<T, Allocator> &v) {
+   if (v.empty()) return StringRef();
+   return StringRef(reinterpret_cast<const char*>(&v[0]),
+                          sizeof(T) * v.size());
+ }
+ 
+ template <typename T>
+-static StringRef bytes(const SmallVectorImpl<T> &v) {
+static StringRef data(const SmallVectorImpl<T> &v) {
+   return StringRef(reinterpret_cast<const char*>(v.data()),
+                          sizeof(T) * v.size());
+ }
+@@ -1385,7 +1385,7 @@
+   Record.push_back(INPUT_FILE_OFFSETS);
+   Record.push_back(InputFileOffsets.size());
+   Record.push_back(UserFilesNum);
+-  Stream.EmitRecordWithBlob(OffsetsAbbrevCode, Record, bytes(InputFileOffsets));
+  Stream.EmitRecordWithBlob(OffsetsAbbrevCode, Record, data(InputFileOffsets));
+ }
+ 
+ //===----------------------------------------------------------------------===//
+@@ -1771,7 +1771,7 @@
+   Record.push_back(SOURCE_LOCATION_OFFSETS);
+   Record.push_back(SLocEntryOffsets.size());
+   Record.push_back(SourceMgr.getNextLocalOffset() - 1); // skip dummy
+-  Stream.EmitRecordWithBlob(SLocOffsetsAbbrev, Record, bytes(SLocEntryOffsets));
+  Stream.EmitRecordWithBlob(SLocOffsetsAbbrev, Record, data(SLocEntryOffsets));
+ 
+   // Write the source location entry preloads array, telling the AST
+   // reader which source locations entries it should load eagerly.
+@@ -2087,7 +2087,7 @@
+   Record.push_back(MacroOffsets.size());
+   Record.push_back(FirstMacroID - NUM_PREDEF_MACRO_IDS);
+   Stream.EmitRecordWithBlob(MacroOffsetAbbrev, Record,
+-                            bytes(MacroOffsets));
+                            data(MacroOffsets));
+ }
+ 
+ void ASTWriter::WritePreprocessorDetail(PreprocessingRecord &PPRec) {
+@@ -2185,7 +2185,7 @@
+     Record.push_back(PPD_ENTITIES_OFFSETS);
+     Record.push_back(FirstPreprocessorEntityID - NUM_PREDEF_PP_ENTITY_IDS);
+     Stream.EmitRecordWithBlob(PPEOffsetAbbrev, Record,
+-                              bytes(PreprocessedEntityOffsets));
+                              data(PreprocessedEntityOffsets));
+   }
+ }
+ 
+@@ -2548,7 +2548,7 @@
+   Record.push_back(CXX_BASE_SPECIFIER_OFFSETS);
+   Record.push_back(CXXBaseSpecifiersOffsets.size());
+   Stream.EmitRecordWithBlob(BaseSpecifierOffsetAbbrev, Record,
+-                            bytes(CXXBaseSpecifiersOffsets));
+                            data(CXXBaseSpecifiersOffsets));
+ }
+ 
+ //===----------------------------------------------------------------------===//
+@@ -2623,7 +2623,7 @@
+     Decls.push_back(std::make_pair((*D)->getKind(), GetDeclRef(*D)));
+ 
+   ++NumLexicalDeclContexts;
+-  Stream.EmitRecordWithBlob(DeclContextLexicalAbbrev, Record, bytes(Decls));
+  Stream.EmitRecordWithBlob(DeclContextLexicalAbbrev, Record, data(Decls));
+   return Offset;
+ }
+ 
+@@ -2642,7 +2642,7 @@
+   Record.push_back(TYPE_OFFSET);
+   Record.push_back(TypeOffsets.size());
+   Record.push_back(FirstTypeID - NUM_PREDEF_TYPE_IDS);
+-  Stream.EmitRecordWithBlob(TypeOffsetAbbrev, Record, bytes(TypeOffsets));
+  Stream.EmitRecordWithBlob(TypeOffsetAbbrev, Record, data(TypeOffsets));
+ 
+   // Write the declaration offsets array
+   Abbrev = new BitCodeAbbrev();
+@@ -2655,7 +2655,7 @@
+   Record.push_back(DECL_OFFSET);
+   Record.push_back(DeclOffsets.size());
+   Record.push_back(FirstDeclID - NUM_PREDEF_DECL_IDS);
+-  Stream.EmitRecordWithBlob(DeclOffsetAbbrev, Record, bytes(DeclOffsets));
+  Stream.EmitRecordWithBlob(DeclOffsetAbbrev, Record, data(DeclOffsets));
+ }
+ 
+ void ASTWriter::WriteFileDeclIDsMap() {
+@@ -2680,7 +2680,7 @@
+   unsigned AbbrevCode = Stream.EmitAbbrev(Abbrev);
+   Record.push_back(FILE_SORTED_DECLS);
+   Record.push_back(FileSortedIDs.size());
+-  Stream.EmitRecordWithBlob(AbbrevCode, Record, bytes(FileSortedIDs));
+  Stream.EmitRecordWithBlob(AbbrevCode, Record, data(FileSortedIDs));
+ }
+ 
+ void ASTWriter::WriteComments() {
+@@ -2893,7 +2893,7 @@
+     Record.push_back(SelectorOffsets.size());
+     Record.push_back(FirstSelectorID - NUM_PREDEF_SELECTOR_IDS);
+     Stream.EmitRecordWithBlob(SelectorOffsetAbbrev, Record,
+-                              bytes(SelectorOffsets));
+                              data(SelectorOffsets));
+   }
+ }
+ 
+@@ -3253,7 +3253,7 @@
+   Record.push_back(IdentifierOffsets.size());
+   Record.push_back(FirstIdentID - NUM_PREDEF_IDENT_IDS);
+   Stream.EmitRecordWithBlob(IdentifierOffsetAbbrev, Record,
+-                            bytes(IdentifierOffsets));
+                            data(IdentifierOffsets));
+ }
+ 
+ //===----------------------------------------------------------------------===//
+@@ -4046,7 +4046,7 @@
+   Record.clear();
+   Record.push_back(TU_UPDATE_LEXICAL);
+   Stream.EmitRecordWithBlob(TuUpdateLexicalAbbrev, Record,
+-                            bytes(NewGlobalDecls));
+                            data(NewGlobalDecls));
+   
+   // And a visible updates block for the translation unit.
+   Abv = new llvm::BitCodeAbbrev();
--- a/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
@@ -75,7 +75,7 @@ macro(PREFIX_FIND_LIB prefix libname libpath_var liblist_var cachelist_var)
  # Handle new library names for OpenEXR 2.1 build via cmake
  string(REPLACE "." "_" _ILMBASE_VERSION ${ILMBASE_VERSION})
  string(SUBSTRING ${_ILMBASE_VERSION} 0 3 _ILMBASE_VERSION )
-
+  
  find_library(${tmp_prefix}_LIBRARY_RELEASE
    NAMES ${libname} ${libname}-${_ILMBASE_VERSION}
    HINTS ${${libpath_var}}
@@ -177,7 +177,7 @@ if(ILMBASE_INCLUDE_DIR)
             "\\1" XYZ ${ILMBASE_BUILD_SPECIFICATION})
      set("ILMBASE_VERSION" ${XYZ} CACHE STRING "Version of ILMBase lib")
    else()
-      # Old versions (before 2.0?) do not have any version string, just assuming 2.0 should be fine though.
+      # Old versions (before 2.0?) do not have any version string, just assuming 2.0 should be fine though. 
      message(WARNING "Could not determine ILMBase library version, assuming 2.0.")
      set("ILMBASE_VERSION" "2.0" CACHE STRING "Version of ILMBase lib")
    endif()
--- a/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
@@ -175,7 +175,7 @@ if(OPENEXR_INCLUDE_DIR)
             "\\1" XYZ ${OPENEXR_BUILD_SPECIFICATION})
      set("OPENEXR_VERSION" ${XYZ} CACHE STRING "Version of OpenEXR lib")
    else()
-      # Old versions (before 2.0?) do not have any version string, just assuming 2.0 should be fine though.
+      # Old versions (before 2.0?) do not have any version string, just assuming 2.0 should be fine though. 
      message(WARNING "Could not determine ILMBase library version, assuming 2.0.")
      set("OPENEXR_VERSION" "2.0" CACHE STRING "Version of OpenEXR lib")
    endif()
--- a/build_files/build_environment/patches/cmake/modules/SelectLibraryConfigurations.cmake
+++ b/build_files/build_environment/patches/cmake/modules/SelectLibraryConfigurations.cmake
@@ -6,7 +6,7 @@
 # basename_LIBRARY_RELEASE is defined, basename_LIBRARY, basename_LIBRARY_DEBUG,
 # and basename_LIBRARY_RELEASE will be set to the release value.  If only
 # basename_LIBRARY_DEBUG is defined, then basename_LIBRARY,
-# basename_LIBRARY_DEBUG and basename_LIBRARY_RELEASE will take the debug value.
+# basename_LIBRARY_DEBUG and basename_LIBRARY_RELEASE will take the debug value.  
 #
 # If the generator supports configuration types, then basename_LIBRARY and
 # basename_LIBRARIES will be set with debug and optimized flags specifying the
@@ -53,10 +53,10 @@ macro( select_library_configurations basename )
        # if the generator supports configuration types or CMAKE_BUILD_TYPE
        # is set, then set optimized and debug options.
        if( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
-            set( ${basename}_LIBRARY
+            set( ${basename}_LIBRARY 
                optimized ${${basename}_LIBRARY_RELEASE}
                debug ${${basename}_LIBRARY_DEBUG} )
-            set( ${basename}_LIBRARIES
+            set( ${basename}_LIBRARIES 
                optimized ${${basename}_LIBRARY_RELEASE}
                debug ${${basename}_LIBRARY_DEBUG} )
        else( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
@@ -67,15 +67,16 @@ macro( select_library_configurations basename )
        endif( CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE )
    endif( ${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE )

-    set( ${basename}_LIBRARY ${${basename}_LIBRARY} CACHE FILEPATH
+    set( ${basename}_LIBRARY ${${basename}_LIBRARY} CACHE FILEPATH 
        "The ${basename} library" )

    if( ${basename}_LIBRARY )
        set( ${basename}_FOUND TRUE )
    endif( ${basename}_LIBRARY )

-    mark_as_advanced( ${basename}_LIBRARY
+    mark_as_advanced( ${basename}_LIBRARY 
        ${basename}_LIBRARY_RELEASE
        ${basename}_LIBRARY_DEBUG
    )
 endmacro( select_library_configurations )
+
--- a/build_files/build_environment/patches/cmakelists_lcms.txt
+++ b/build_files/build_environment/patches/cmakelists_lcms.txt
@@ -1,51 +0,0 @@
-project(lcms2)
-
-cmake_minimum_required(VERSION 2.8)
-
-include_directories(include)
-
-set(HEADERS
-	include/lcms2.h
-	include/lcms2_plugin.h
-)
-set(SOURCES
-    src/cmscam02.c
-    src/cmscgats.c
-    src/cmscnvrt.c
-    src/cmserr.c
-    src/cmsgamma.c
-    src/cmsgmt.c
-    src/cmsintrp.c
-    src/cmsio0.c
-    src/cmsio1.c
-    src/cmslut.c
-    src/cmsmd5.c
-    src/cmsmtrx.c
-    src/cmsnamed.c
-    src/cmsopt.c
-    src/cmspack.c
-    src/cmspcs.c
-    src/cmsplugin.c
-    src/cmsps2.c
-    src/cmssamp.c
-    src/cmssm.c
-    src/cmstypes.c
-    src/cmsvirt.c
-    src/cmswtpnt.c
-    src/cmsxform.c
-    src/lcms2_internal.h
-)
-
-add_library(${PROJECT_NAME} STATIC ${HEADERS} ${SOURCES})
-
-set_target_properties(${PROJECT_NAME} PROPERTIES
-	LIBRARY_OUTPUT_NAME "${PROJECT_NAME}"
-	PUBLIC_HEADER 		"${HEADERS}"
-)
-
-install(TARGETS 		${PROJECT_NAME}
-		RUNTIME         DESTINATION		bin
-        LIBRARY         DESTINATION     lib
-        ARCHIVE         DESTINATION     lib
-        PUBLIC_HEADER	DESTINATION     include
-)
--- a/build_files/build_environment/patches/cmakelists_openvdb.txt
+++ b/build_files/build_environment/patches/cmakelists_openvdb.txt
@@ -0,0 +1,398 @@
+# --------------------------------------------------------------------------------
+
+cmake_minimum_required(VERSION 2.8)
+
+# --------------------------------------------------------------------------------
+
+project(OpenVDB)
+
+# --------------------------------------------------------------------------------
+
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+
+# --------------------------------------------------------------------------------
+
+set(CMAKE_BUILD_TYPE_INIT "Release")
+
+# --------------------------------------------------------------------------------
+# Options
+
+option(WITH_BLOSC             "Enable Blosc support for compression" OFF)
+option(WITH_LOGC4PLUS         "Enable logging" OFF)
+option(WITH_OPENVDB_2_ABI     "Enable building the library to be compability with the OpenVDB 2 ABI" OFF)
+option(WITH_PRINTER           "Enable building the OpenVDB print executable" OFF)
+option(WITH_PYTHON            "Enable building the OpenVDB python API" OFF)
+option(WITH_RENDERER          "Enable building the OpenVDB render executable" OFF)
+option(WITH_UNITTEST          "Enable building the unit tests" OFF)
+option(WITH_VIEWER            "Enable building the OpenVDB viewer executable" OFF)
+
+# --------------------------------------------------------------------------------
+# Find packages
+#set(BOOST_LIBRARIES boost_iostreams boost_system boost_thread)
+
+find_package(IlmBase)
+find_package(OpenEXR)
+find_package(TBB)
+find_package(Boost)
+
+if(WITH_BLOSC)
+	find_package(Blosc)
+
+	if(NOT BLOSC_FOUND)
+		set(WITH_BLOSC OFF)
+	endif()
+endif()
+
+# todo
+if(WITH_VIEWER)
+	set(GLFW_INCLUDE_DIRS ${GLFW_INCLUDE_PATH})
+	set(GLFW_LIBRARY_DIRS ${GLFW_LIBRARY_PATH})
+endif()
+
+if(WITH_LOGC4PLUS)
+	find_package(LogC4Plus)
+
+	if(NOT LOGC4PLUS_FOUND)
+		set(WITH_LOGC4PLUS OFF)
+	endif()
+endif()
+
+# todo
+if(WITH_PYTHON)
+	set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_PATH})
+	set(PYTHON_LIBRARY_DIRS ${PYTHON_LIBRARY_PATH})
+endif()
+
+if(WITH_UNITTEST)
+	find_package(CppUnit)
+
+	if(NOT CPPUNIT_FOUND)
+		set(WITH_UNITTEST OFF)
+	endif()
+endif()
+
+# --------------------------------------------------------------------------------
+
+message (STATUS "BOOST_ROOT ${BOOST_ROOT}")
+message (STATUS "Boost found ${Boost_FOUND} ")
+message (STATUS "Boost version      ${Boost_VERSION}")
+message (STATUS "Boost include dirs ${Boost_INCLUDE_DIRS}")
+message (STATUS "Boost library dirs ${Boost_LIBRARY_DIRS}")
+message (STATUS "Boost libraries    ${Boost_LIBRARIES}") 
+
+message (STATUS "ILMBase found ${ILMBASE_FOUND} ")
+message (STATUS "ILMBase include dir ${ILMBASE_INCLUDE_DIR}")
+message (STATUS "ILMBase libraries    ${ILMBASE_LIBRARIES}") 
+
+message (STATUS "TBB found ${TBB_FOUND} ")
+message (STATUS "TBB include dir ${TBB_INCLUDE_DIR}")
+message (STATUS "TBB libraries    ${TBB_LIBRARIES}") 
+
+if(MSVC)
+    set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj" )
+    set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /bigobj" )
+endif()
+
+set(OPENVDB_LIBRARIES ${BLOSC_LIBRARIES} ${BOOST_LIBRARIES} ${OPENEXR_LIBRARIES} ${ILMBASE_LIBRARIES}  ${TBB_LIBRARIES} ${ZLIB_LIBRARY} )
+
+include_directories(. ${CMAKE_CURRENT_SOURCE_DIR}/../ ${Boost_INCLUDE_DIRS} ${ILMBASE_INCLUDE_DIR} ${OPENEXR_INCLUDE_DIR} ${TBB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIR})
+link_directories(${Boost_LIBRARY_DIRS} ${OPENEXR_LIBRARY_DIRS} ${TBB_INCLUDE_DIRS})
+add_definitions(-DNOMINMAX -D__TBB_NO_IMPLICIT_LINKAGE -DOPENVDB_STATICLIB -DOPENVDB_OPENEXR_STATICLIB)
+
+if(WITH_BLOSC)
+	add_definitions(-DOPENVDB_USE_BLOSC)
+	include_directories(${BLOSC_INCLUDE_DIRS})
+	link_directories(${BLOSC_LIBRARY_DIRS})
+endif()
+
+if(WITH_LOGC4PLUS)
+	add_definitions(-DOPENVDB_USE_LOG4CPLUS)
+	include_directories(${LOG4CPLUS_INCLUDE_DIRS})
+	link_directories(${LOG4CPLUS_LIBRARY_DIRS})
+endif()
+
+if(WITH_OPENVDB_2_ABI)
+	add_definitions(-DOPENVDB_2_ABI_COMPATIBLE)
+endif()
+
+# todo
+if(WITH_OPENVDB_USE_GLFW_3)
+	add_definitions(-DOPENVDB_USE_GLFW_3)
+endif()
+
+if(WITH_UNITTEST)
+	include_directories(${CPPUNIT_INCLUDE_DIRS})
+	link_directories(${CPPUNIT_LIBRARY_DIRS})
+endif()
+
+# --------------------------------------------------------------------------------
+
+set(SRC_FILES
+	openvdb/openvdb.cc
+	openvdb/io/Compression.cc
+	openvdb/io/File.cc
+	openvdb/io/Queue.cc
+	openvdb/io/Stream.cc
+	openvdb/io/TempFile.cc
+	openvdb/io/GridDescriptor.cc
+	openvdb/io/Archive.cc
+	openvdb/metadata/MetaMap.cc
+	openvdb/metadata/Metadata.cc
+	openvdb/math/Maps.cc
+	openvdb/math/Transform.cc
+	openvdb/math/QuantizedUnitVec.cc
+	openvdb/math/Proximity.cc
+	openvdb/Grid.cc
+	openvdb/util/Formats.cc
+	openvdb/util/Util.cc
+)
+
+set(HEADER_FILES
+	openvdb/openvdb.h
+	openvdb/version.h
+	openvdb/PlatformConfig.h
+	openvdb/Metadata.h
+	openvdb/Exceptions.h
+	openvdb/Grid.h
+	openvdb/Types.h
+	openvdb/Platform.h
+	openvdb/tree/ValueAccessor.h
+	openvdb/tree/NodeUnion.h
+	openvdb/tree/Tree.h
+	openvdb/tree/Iterator.h
+	openvdb/tree/LeafNodeBool.h
+	openvdb/tree/TreeIterator.h
+	openvdb/tree/LeafNode.h
+	openvdb/tree/NodeManager.h
+	openvdb/tree/LeafManager.h
+	openvdb/tree/InternalNode.h
+	openvdb/tree/RootNode.h
+	openvdb/tools/PointScatter.h
+	openvdb/tools/VolumeAdvect.h
+	openvdb/tools/LevelSetTracker.h
+	openvdb/tools/Composite.h
+	openvdb/tools/Morphology.h
+	openvdb/tools/ValueTransformer.h
+	openvdb/tools/ChangeBackground.h
+	openvdb/tools/GridTransformer.h
+	openvdb/tools/Prune.h
+	openvdb/tools/LevelSetUtil.h
+	openvdb/tools/VolumeToSpheres.h
+	openvdb/tools/LevelSetAdvect.h
+	openvdb/tools/Statistics.h
+	openvdb/tools/LevelSetMeasure.h
+	openvdb/tools/VectorTransformer.h
+	openvdb/tools/RayIntersector.h
+	openvdb/tools/PointPartitioner.h
+	openvdb/tools/Interpolation.h
+	openvdb/tools/VelocityFields.h
+	openvdb/tools/PointIndexGrid.h
+	openvdb/tools/LevelSetRebuild.h
+	openvdb/tools/Clip.h
+	openvdb/tools/SignedFloodFill.h
+	openvdb/tools/MeshToVolume.h
+	openvdb/tools/Dense.h
+	openvdb/tools/Filter.h
+	openvdb/tools/RayTracer.h
+	openvdb/tools/Diagnostics.h
+	openvdb/tools/VolumeToMesh.h
+	openvdb/tools/PoissonSolver.h
+	openvdb/tools/LevelSetFracture.h
+	openvdb/tools/GridOperators.h
+	openvdb/tools/DenseSparseTools.h
+	openvdb/tools/ParticlesToLevelSet.h
+	openvdb/tools/LevelSetSphere.h
+	openvdb/tools/LevelSetMorph.h
+	openvdb/tools/LevelSetFilter.h
+	openvdb/tools/PointAdvect.h
+	openvdb/io/Queue.h
+	openvdb/io/TempFile.h
+	openvdb/io/Stream.h
+	openvdb/io/GridDescriptor.h
+	openvdb/io/Archive.h
+	openvdb/io/io.h
+	openvdb/io/Compression.h
+	openvdb/io/File.h
+	openvdb/metadata/StringMetadata.h
+	openvdb/metadata/MetaMap.h
+	openvdb/metadata/Metadata.h
+	openvdb/math/DDA.h
+	openvdb/math/Vec2.h
+	openvdb/math/FiniteDifference.h
+	openvdb/math/Stencils.h
+	openvdb/math/BBox.h
+	openvdb/math/Mat3.h
+	openvdb/math/Mat.h
+	openvdb/math/Proximity.h
+	openvdb/math/Ray.h
+	openvdb/math/ConjGradient.h
+	openvdb/math/Quat.h
+	openvdb/math/Vec3.h
+	openvdb/math/Vec4.h
+	openvdb/math/QuantizedUnitVec.h
+	openvdb/math/Coord.h
+	openvdb/math/Operators.h
+	openvdb/math/Stats.h
+	openvdb/math/Math.h
+	openvdb/math/Tuple.h
+	openvdb/math/LegacyFrustum.h
+	openvdb/math/Mat4.h
+	openvdb/math/Maps.h
+	openvdb/math/Transform.h
+	openvdb/util/PagedArray.h
+	openvdb/util/CpuTimer.h
+	openvdb/util/Formats.h
+	openvdb/util/NullInterrupter.h
+	openvdb/util/Util.h
+	openvdb/util/Name.h
+	openvdb/util/MapsUtil.h
+	openvdb/util/NodeMasks.h
+	openvdb/util/logging.h
+)
+
+add_library(openvdb STATIC ${SRC_FILES} ${HEADER_FILES})
+
+# --------------------------------------------------------------------------------
+
+target_link_libraries(openvdb ${OPENVDB_LIBRARIES})
+
+set(OPENVDB_VERSION_MAJOR 3)
+set(OPENVDB_VERSION_MINOR 1)
+set(OPENVDB_VERSION_PATCH 0)
+set(OPENVDB_VERSION_STRING ${OPENVDB_VERSION_MAJOR}.${OPENVDB_VERSION_MINOR}.${OPENVDB_VERSION_PATCH})
+
+set_target_properties(openvdb PROPERTIES VERSION ${OPENVDB_VERSION_STRING} SOVERSION ${OPENVDB_VERSION_MAJOR})
+
+install(TARGETS openvdb DESTINATION lib)
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include COMPONENT Development FILES_MATCHING PATTERN "*.h"
+        PATTERN ".git" EXCLUDE PATTERN "build" EXCLUDE PATTERN "cmake" EXCLUDE)
+
+# --------------------------------------------------------------------------------
+
+if(WITH_PRINTER)
+	set(PRINT_SRC
+		openvdb/cmd/openvdb_print/main.cc
+	)
+
+	add_executable(vdb_print ${PRINT_SRC})
+	target_link_libraries(vdb_print openvdb)
+	install(TARGETS vdb_print RUNTIME DESTINATION bin)
+endif()
+
+if(WITH_RENDER)
+	set(RENDER_SRC
+		openvdb/cmd/openvdb_render/main.cc
+	)
+
+	add_executable(vdb_render ${RENDER_SRC})
+	target_link_libraries(vdb_render openvdb)
+	install(TARGETS vdb_render RUNTIME DESTINATION bin)
+endif()
+
+# todo
+if(WITH_VIEWER)
+	set(VIEWER_SRC
+		openvdb/viewer/Camera.cc
+		openvdb/viewer/ClipBox.cc
+		openvdb/viewer/Font.cc
+		openvdb/viewer/RenderModules.cc
+		openvdb/viewer/Viewer.cc
+
+		openvdb/viewer/Camera.h
+		openvdb/viewer/ClipBox.h
+		openvdb/viewer/Font.h
+		openvdb/viewer/RenderModules.h
+		openvdb/viewer/Viewer.h
+		openvdb/cmd/openvdb_viewer/main.cc
+	)
+
+	include_directories(${GLFW_INCLUDE_DIRS})
+	link_directories(${GLFW_LIBRARY_DIRS})
+
+	add_executable(vdb_viewer ${VIEWER_SRC})
+	target_link_libraries(vdb_viewer openvdb)
+	install(TARGETS vdb_viewer RUNTIME DESTINATION bin)
+endif()
+
+# todo
+if(WITH_PYTHON)
+#	add_library(pyopenvdb SHARED )
+endif()
+
+set(UNITTEST_SRC
+	openvdb/unittest/main.cc
+	openvdb/unittest/TestBBox.cc
+	openvdb/unittest/TestConjGradient.cc
+	openvdb/unittest/TestCoord.cc
+	openvdb/unittest/TestCpt.cc
+	openvdb/unittest/TestCurl.cc
+	openvdb/unittest/TestDense.cc
+	openvdb/unittest/TestDenseSparseTools.cc
+	openvdb/unittest/TestDiagnostics.cc
+	openvdb/unittest/TestDivergence.cc
+	openvdb/unittest/TestDoubleMetadata.cc
+	openvdb/unittest/TestExceptions.cc
+	openvdb/unittest/TestFile.cc
+	openvdb/unittest/TestFloatMetadata.cc
+	openvdb/unittest/TestGradient.cc
+	openvdb/unittest/TestGrid.cc
+	openvdb/unittest/TestGridBbox.cc
+	openvdb/unittest/TestGridDescriptor.cc
+	openvdb/unittest/TestGridIO.cc
+	openvdb/unittest/TestGridTransformer.cc
+	openvdb/unittest/TestInit.cc
+	openvdb/unittest/TestInt32Metadata.cc
+	openvdb/unittest/TestInt64Metadata.cc
+	openvdb/unittest/TestInternalOrigin.cc
+	openvdb/unittest/TestLaplacian.cc
+	openvdb/unittest/TestLeaf.cc
+	openvdb/unittest/TestLeafBool.cc
+	openvdb/unittest/TestLeafIO.cc
+	openvdb/unittest/TestLeafOrigin.cc
+	openvdb/unittest/TestLevelSetRayIntersector.cc
+	openvdb/unittest/TestLevelSetUtil.cc
+	openvdb/unittest/TestLinearInterp.cc
+	openvdb/unittest/TestMaps.cc
+	openvdb/unittest/TestMat4Metadata.cc
+	openvdb/unittest/TestMath.cc
+	openvdb/unittest/TestMeanCurvature.cc
+	openvdb/unittest/TestMeshToVolume.cc
+	openvdb/unittest/TestMetadata.cc
+	openvdb/unittest/TestMetadataIO.cc
+	openvdb/unittest/TestMetaMap.cc
+	openvdb/unittest/TestName.cc
+	openvdb/unittest/TestNodeIterator.cc
+	openvdb/unittest/TestNodeMask.cc
+	openvdb/unittest/TestParticlesToLevelSet.cc
+	openvdb/unittest/TestPointIndexGrid.cc
+	openvdb/unittest/TestPointPartitioner.cc
+	openvdb/unittest/TestPoissonSolver.cc
+	openvdb/unittest/TestPrePostAPI.cc
+	openvdb/unittest/TestQuadraticInterp.cc
+	openvdb/unittest/TestQuantizedUnitVec.cc
+	openvdb/unittest/TestQuat.cc
+	openvdb/unittest/TestRay.cc
+	openvdb/unittest/TestStats.cc
+	openvdb/unittest/TestStream.cc
+	openvdb/unittest/TestStringMetadata.cc
+	openvdb/unittest/TestTools.cc
+	openvdb/unittest/TestTransform.cc
+	openvdb/unittest/TestTree.cc
+	openvdb/unittest/TestTreeCombine.cc
+	openvdb/unittest/TestTreeGetSetValues.cc
+	openvdb/unittest/TestTreeIterators.cc
+	openvdb/unittest/TestTreeVisitor.cc
+	openvdb/unittest/TestUtil.cc
+	openvdb/unittest/TestValueAccessor.cc
+	openvdb/unittest/TestVec2Metadata.cc
+	openvdb/unittest/TestVec3Metadata.cc
+	openvdb/unittest/TestVolumeRayIntersector.cc
+	openvdb/unittest/TestVolumeToMesh.cc
+)
+
+# todo
+if(WITH_UNITTEST)
+	add_executable(test ${UNITTEST_SRC} ${HEADER_FILES})
+	target_link_libraries(test openvdb ${CPPUNIT_LIBRARIES})
+endif()
--- a/build_files/build_environment/patches/distutildebugflags.diff
+++ b/build_files/build_environment/patches/distutildebugflags.diff
@@ -0,0 +1,11 @@
+--- _msvccompiler.py.orig	2017-01-17 00:57:48 -0700
+++ _msvccompiler.py	2017-05-20 09:47:26 -0600
+@@ -237,7 +237,7 @@
+             ldflags.extend(('/nodefaultlib:libucrt.lib', 'ucrt.lib'))
+ 
+         ldflags_debug = [
+-            '/nologo', '/INCREMENTAL:NO', '/LTCG', '/DEBUG:FULL'
+            '/nologo', '/INCREMENTAL:NO', '/LTCG'
+         ]
+ 
+         self.ldflags_exe = [*ldflags, '/MANIFEST:EMBED,ID=1']
--- a/build_files/build_environment/patches/ffi.diff
+++ b/build_files/build_environment/patches/ffi.diff
@@ -1,11 +0,0 @@
--- Makefile.in	2014-11-12 06:59:58.000000000 -0500
-+++ Makefile.in	2018-09-17 13:36:10.974086554 -0400
-@@ -600,7 +600,7 @@
- target_os = @target_os@
- target_vendor = @target_vendor@
- toolexecdir = @toolexecdir@
-toolexeclibdir = @toolexeclibdir@
-+toolexeclibdir = $(libdir)
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--- a/build_files/build_environment/patches/ffmpeg.diff
+++ b/build_files/build_environment/patches/ffmpeg.diff
@@ -1,11 +1,32 @@
--- a/configure	2018-08-27 13:46:41.071106150 +0200
-+++ b/configure	2018-08-27 13:46:28.162765762 +0200
-@@ -6013,7 +6013,7 @@
-                                require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; }
- enabled libopenh264       && require_pkg_config libopenh264 openh264 wels/codec_api.h WelsGetCodecVersion
- enabled libopenjpeg       && { check_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version ||
-                               { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } }
-+                               { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version "-DOPJ_STATIC $pthreads_extralibs $libm_extralibs" && add_cppflags "-DOPJ_STATIC $pthreads_extralibs $libm_extralibs"; } }
- enabled libopenmpt        && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create -lstdc++ && append libopenmpt_extralibs "-lstdc++"
- enabled libopus           && {
-     enabled libopus_decoder && {
+--- libavutil/common.h	2016-02-14 19:29:42 -0700
+++ libavutil/common.h	2016-03-30 09:50:29 -0600
+@@ -99,6 +99,11 @@
+ #define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
+ #define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
+ 
+//msvc helper
+#ifdef _MSC_VER
+#define inline __inline
+#endif
+
+ /* misc math functions */
+ 
+ #ifdef HAVE_AV_CONFIG_H
+--- configure	2016-11-26 03:12:05.000000000 +0100
+++ configure	2017-04-05 03:24:35.000000000 +0200
+@@ -1899,7 +1899,6 @@
+     access
+     aligned_malloc
+     arc4random
+-    clock_gettime
+     closesocket
+     CommandLineToArgvW
+     CoTaskMemFree
+@@ -5494,7 +5493,6 @@
+ 
+ check_func  access
+ check_func_headers stdlib.h arc4random
+-check_func_headers time.h clock_gettime || { check_func_headers time.h clock_gettime -lrt && add_extralibs -lrt && LIBRT="-lrt"; }
+ check_func  fcntl
+ check_func  fork
+ check_func  gethrtime
--- a/build_files/build_environment/patches/freetype.diff
+++ b/build_files/build_environment/patches/freetype.diff
@@ -1,18 +0,0 @@
-diff -NaurBb b/CMakeLists.txt a/CMakeLists.txt
--- b/CMakeLists.txt	2018-05-01 12:45:46 -0600
-+++ a/CMakeLists.txt	2018-08-08 13:03:22 -0600
-@@ -229,9 +229,12 @@
-   endif ()
-   string(REPLACE "/undef " "#undef "
-     FTCONFIG_H "${FTCONFIG_H}")
-  file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h"
-    "${FTCONFIG_H}")
-+else()
-+  file(READ "${PROJECT_SOURCE_DIR}/include/freetype/config/ftconfig.h"
-+    FTCONFIG_H)
- endif ()
-+file(WRITE "${PROJECT_BINARY_DIR}/include/freetype/config/ftconfig.h"
-+  "${FTCONFIG_H}")
- 
- 
- # Create the options file
--- a/build_files/build_environment/patches/install_deps_llvm.diff
+++ b/build_files/build_environment/patches/install_deps_llvm.diff
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -14,7 +14,7 @@
+ set(LLVM_VERSION_MINOR 4)
+ 
+ if (NOT PACKAGE_VERSION)
+-  set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}svn")
+  set(PACKAGE_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}")
+ endif()
+ 
+ option(LLVM_INSTALL_TOOLCHAIN_ONLY "Only include toolchain files in the 'install' target." OFF)
--- a/build_files/build_environment/patches/install_deps_osl.diff
+++ b/build_files/build_environment/patches/install_deps_osl.diff
@@ -0,0 +1,12 @@
+--- a/src/shaders/CMakeLists.txt
+++ b/src/shaders/CMakeLists.txt
+@@ -27,7 +27,7 @@ macro (osl_compile oslsrc objlist headers)
+         message (STATUS "cmd: ${CMAKE_CURRENT_BINARY_DIR}/../oslc/oslc ${oslsrc}")
+     endif ()
+     add_custom_command (OUTPUT ${osofile}
+-        COMMAND "${CMAKE_CURRENT_BINARY_DIR}/../oslc/oslc" ${oslsrc}
+        COMMAND "${CMAKE_CURRENT_BINARY_DIR}/../oslc/oslc" "-o" ${osofile} ${oslsrc}
+         MAIN_DEPENDENCY ${oslsrc}
+         DEPENDS ${${headers}} ${oslsrc} "${CMAKE_CURRENT_BINARY_DIR}/stdosl.h" "${CMAKE_CURRENT_BINARY_DIR}/../oslc/oslc"
+         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+
--- a/build_files/build_environment/patches/libfaad.diff
+++ b/build_files/build_environment/patches/libfaad.diff
@@ -0,0 +1,10 @@
+--- frontend/main.c	2008-09-22 11:55:09 -0600
+++ frontend/main.c	2016-04-06 15:20:36 -0600
+@@ -31,7 +31,6 @@
+ #ifdef _WIN32
+ #define WIN32_LEAN_AND_MEAN
+ #include <windows.h>
+-#define off_t __int64
+ #else
+ #include <time.h>
+ #endif
--- a/build_files/build_environment/patches/llvm-alloca-fix.diff
+++ b/build_files/build_environment/patches/llvm-alloca-fix.diff
@@ -0,0 +1,111 @@
+Index: lib/Target/X86/X86ISelLowering.cpp
+===================================================================
+--- lib/Target/X86/X86ISelLowering.cpp	2014-04-11 23:04:44.000000000 +0200
+++ lib/Target/X86/X86ISelLowering.cpp (working copy)
+@@ -15493,12 +15493,36 @@
+   // non-trivial part is impdef of ESP.
+ 
+   if (Subtarget->isTargetWin64()) {
+    const char *StackProbeSymbol = 
+      Subtarget->isTargetCygMing() ? "___chkstk" : "__chkstk";
+      
+    MachineInstrBuilder MIB;
+    
+    if (getTargetMachine().getCodeModel() == CodeModel::Large) {
+      // For large code model we need to do indirect call to __chkstk.
+    
+      // R11 will be used to contain the address of __chkstk.
+      // R11 is a volotiale register and assumed to be destoyed by the callee, 
+      // so there is no need to save and restore it.
+      BuildMI(*BB, MI, DL, TII->get(X86::MOV64ri), X86::R11)
+        .addExternalSymbol(StackProbeSymbol);
+      // Create a call to __chkstk function which address contained in R11.
+      MIB = BuildMI(*BB, MI, DL, TII->get(X86::CALL64r))
+                    .addReg(X86::R11, RegState::Kill);
+                  
+    } else {
+      
+      // For non-large code model we can do direct call to __chkstk.
+      
+      MIB = BuildMI(*BB, MI, DL, TII->get(X86::W64ALLOCA))
+              .addExternalSymbol(StackProbeSymbol);
+    }
+  
+     if (Subtarget->isTargetCygMing()) {
+       // ___chkstk(Mingw64):
+       // Clobbers R10, R11, RAX and EFLAGS.
+       // Updates RSP.
+-      BuildMI(*BB, MI, DL, TII->get(X86::W64ALLOCA))
+-        .addExternalSymbol("___chkstk")
+      MIB
+         .addReg(X86::RAX, RegState::Implicit)
+         .addReg(X86::RSP, RegState::Implicit)
+         .addReg(X86::RAX, RegState::Define | RegState::Implicit)
+@@ -15507,8 +15531,7 @@
+     } else {
+       // __chkstk(MSVCRT): does not update stack pointer.
+       // Clobbers R10, R11 and EFLAGS.
+-      BuildMI(*BB, MI, DL, TII->get(X86::W64ALLOCA))
+-        .addExternalSymbol("__chkstk")
+      MIB
+         .addReg(X86::RAX, RegState::Implicit)
+         .addReg(X86::EFLAGS, RegState::Define | RegState::Implicit);
+       // RAX has the offset to be subtracted from RSP.
+Index: lib/Target/X86/X86FrameLowering.cpp
+===================================================================
+--- lib/Target/X86/X86FrameLowering.cpp	2013-10-24 01:37:01.000000000 +0200
+++ lib/Target/X86/X86FrameLowering.cpp (working copy)
+@@ -635,25 +635,49 @@
+         .addReg(X86::EAX, RegState::Kill)
+         .setMIFlag(MachineInstr::FrameSetup);
+     }
+    
+    MachineInstrBuilder MIB;
+ 
+     if (Is64Bit) {
+           
+       // Handle the 64-bit Windows ABI case where we need to call __chkstk.
+       // Function prologue is responsible for adjusting the stack pointer.
+       BuildMI(MBB, MBBI, DL, TII.get(X86::MOV64ri), X86::RAX)
+         .addImm(NumBytes)
+         .setMIFlag(MachineInstr::FrameSetup);
+        
+      if (TM.getCodeModel() == CodeModel::Large) {
+        // For large code model we need to do indirect call to __chkstk.
+      
+          
+        // R11 will be used to contain the address of __chkstk.
+        // R11 is a volotiale register and assumed to be destoyed by the callee, 
+        // so there is no need to save and restore it.
+        BuildMI(MBB, MBBI, DL, TII.get(X86::MOV64ri), X86::R11)
+          .addExternalSymbol(StackProbeSymbol);
+        // Create a call to __chkstk function which address contained in R11.
+        MIB = BuildMI(MBB, MBBI, DL, TII.get(X86::CALL64r))
+                .addReg(X86::R11, RegState::Kill);
+      } else {
+      
+        // For non-large code model we can do direct call to __chkstk.
+              
+        MIB = BuildMI(MBB, MBBI, DL, TII.get(X86::W64ALLOCA))
+                .addExternalSymbol(StackProbeSymbol);
+      }
+     } else {
+       // Allocate NumBytes-4 bytes on stack in case of isEAXAlive.
+       // We'll also use 4 already allocated bytes for EAX.
+       BuildMI(MBB, MBBI, DL, TII.get(X86::MOV32ri), X86::EAX)
+         .addImm(isEAXAlive ? NumBytes - 4 : NumBytes)
+         .setMIFlag(MachineInstr::FrameSetup);
+        
+      MIB = BuildMI(MBB, MBBI, DL, TII.get(X86::CALLpcrel32))
+              .addExternalSymbol(StackProbeSymbol);
+     }
+ 
+-    BuildMI(MBB, MBBI, DL,
+-            TII.get(Is64Bit ? X86::W64ALLOCA : X86::CALLpcrel32))
+-      .addExternalSymbol(StackProbeSymbol)
+-      .addReg(StackPtr,    RegState::Define | RegState::Implicit)
+    
+    MIB.addReg(StackPtr,    RegState::Define | RegState::Implicit)
+       .addReg(X86::EFLAGS, RegState::Define | RegState::Implicit)
+       .setMIFlag(MachineInstr::FrameSetup);
+  
--- a/build_files/build_environment/patches/numpy.diff
+++ b/build_files/build_environment/patches/numpy.diff
@@ -0,0 +1,23 @@
+diff -Naur numpy-1.11.1/numpy/distutils/ccompiler.py numpy-1.11.1/numpy/distutils/ccompiler.py
+--- numpy-1.11.1/numpy/distutils/ccompiler.py	2016-06-25 08:38:34 -0600
+++ numpy-1.11.1/numpy/distutils/ccompiler.py	2016-08-04 12:33:43 -0600
+@@ -29,6 +29,7 @@
+ 
+ # Using customized CCompiler.spawn.
+ def CCompiler_spawn(self, cmd, display=None):
+    cmd = quote_args(cmd)
+     """
+     Execute a command in a sub-process.
+ 
+diff -Naur numpy-1.11.1/numpy/distutils/misc_util.py numpy-1.11.1/numpy/distutils/misc_util.py
+--- numpy-1.11.1/numpy/distutils/misc_util.py	2016-06-25 08:38:34 -0600
+++ numpy-1.11.1/numpy/distutils/misc_util.py	2016-08-04 12:34:56 -0600
+@@ -116,7 +116,7 @@
+     args = list(args)
+     for i in range(len(args)):
+         a = args[i]
+-        if ' ' in a and a[0] not in '"\'':
+        if ' ' in a and a[0] not in '"\'' and a[len(a)-1] not in '"\'':
+             args[i] = '"%s"' % (a)
+     return args
+ 
--- a/build_files/build_environment/patches/openal.diff
+++ b/build_files/build_environment/patches/openal.diff
@@ -1,13 +0,0 @@
-diff -Naur external_openal_original/CMakeLists.txt external_openal/CMakeLists.txt
--- external_openal_original/CMakeLists.txt	2016-01-24 20:12:39 -0700
-+++ external_openal/CMakeLists.txt	2018-06-02 12:16:52 -0600
-@@ -885,7 +885,8 @@
- OPTION(ALSOFT_REQUIRE_MMDEVAPI "Require MMDevApi backend" OFF)
- IF(HAVE_WINDOWS_H)
-     # Check MMSystem backend
-    CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H -D_WIN32_WINNT=0x0502)
-+    set(CMAKE_REQUIRED_FLAGS "-D_WIN32_WINNT=0x0502")
-+    CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H)
-     IF(HAVE_MMSYSTEM_H)
-         CHECK_SHARED_FUNCTION_EXISTS(waveOutOpen "windows.h;mmsystem.h" winmm "" HAVE_LIBWINMM)
-         IF(HAVE_LIBWINMM)
--- a/build_files/build_environment/patches/opencollada.diff
+++ b/build_files/build_environment/patches/opencollada.diff
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 95abbe2..4f14f30 100644
+index 3fc9be5..5112ce6 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -254,11 +254,11 @@ if(USE_STATIC_MSVC_RUNTIME)
+@@ -254,11 +254,11 @@
 endif()
 
 #adding PCRE
@@ -16,10 +16,10 @@ index 95abbe2..4f14f30 100644
 		message("WARNING: Native PCRE not found, taking PCRE from ./Externals")
 		add_definitions(-DPCRE_STATIC)
 		add_subdirectory(${EXTERNAL_LIBRARIES}/pcre)
-diff --git a/DAEValidator/library/include/no_warning_begin b/DAEValidator/library/include/no_warning_begin
-index 7a69c32..defb315 100644
--- a/DAEValidator/library/include/no_warning_begin
-+++ b/DAEValidator/library/include/no_warning_begin
+diff --git a/DAEValidator/library/include/no_warning_begin.orig b/DAEValidator/library/include/no_warning_begin
+index 3fc9be5..5112ce6 100644
+--- a/DAEValidator/library/include/no_warning_begin.orig	2017-05-31 16:56:39 -0600
+++ b/DAEValidator/library/include/no_warning_begin	2017-06-07 10:18:45 -0600
@@ -2,6 +2,9 @@
 #if defined(_WIN32)
 #	pragma warning(push)
@@ -30,16 +30,3 @@ index 7a69c32..defb315 100644
 #	if defined(_MSC_VER) && defined(_DEBUG)
 #		pragma warning(disable:4548)
 #	endif
-diff --git a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp b/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
-index 1f9a3ee..d151e9a 100644
--- a/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
-+++ b/GeneratedSaxParser/src/GeneratedSaxParserUtils.cpp
-@@ -1553,7 +1553,7 @@ namespace GeneratedSaxParser
- #if defined(COLLADABU_OS_WIN) && !defined(__MINGW32__)
-         return _isnan( value ) ? true : false;
- #else
-#ifdef isnan
-+#if defined(isnan) || defined(__APPLE__)
-         return isnan( value );
- #else
-         return std::isnan(value);
--- a/build_files/build_environment/patches/opencolorio.diff
+++ b/build_files/build_environment/patches/opencolorio.diff
@@ -1,33 +1,21 @@
-diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
-index 1eb691b..cff9bd8 100644
--- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
-     if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
-         set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
-     endif()
-else()
-    set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
- 
- # SHARED
--- a/CMakeLists.txt	2018-09-10 22:15:29.000000000 +0200
-+++ b/CMakeLists.txt	2018-09-10 22:17:40.000000000 +0200
-@@ -229,7 +229,7 @@
-             PATCH_COMMAND   ${GIT_EXECUTABLE} apply --ignore-whitespace ${TINYXML_PATCHFILE}
-             BINARY_DIR      ext/build/tinyxml
-             INSTALL_DIR     ext/dist
-            CMAKE_ARGS      ${TINYXML_CMAKE_ARGS}
-+            CMAKE_ARGS      ${TINYXML_CMAKE_ARGS} -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT} -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG} -DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE} -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-         )
-         if(WIN32)
-             set(TINYXML_STATIC_LIBRARIES  ${PROJECT_BINARY_DIR}/ext/dist/lib/tinyxml.lib)
-@@ -343,7 +343,7 @@
-             PATCH_COMMAND   ${GIT_EXECUTABLE} apply --ignore-whitespace ${YAML_CPP_PATCHFILE}
-             BINARY_DIR      ext/build/yaml-cpp
-             INSTALL_DIR     ext/dist
-            CMAKE_ARGS      ${YAML_CPP_CMAKE_ARGS}
-+            CMAKE_ARGS      ${YAML_CPP_CMAKE_ARGS} -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT} -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG} -DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE} -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-         )
-         set(YAML_CPP_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ext/dist/include)
-         set(YAML_CPP_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib)
+diff -ru ./CMakeLists.txt ./CMakeLists.txt
+--- ./CMakeLists.txt	2014-09-11 21:08:18.000000000 +0200
+++ ./CMakeLists.txt	2016-05-15 17:17:01.000000000 +0200
+@@ -186,7 +186,7 @@
+         PATCH_COMMAND patch -f -p1 < ${CMAKE_SOURCE_DIR}/ext/tinyxml_${TINYXML_VERSION}.patch
+         BINARY_DIR ext/build/tinyxml
+         INSTALL_DIR ext/dist
+-        CMAKE_ARGS ${TINYXML_CMAKE_ARGS}
+        CMAKE_ARGS ${TINYXML_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT} -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG} -DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE} -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+     )
+     if(WIN32)
+         set(TINYXML_STATIC_LIBRARIES ${PROJECT_BINARY_DIR}/ext/dist/lib/tinyxml.lib)
+@@ -254,7 +254,7 @@
+         BINARY_DIR ext/build/yaml-cpp
+         PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/yaml-cpp-${YAML_CPP_VERSION}.patch
+         INSTALL_DIR ext/dist
+-        CMAKE_ARGS ${YAML_CPP_CMAKE_ARGS}
+        CMAKE_ARGS ${YAML_CPP_CMAKE_ARGS} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT} -DCMAKE_C_FLAGS_DEBUG=${CMAKE_C_FLAGS_DEBUG} -DCMAKE_C_FLAGS_RELEASE=${CMAKE_C_FLAGS_RELEASE} -DCMAKE_CXX_FLAGS_DEBUG=${CMAKE_CXX_FLAGS_DEBUG} -DCMAKE_CXX_FLAGS_RELEASE=${CMAKE_CXX_FLAGS_RELEASE} -DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
+     )
+     set(YAML_CPP_INCLUDE_DIRS ${PROJECT_BINARY_DIR}/ext/dist/include)
+     set(YAML_CPP_LIBRARY_DIRS ${PROJECT_BINARY_DIR}/ext/dist/lib)
--- a/build_files/build_environment/patches/opencolorio_win.diff
+++ b/build_files/build_environment/patches/opencolorio_win.diff
@@ -1,51 +0,0 @@
-diff -Naur external_opencolorio/CMakeLists.txt external_opencolorio.patched/CMakeLists.txt
--- external_opencolorio/CMakeLists.txt	2018-01-04 18:38:27 -0700
-+++ external_opencolorio.patched/CMakeLists.txt	2018-08-15 11:46:53 -0600
-@@ -251,25 +251,30 @@
- if(USE_EXTERNAL_YAML)
-     # Set minimum yaml version for non-patched sources.
-     set(YAML_VERSION_MIN "0.3.0")
-    include(FindPkgConfig)
-    pkg_check_modules(PC_YAML_CPP REQUIRED QUIET yaml-cpp)
-    find_path(YAML_CPP_INCLUDE_DIR yaml-cpp/yaml.h
-        HINTS  ${PC_YAML_CPP_INCLUDEDIR} ${PC_YAML_CPP_INCLUDE_DIRS} )
-    find_library(YAML_CPP_LIBRARY LIBRARY_NAMES yaml-cpp libyaml-cpp
-        HINTS ${PC_YAML_CPP_LIBRARY_DIRS} )
-    set(YAML_CPP_LIBRARIES ${YAML_CPP_LIBRARY})
-    set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR})
-    set(YAML_CPP_VERSION ${PC_YAML_CPP_VERSION})
-+    if(NOT WIN32)
-+		include(FindPkgConfig)
-+		pkg_check_modules(PC_YAML_CPP REQUIRED QUIET yaml-cpp)
-+		find_path(YAML_CPP_INCLUDE_DIR yaml-cpp/yaml.h
-+			HINTS  ${PC_YAML_CPP_INCLUDEDIR} ${PC_YAML_CPP_INCLUDE_DIRS} )
-+		find_library(YAML_CPP_LIBRARY LIBRARY_NAMES yaml-cpp libyaml-cpp
-+			HINTS ${PC_YAML_CPP_LIBRARY_DIRS} )
-+		set(YAML_CPP_LIBRARIES ${YAML_CPP_LIBRARY})
-+		set(YAML_CPP_INCLUDE_DIRS ${YAML_CPP_INCLUDE_DIR})
-+		set(YAML_CPP_VERSION ${PC_YAML_CPP_VERSION})
- 
-    if(YAML_CPP_VERSION VERSION_LESS ${YAML_VERSION_MIN})
-        message(FATAL_ERROR "ERROR: yaml-cpp ${YAML_VERSION_MIN} or greater is required.")
-    endif()
-
-    find_package_handle_standard_args(yaml-cpp
-                                      REQUIRED_VARS YAML_CPP_LIBRARIES YAML_CPP_INCLUDE_DIRS )
-    set(YAML_CPP_FOUND ${YAML-CPP_FOUND})
-    mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND)
-+		if(YAML_CPP_VERSION VERSION_LESS ${YAML_VERSION_MIN})
-+			message(FATAL_ERROR "ERROR: yaml-cpp ${YAML_VERSION_MIN} or greater is required.")
-+		endif()
- 
-+		find_package_handle_standard_args(yaml-cpp
-+										  REQUIRED_VARS YAML_CPP_LIBRARIES YAML_CPP_INCLUDE_DIRS )
-+		set(YAML_CPP_FOUND ${YAML-CPP_FOUND})
-+		mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND)
-+	else()
-+		set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${INC_1})
-+		set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${INC_2})
-+		message("INCLUDE DIRS = i:${EXTERNAL_INCLUDE_DIRS} |1:${INC_1} |2:${INC_2}")
-+	endif()
-     if(YAML_CPP_FOUND)
-         if(YAML_CPP_VERSION VERSION_GREATER "0.5.0")
-             # Need to also get the boost headers here, as yaml-cpp 0.5.0+ requires them.
--- a/build_files/build_environment/patches/openexr.diff
+++ b/build_files/build_environment/patches/openexr.diff
@@ -0,0 +1,33 @@
+--- IlmImf/CMakeLists.txt 2014-08-10 06:23:56.000000000 +0200
+++ IlmImf/CMakeLists.txt 2017-01-08 04:06:04.931723800 +0100
+@@ -8,8 +8,8 @@
+ 
+ TARGET_LINK_LIBRARIES ( b44ExpLogTable
+   Half
+-  Iex${ILMBASE_LIBSUFFIX}
+   IlmThread${ILMBASE_LIBSUFFIX}
+  Iex${ILMBASE_LIBSUFFIX}
+   ${PTHREAD_LIB}
+ )
+ 
+@@ -25,8 +25,8 @@
+ 
+ TARGET_LINK_LIBRARIES ( dwaLookups
+   Half
+-  Iex${ILMBASE_LIBSUFFIX}
+   IlmThread${ILMBASE_LIBSUFFIX}
+  Iex${ILMBASE_LIBSUFFIX}
+   ${PTHREAD_LIB}
+ )
+ 
+@@ -138,9 +138,9 @@
+ 
+ TARGET_LINK_LIBRARIES ( IlmImf 
+   Half 
+-  Iex${ILMBASE_LIBSUFFIX}
+   Imath${ILMBASE_LIBSUFFIX}
+   IlmThread${ILMBASE_LIBSUFFIX}
+  Iex${ILMBASE_LIBSUFFIX}
+   ${PTHREAD_LIB} ${ZLIB_LIBRARIES}
+ )
+ 
--- a/build_files/build_environment/patches/openimageio_static_libs.diff
+++ b/build_files/build_environment/patches/openimageio_static_libs.diff
@@ -1,22 +0,0 @@
-diff -Naur external_openimageio.orig/src/cmake/compiler.cmake external_openimageio/src/cmake/compiler.cmake
--- external_openimageio.orig/src/cmake/compiler.cmake	2018-07-31 23:45:19 -0600
-+++ external_openimageio/src/cmake/compiler.cmake	2018-08-16 12:50:12 -0600
-@@ -152,6 +152,7 @@
-     add_definitions (-D_CRT_NONSTDC_NO_WARNINGS)
-     add_definitions (-D_SCL_SECURE_NO_WARNINGS)
-     add_definitions (-DJAS_WIN_MSVC_BUILD)
-+    add_definitions (-DOPJ_STATIC)
- endif (MSVC)
- 
- # Use ccache if found
--- external_openimageio.orig/CMakeLists.txt	2018-07-31 23:45:19 -0600
-+++ external_openimageio/CMakeLists.txt	2018-08-17 15:22:56 -0600
-@@ -169,7 +169,7 @@
-   add_subdirectory (src/iinfo)
-   add_subdirectory (src/maketx)
-   add_subdirectory (src/oiiotool)
-  add_subdirectory (src/testtex)
-+# add_subdirectory (src/testtex)
-   add_subdirectory (src/iv)
- endif ()
- 
--- a/build_files/build_environment/patches/openimageio_staticexr.diff
+++ b/build_files/build_environment/patches/openimageio_staticexr.diff
@@ -0,0 +1,11 @@
+--- CMakeLists.txt	2016-11-01 01:03:44 -0600
+++ CMakeLists.txt	2016-12-01 09:20:12 -0700
+@@ -454,7 +454,7 @@
+     add_definitions (-D_CRT_NONSTDC_NO_WARNINGS)
+     add_definitions (-D_SCL_SECURE_NO_WARNINGS)
+     add_definitions (-DJAS_WIN_MSVC_BUILD)
+-    add_definitions (-DOPENEXR_DLL)
+    add_definitions (-DOPJ_STATIC)
+     if (LINKSTATIC)
+         add_definitions (-DBoost_USE_STATIC_LIBS=1)
+     else ()
--- a/build_files/build_environment/patches/opensubdiv.diff
+++ b/build_files/build_environment/patches/opensubdiv.diff
@@ -1,13 +1,16 @@
-diff --git a/opensubdiv/far/topologyRefiner.cpp b/opensubdiv/far/topologyRefiner.cpp
-index 3754b36e..7fe42bcc 100644
--- a/opensubdiv/far/topologyRefiner.cpp
-+++ b/opensubdiv/far/topologyRefiner.cpp
-@@ -263,7 +263,7 @@ namespace internal {
-         bool IsEmpty() const { return *((int_type*)this) == 0; }
+ opensubdiv/osd/d3d11VertexBuffer.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/opensubdiv/osd/d3d11VertexBuffer.cpp b/opensubdiv/osd/d3d11VertexBuffer.cpp
+index 603cbf4..07e7e0a 100644
+--- a/opensubdiv/osd/d3d11VertexBuffer.cpp
+++ b/opensubdiv/osd/d3d11VertexBuffer.cpp
+@@ -81,7 +81,7 @@ D3D11VertexBuffer::UpdateData(const float *src, int startVertex, int numVertices
 
-         FeatureMask() { Clear(); }
-        FeatureMask(Options const & options, Sdc::SchemeType sType) { InitializeFeatures(options, sType); }
-+        FeatureMask(Options const & options, Sdc::SchemeType sType) { Clear(); InitializeFeatures(options, sType); }
+     deviceContext->Unmap(_uploadBuffer, 0);
 
-         //  These are the two primary methods intended for use -- intialization via a set of Options
-         //  and reduction of the subsequent feature set (which presumes prior initialization with the
+-    D3D11_BOX srcBox = { 0, 0, 0, size, 1, 1 };
+    D3D11_BOX srcBox = { 0, 0, 0, (UINT) size, 1, 1 };
+     deviceContext->CopySubresourceRegion(_buffer, 0, 0, 0, 0,
+                                          _uploadBuffer, 0, &srcBox);
+ }
--- a/build_files/build_environment/patches/openvdb.diff
+++ b/build_files/build_environment/patches/openvdb.diff
@@ -1,102 +1,11 @@
-diff -Naur openvdb.orig/openvdb/CMakeLists.txt openvdb/openvdb/CMakeLists.txt
--- openvdb.orig/openvdb/CMakeLists.txt	2018-04-10 12:22:17 -0600
-+++ openvdb/openvdb/CMakeLists.txt	2018-08-15 19:04:52 -0600
-@@ -82,6 +82,9 @@
- IF (WIN32 AND OPENVDB_DISABLE_BOOST_IMPLICIT_LINKING)
-   ADD_DEFINITIONS ( -DBOOST_ALL_NO_LIB )
- ENDIF ()
-+if(WIN32)
-+ADD_DEFINITIONS ( -D__TBB_NO_IMPLICIT_LINKAGE )
-+endif()
- 
- FIND_PACKAGE ( Blosc REQUIRED )
- FIND_PACKAGE ( TBB REQUIRED )
-@@ -195,6 +198,7 @@
-   ${Ilmbase_HALF_LIBRARY}
-   ${ZLIB_LIBRARY}
-   ${BLOSC_blosc_LIBRARY}
-+  ${EXTRA_LIBS}
-   )
-
- IF (WIN32)
-@@ -225,13 +228,16 @@
-   ${VDB_PRINT_SOURCE_FILES}
-   )
- 
-+if(NOT WIN32)
-+	set(EXTRA_LIBS m stdc++ dl)
-+endif()
-+  
- TARGET_LINK_LIBRARIES ( vdb_print
-   openvdb_shared
-   ${CMAKE_THREAD_LIBS_INIT}
-   ${BLOSC_blosc_LIBRARY}
-  m
-  stdc++
-  )
-+  ${EXTRA_LIBS}
-+)
- 
- SET ( VDB_RENDER_SOURCE_FILES cmd/openvdb_render/main.cc )
- SET_SOURCE_FILES_PROPERTIES ( ${VDB_RENDER_SOURCE_FILES}
-@@ -249,8 +255,7 @@
-   ${Openexr_ILMIMF_LIBRARY}
-   ${Ilmbase_ILMTHREAD_LIBRARY}
-   ${Ilmbase_IEX_LIBRARY}
-  m
-  stdc++
-+  ${EXTRA_LIBS}
-   )
- 
- SET ( VDB_VIEW_SOURCE_FILES
-@@ -270,7 +270,7 @@
-   PROPERTIES
-   COMPILE_FLAGS "-DOPENVDB_USE_BLOSC ${OPENVDB_USE_GLFW_FLAG} -DGL_GLEXT_PROTOTYPES=1"
-   )
-IF (NOT WIN32)
-+IF (FALSE)
-   ADD_EXECUTABLE ( vdb_view
-     ${VDB_VIEW_SOURCE_FILES}
-     )
-@@ -283,9 +288,8 @@
-     ${GLFW_LINK_LIBRARY}
-     ${GLFW_DEPENDENT_LIBRARIES}
-     ${GLEW_GLEW_LIBRARY}
-    m
-    stdc++
-    )
-+	${EXTRA_LIBS}
-+  )
- ENDIF ()
- 
- SET ( UNITTEST_SOURCE_FILES
-@@ -392,8 +396,7 @@
-   TARGET_LINK_LIBRARIES ( vdb_test
-     ${CPPUnit_cppunit_LIBRARY}
-     openvdb_shared
-    m
-    stdc++
-+    ${EXTRA_LIBS}
-     )
- 
-   ADD_TEST ( vdb_unit_test vdb_test )
-@@ -422,7 +422,7 @@
- ENDIF ()
- 
- # Installation
-IF ( NOT WIN32 )
-+IF ( FALSE )
-   INSTALL ( TARGETS
-     vdb_view
-     DESTINATION
-diff -Naur openvdb.orig/openvdb/math/Coord.h openvdb/openvdb/math/Coord.h
--- openvdb.orig/openvdb/math/Coord.h	2018-04-10 12:22:17 -0600
-+++ openvdb/openvdb/math/Coord.h	2018-08-15 20:32:43 -0600
-@@ -35,6 +35,7 @@
- #include <array> // for std::array
- #include <iostream>
- #include <limits>
-+#define NOMINMAX
+diff -Naur k:\BlenderDev\lib\win64_vc12_Harvest\openVDB\/include/openvdb/math/Coord.h .\openVDB/include/openvdb/math/Coord.h
+--- k:\BlenderDev\lib\win64_vc12_Harvest\openVDB\/include/openvdb/math/Coord.h	2016-03-30 15:09:49 -0600
+++ .\openVDB/include/openvdb/math/Coord.h	2016-04-01 06:53:47 -0600
+@@ -34,6 +34,7 @@
 #include <openvdb/Platform.h>
 #include "Math.h"
 #include "Vec3.h"
+#define NOMINMAX
+ 
+ namespace tbb { class split; } // forward declaration
+ 
--- a/build_files/build_environment/patches/openvdb_vc2013.diff
+++ b/build_files/build_environment/patches/openvdb_vc2013.diff
@@ -0,0 +1,35 @@
+--- openvdb/tree/LeafNode.h	2015-10-01 15:55:33 -0600
+++ openvdb/tree/LeafNode.h	2016-03-26 13:12:22 -0600
+@@ -70,13 +70,14 @@
+     typedef boost::shared_ptr<LeafNode>  Ptr;
+     typedef util::NodeMask<Log2Dim>      NodeMaskType;
+ 
+-    static const Index
+-        LOG2DIM     = Log2Dim,      // needed by parent nodes
+-        TOTAL       = Log2Dim,      // needed by parent nodes
+-        DIM         = 1 << TOTAL,   // dimension along one coordinate direction
+-        NUM_VALUES  = 1 << 3 * Log2Dim,
+-        NUM_VOXELS  = NUM_VALUES,   // total number of voxels represented by this node
+-        SIZE        = NUM_VALUES,
+	static const Index
+		LOG2DIM = Log2Dim,      // needed by parent nodes
+		TOTAL = Log2Dim,      // needed by parent nodes
+		DIM = 1 << TOTAL,   // dimension along one coordinate direction
+		NUM_VALUES = 1 << 3 * Log2Dim,
+		NUM_VOXELS = NUM_VALUES;   // total number of voxels represented by this node
+	static const Index
+		SIZE        = NUM_VALUES,
+         LEVEL       = 0;            // level 0 = leaf
+ 
+     /// @brief ValueConverter<T>::Type is the type of a LeafNode having the same
+--- openvdb/PlatformConfig.h	2016-03-30 15:09:49 -0600
+++ openvdb/PlatformConfig.h	2016-04-01 07:00:38 -0600
+@@ -47,7 +47,7 @@
+     #if !defined(OPENVDB_OPENEXR_STATICLIB) && !defined(OPENEXR_DLL)
+         #define OPENEXR_DLL
+     #endif
+-
+    #define NOMINMAX
+ #endif // _WIN32
+ 
+ #endif // OPENVDB_PLATFORMCONFIG_HAS_BEEN_INCLUDED
--- a/build_files/build_environment/patches/osl.diff
+++ b/build_files/build_environment/patches/osl.diff
@@ -1,6 +1,6 @@
-diff -Naur OpenShadingLanguage-Release-1.9.9/src/cmake/flexbison.cmake external_osl/src/cmake/flexbison.cmake
--- OpenShadingLanguage-Release-1.9.9/src/cmake/flexbison.cmake	2018-05-01 16:39:02 -0600
-+++ external_osl/src/cmake/flexbison.cmake	2018-08-23 15:42:27 -0600
+diff -Naur osl/src/external_osl/src/cmake/flexbison.cmake osl_bak/src/external_osl/src/cmake/flexbison.cmake
+--- osl/src/external_osl//src/cmake/flexbison.cmake	2016-01-29 11:15:22 -0700
+++ osl_bak/src/external_osl/src/cmake/flexbison.cmake	2016-02-29 21:26:26 -0700
@@ -77,7 +77,7 @@
           DEPENDS ${${compiler_headers}}
           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
@@ -10,65 +10,29 @@ diff -Naur OpenShadingLanguage-Release-1.9.9/src/cmake/flexbison.cmake external_
           MAIN_DEPENDENCY ${flexsrc}
           DEPENDS ${${compiler_headers}}
           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
-diff -Naur OpenShadingLanguage-Release-1.9.9/src/cmake/flexbison.cmake.rej external_osl/src/cmake/flexbison.cmake.rej
--- OpenShadingLanguage-Release-1.9.9/src/cmake/flexbison.cmake.rej	1969-12-31 17:00:00 -0700
-+++ external_osl/src/cmake/flexbison.cmake.rej	2018-08-24 17:42:11 -0600
-@@ -0,0 +1,11 @@
-+--- src/cmake/flexbison.cmake	2018-05-01 16:39:02 -0600
-++++ src/cmake/flexbison.cmake	2018-08-24 10:24:03 -0600
-+@@ -77,7 +77,7 @@
-+           DEPENDS ${${compiler_headers}}
-+           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
-+         ADD_CUSTOM_COMMAND ( OUTPUT ${flexoutputcxx} 
-+-          COMMAND ${FLEX_EXECUTABLE} -o ${flexoutputcxx} "${CMAKE_CURRENT_SOURCE_DIR}/${flexsrc}"
-++          COMMAND ${FLEX_EXECUTABLE} ${FLEX_EXTRA_OPTIONS} -o ${flexoutputcxx} "${CMAKE_CURRENT_SOURCE_DIR}/${flexsrc}"
-+           MAIN_DEPENDENCY ${flexsrc}
-+           DEPENDS ${${compiler_headers}}
-+           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
-diff -Naur OpenShadingLanguage-Release-1.9.9/src/include/OSL/llvm_util.h external_osl/src/include/OSL/llvm_util.h
--- OpenShadingLanguage-Release-1.9.9/src/include/OSL/llvm_util.h	2018-05-01 16:39:02 -0600
-+++ external_osl/src/include/OSL/llvm_util.h	2018-08-25 14:05:00 -0600
-@@ -33,6 +33,8 @@
- 
- #include <vector>
- 
-+#define OSL_HAS_BLENDER_CLEANUP_FIX
+--- a/src/include/OSL/oslconfig.h	2016-10-31 16:48:19 -0600
+++ b/src/include/OSL/oslconfig.h	2018-05-27 11:18:08 -0600
+@@ -44,12 +44,18 @@
+ // same if another packages is compiling against OSL and using these headers
+ // (OSL may be C++11 but the client package may be older, or vice versa --
+ // use these two symbols to differentiate these cases, when important).
+-#if (__cplusplus >= 201402L)
+-#  define OSL_CPLUSPLUS_VERSION  14
+-#elif (__cplusplus >= 201103L)
+-#  define OSL_CPLUSPLUS_VERSION  11
 +
- #ifdef LLVM_NAMESPACE
- namespace llvm = LLVM_NAMESPACE;
+// Force C++03 for MSVC in blender since svn the libraries are build with that
+#if !defined(_MSC_VER)
+	#if (__cplusplus >= 201402L)
+	#  define OSL_CPLUSPLUS_VERSION  14
+	#elif (__cplusplus >= 201103L)
+	#  define OSL_CPLUSPLUS_VERSION  11
+	#else
+	#  define OSL_CPLUSPLUS_VERSION  3 /* presume C++03 */
+	#endif
+ #else
+-#  define OSL_CPLUSPLUS_VERSION  3 /* presume C++03 */
+	#  define OSL_CPLUSPLUS_VERSION  3 /* presume C++03 */
 #endif
-@@ -487,6 +489,7 @@
-     std::string func_name (llvm::Function *f);
 
-     static size_t total_jit_memory_held ();
-+    static void Cleanup ();
- 
- private:
-     class MemoryManager;
-diff -Naur OpenShadingLanguage-Release-1.9.9/src/include/OSL/oslnoise.h external_osl/src/include/OSL/oslnoise.h
--- OpenShadingLanguage-Release-1.9.9/src/include/OSL/oslnoise.h	2018-05-01 16:39:02 -0600
-+++ external_osl/src/include/OSL/oslnoise.h	2018-08-24 17:42:11 -0600
-@@ -762,7 +762,7 @@
- // packed into a float4. We assume T is float and VECTYPE is float4,
- // but it also works if T is Dual2<float> and VECTYPE is Dual2<float4>.
- template<typename T, typename VECTYPE>
-OIIO_FORCEINLINE T bilerp (VECTYPE abcd, T u, T v) {
-+OIIO_FORCEINLINE T bilerp (VECTYPE& abcd, T u, T v) {
-     VECTYPE xx = OIIO::lerp (abcd, OIIO::simd::shuffle<1,1,3,3>(abcd), u);
-     return OIIO::simd::extract<0>(OIIO::lerp (xx,OIIO::simd::shuffle<2>(xx), v));
- }
-diff -Naur OpenShadingLanguage-Release-1.9.9/src/liboslexec/llvm_util.cpp external_osl/src/liboslexec/llvm_util.cpp
--- OpenShadingLanguage-Release-1.9.9/src/liboslexec/llvm_util.cpp	2018-05-01 16:39:02 -0600
-+++ external_osl/src/liboslexec/llvm_util.cpp	2018-08-25 14:04:27 -0600
-@@ -140,7 +140,10 @@
- };
- 
- 
-
-+void LLVM_Util::Cleanup ()
-+{
-+       jitmm_hold.clear();
-+}
- 
- size_t
- LLVM_Util::total_jit_memory_held ()
+ // Symbol export defines
--- a/build_files/build_environment/patches/osl_simd_oiio.diff
+++ b/build_files/build_environment/patches/osl_simd_oiio.diff
@@ -0,0 +1,14 @@
+--- CMakeLists.txt	2016-10-31 16:48:19 -0600
+++ CMakeLists.txt	2017-04-10 10:38:48 -0600
+@@ -269,6 +269,11 @@
+     add_definitions ("-DOIIO_STATIC_BUILD=1")
+ endif ()
+ 
+set (OIIO_NOSIMD OFF CACHE BOOL "Disable simd support in oiio")
+if (OIIO_NOSIMD)
+    add_definitions ("-DOIIO_NO_SSE=1")
+endif ()
+
+ if (OSL_NO_DEFAULT_TEXTURESYSTEM)
+     add_definitions ("-DOSL_NO_DEFAULT_TEXTURESYSTEM=1")
+ endif ()
--- a/build_files/build_environment/patches/pyshell.diff
+++ b/build_files/build_environment/patches/pyshell.diff
@@ -0,0 +1,12 @@
+--- pyshellext.cpp.orig	2017-01-17 00:57:53 -0700
+++ pyshellext.cpp	2017-05-20 15:21:51 -0600
+@@ -13,6 +13,9 @@
+ #include <strsafe.h>
+ 
+ #include "pyshellext_h.h"
+#if _MSC_VER < 1900
+#include "pyshellext_i.c"
+#endif 
+ 
+ #define DDWM_UPDATEWINDOW (WM_USER+3)
+ 
--- a/build_files/build_environment/patches/python.diff
+++ b/build_files/build_environment/patches/python.diff
@@ -0,0 +1,82 @@
+--- Include/Python.h	2017-07-07 21:33:27 -0600
+++ Include/Python.h	2017-09-19 10:36:10 -0600
+@@ -2,6 +2,10 @@
+ #define Py_PYTHON_H
+ /* Since this is a "meta-include" file, no #ifdef __cplusplus / extern "C" { */
+ 
+#if _MSC_VER < 1900
+#define inline __inline
+#endif
+
+ /* Include nearly all Python header files */
+ 
+ #include "patchlevel.h"
+--- Include/pydtrace.h	2017-07-07 21:33:27 -0600
+++ Include/pydtrace.h	2017-09-19 10:32:31 -0600
+@@ -2,6 +2,11 @@
+ 
+ #ifndef Py_DTRACE_H
+ #define Py_DTRACE_H
+
+#if _MSC_VER < 1900
+#define inline __inline
+#endif
+
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+
+--- Modules/_blake2/impl/blake2.h	2017-07-07 21:33:27 -0600
+++ Modules/_blake2/impl/blake2.h	2017-09-19 10:22:41 -0600
+@@ -19,6 +19,10 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ 
+#if _MSC_VER < 1900
+#define inline __inline 
+#endif
+
+ #ifdef BLAKE2_NO_INLINE
+ #define BLAKE2_LOCAL_INLINE(type) static type
+ #endif
+
+--- pcbuild/build.bat   2016-05-21 09:53:55 -0600
+++ pcbuild/build.bat   2016-05-21 09:56:16 -0600
+@@ -59,6 +59,7 @@
+ if "%~1"=="-h" goto Usage
+ if "%~1"=="-c" (set conf=%2) & shift & shift & goto CheckOpts
+ if "%~1"=="-p" (set platf=%2) & shift & shift & goto CheckOpts
+if "%~1"=="-k" (set vs_toolset=%2) & shift & shift & goto CheckOpts
+ if "%~1"=="-r" (set target=Rebuild) & shift & goto CheckOpts
+ if "%~1"=="-t" (set target=%2) & shift & shift & goto CheckOpts
+ if "%~1"=="-d" (set conf=Debug) & shift & goto CheckOpts
+@@ -120,7 +120,7 @@
+
+ :Kill
+ echo on
+-%MSBUILD% "%dir%\pythoncore.vcxproj" /t:KillPython %verbose%^
+%MSBUILD% "%dir%\pythoncore.vcxproj" /t:KillPython %verbose% /p:PlatformToolset=%vs_toolset%^
+  /p:Configuration=%conf% /p:Platform=%platf%^
+  /p:KillPython=true
+
+@@ -130,7 +130,7 @@
+ rem batch is, shall we say, "lackluster"
+ echo on
+ %MSBUILD% "%dir%pcbuild.proj" /t:%target% %parallel% %verbose%^
+- /p:Configuration=%conf% /p:Platform=%platf%^
+ /p:Configuration=%conf% /p:Platform=%platf% /p:PlatformToolset=%vs_toolset%^
+  /p:IncludeExternals=%IncludeExternals%^
+  /p:IncludeSSL=%IncludeSSL% /p:IncludeTkinter=%IncludeTkinter%^
+  /p:UseTestMarker=%UseTestMarker%^
+
+--- pcbuild/sqlite3.vcxproj	2015-12-06 18:39:10 -0700
+++ pcbuild/sqlite3.vcxproj	2016-11-02 09:25:56 -0600
+@@ -43,7 +43,7 @@
+   <Import Project="python.props" />
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+   <PropertyGroup Label="Configuration">
+-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+     <CharacterSet>NotSet</CharacterSet>
+   </PropertyGroup>
+   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
--- a/build_files/build_environment/patches/python_apple.diff
+++ b/build_files/build_environment/patches/python_apple.diff
@@ -0,0 +1,25 @@
+--- pyconfig.h.in	2017-09-19 14:41:01.000000000 +0300
+++ pyconfig.h.in	2017-09-19 14:43:18.000000000 +0300
+@@ -119,12 +119,6 @@
+ /* Define to 1 if you have the `clock' function. */
+ #undef HAVE_CLOCK
+ 
+-/* Define to 1 if you have the `clock_getres' function. */
+-#undef HAVE_CLOCK_GETRES
+-
+-/* Define to 1 if you have the `clock_gettime' function. */
+-#undef HAVE_CLOCK_GETTIME
+-
+ /* Define to 1 if you have the `clock_settime' function. */
+ #undef HAVE_CLOCK_SETTIME
+ 
+@@ -369,9 +363,6 @@
+ /* Define this if you have flockfile(), getc_unlocked(), and funlockfile() */
+ #undef HAVE_GETC_UNLOCKED
+ 
+-/* Define to 1 if you have the `getentropy' function. */
+-#undef HAVE_GETENTROPY
+-
+ /* Define to 1 if you have the `getgrouplist' function. */
+ #undef HAVE_GETGROUPLIST
+ 
--- a/build_files/build_environment/patches/python_linux.diff
+++ b/build_files/build_environment/patches/python_linux.diff
@@ -1,38 +0,0 @@
-diff --git a/setup.py.orig b/setup.py
-index a97a755..07ce853 100644
--- a/setup.py.orig
-+++ b/setup.py
-@@ -1422,13 +1422,13 @@ class PyBuildExt(build_ext):
-                         version = line.split()[2]
-                         break
-             if version >= version_req:
-                if (self.compiler.find_library_file(lib_dirs, 'z')):
-+                if (self.compiler.find_library_file(lib_dirs, 'z_pic')):
-                     if host_platform == "darwin":
-                         zlib_extra_link_args = ('-Wl,-search_paths_first',)
-                     else:
-                         zlib_extra_link_args = ()
-                     exts.append( Extension('zlib', ['zlibmodule.c'],
-                                           libraries = ['z'],
-+                                           libraries = ['z_pic'],
-                                            extra_link_args = zlib_extra_link_args))
-                     have_zlib = True
-                 else:
-@@ -1442,7 +1442,7 @@ class PyBuildExt(build_ext):
-         # crc32 if we have it.  Otherwise binascii uses its own.
-         if have_zlib:
-             extra_compile_args = ['-DUSE_ZLIB_CRC32']
-            libraries = ['z']
-+            libraries = ['z_pic']
-             extra_link_args = zlib_extra_link_args
-         else:
-             extra_compile_args = []
-@@ -1991,7 +1991,7 @@ class PyBuildExt(build_ext):
-                 print('Header file {} does not exist'.format(ffi_h))
-         ffi_lib = None
-         if ffi_inc is not None:
-            for lib_name in ('ffi', 'ffi_pic'):
-+            for lib_name in ('ffi_pic', ):
-                 if (self.compiler.find_library_file(lib_dirs, lib_name)):
-                     ffi_lib = lib_name
-                     break
--- a/build_files/build_environment/patches/python_runtime_vc2013.diff
+++ b/build_files/build_environment/patches/python_runtime_vc2013.diff
@@ -0,0 +1,29 @@
+--- _msvccompiler.py.orig	2017-05-20 19:31:45 -0600
+++ _msvccompiler.py	2017-06-10 10:05:38 -0600
+@@ -222,9 +222,9 @@
+         # use /MT[d] to build statically, then switch from libucrt[d].lib to ucrt[d].lib
+         # later to dynamically link to ucrtbase but not vcruntime.
+         self.compile_options = [
+-            '/nologo', '/Ox', '/W3', '/GL', '/DNDEBUG'
+            '/nologo', '/Ox', '/W3', '/GL', '/DNDEBUG' , '/MD'
+         ]
+-        self.compile_options.append('/MD' if self._vcruntime_redist else '/MT')
+        #self.compile_options.append('/MD' if self._vcruntime_redist else '/MT')
+ 
+         self.compile_options_debug = [
+             '/nologo', '/Od', '/MDd', '/Zi', '/W3', '/D_DEBUG'
+@@ -233,11 +233,11 @@
+         ldflags = [
+             '/nologo', '/INCREMENTAL:NO', '/LTCG'
+         ]
+-        if not self._vcruntime_redist:
+-            ldflags.extend(('/nodefaultlib:libucrt.lib', 'ucrt.lib'))
+        #if not self._vcruntime_redist:
+        #    ldflags.extend(('/nodefaultlib:libucrt.lib', 'ucrt.lib'))
+ 
+         ldflags_debug = [
+-            '/nologo', '/INCREMENTAL:NO', '/LTCG', '/DEBUG:FULL'
+            '/nologo', '/INCREMENTAL:NO', '/LTCG'
+         ]
+ 
+         self.ldflags_exe = [*ldflags, '/MANIFEST:EMBED,ID=1']
--- a/build_files/build_environment/patches/schroedinger.diff
+++ b/build_files/build_environment/patches/schroedinger.diff
@@ -0,0 +1,54 @@
+--- configure.orig	2012-01-22 19:06:43 -0700
+++ configure	2016-04-06 20:00:50 -0600
+@@ -16492,10 +16492,10 @@
+ 	HAVE_ORC=yes
+ fi
+ if test "x${HAVE_ORC}" != xyes ; then
+-  as_fn_error $? "orc-0.4 >= $ORC_VER is required" "$LINENO" 5
+  $as_echo "orc-0.4 >= $ORC_VER is required" 
+ fi
+ SCHRO_PKG_DEPS="$SCHRO_PKG_DEPS orc-0.4 >= $ORC_VER"
+-ORCC=`$PKG_CONFIG --variable=orcc orc-0.4`
+#ORCC=`$PKG_CONFIG --variable=orcc orc-0.4`
+ 
+  if test "x$cross_compiling" != xyes; then
+   HAVE_ORCC_TRUE=
+--- Makefile.in	2012-01-22 18:06:42 -0700
+++ Makefile.in	2016-04-06 20:30:09 -0600
+@@ -291,7 +291,7 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ AUTOMAKE_OPTIONS = foreign
+-SUBDIRS = schroedinger doc tools testsuite
+SUBDIRS = schroedinger doc tools 
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+ DIST_SUBDIRS = schroedinger doc tools testsuite
+ EXTRA_DIST = COPYING COPYING.GPL COPYING.LGPL COPYING.MIT COPYING.MPL \
+
+--- schroedinger.pc.in  2011-03-21 17:08:39 -0600
+++ schroedinger.pc.in  2016-04-08 13:30:42 -0600
+@@ -7,9 +7,9 @@
+
+ Name: schroedinger-@SCHRO_MAJORMINOR@
+ Description: Dirac codec library
+-Requires.private: @SCHRO_PKG_DEPS@
+Requires: @SCHRO_PKG_DEPS@
+ Version: @VERSION@
+-Libs: -L${libdir} -lschroedinger-@SCHRO_MAJORMINOR@
+Libs: -L${libdir} -lschroedinger-@SCHRO_MAJORMINOR@ -lorc-0.4
+ Libs.private: @PTHREAD_LIBS@ @LIBM@
+ Cflags: -I${includedir}
+ 
+--- ./schroedinger/schrodecoder.c	2012-01-23 00:38:57.000000000 +0100
+++ ./schroedinger/schrodecoder.c	2016-05-15 06:07:24.000000000 +0200
+@@ -70,8 +70,8 @@
+ };
+ 
+ 
+-int _schro_decode_prediction_only;
+-int _schro_telemetry;
+int _schro_decode_prediction_only = 0;
+int _schro_telemetry = 0;
+ 
+ static void schro_decoder_x_decode_motion (SchroAsyncStage * stage);
+ static void schro_decoder_x_render_motion (SchroAsyncStage * stage);
--- a/build_files/build_environment/patches/sdl.diff
+++ b/build_files/build_environment/patches/sdl.diff
@@ -1,4 +1,33 @@
-diff -ru ./src/video/SDL_video.c ./src/video/SDL_video.c
+diff -ru /Users/brecht/dev/lib/deps/Downloads/SDL2-2.0.4/src/video/SDL_video.c ./src/video/SDL_video.c
+--- /Users/brecht/dev/lib/deps/Downloads/SDL2-2.0.4/src/video/SDL_video.c	2016-01-02 20:56:31.000000000 +0100
+++ ./src/video/SDL_video.c	2016-05-15 02:58:27.000000000 +0200
+@@ -137,7 +137,7 @@
+ 
+ #define FULLSCREEN_MASK (SDL_WINDOW_FULLSCREEN_DESKTOP | SDL_WINDOW_FULLSCREEN)
+ 
+-#ifdef __MACOSX__
+#if SDL_VIDEO_DRIVER_COCOA
+ /* Support for Mac OS X fullscreen spaces */
+ extern SDL_bool Cocoa_IsWindowInFullscreenSpace(SDL_Window * window);
+ extern SDL_bool Cocoa_SetWindowFullscreenSpace(SDL_Window * window, SDL_bool state);
+@@ -1141,7 +1141,7 @@
+     if ( window->is_hiding && fullscreen )
+         return 0;
+ 
+-#ifdef __MACOSX__
+#if SDL_VIDEO_DRIVER_COCOA
+     /* if the window is going away and no resolution change is necessary,
+      do nothing, or else we may trigger an ugly double-transition
+      */
+@@ -2365,7 +2365,7 @@
+         return SDL_FALSE;
+     }
+ 
+-#ifdef __MACOSX__
+#if SDL_VIDEO_DRIVER_COCOA
+     if (Cocoa_IsWindowInFullscreenSpace(window)) {
+         return SDL_FALSE;
+     }
 --- CMakeLists.txt.old	2016-01-02 12:56:31 -0700
 +++ CMakeLists.txt	2016-10-03 11:24:24 -0600
@@ -609,7 +609,7 @@
@@ -10,23 +39,12 @@ diff -ru ./src/video/SDL_video.c ./src/video/SDL_video.c
     if(HAVE_LIBICONV)
       list(APPEND EXTRA_LIBS iconv)
       set(HAVE_ICONV 1)
--- src/video/SDL_video.c	2018-09-10 23:27:57.000000000 +0200
-+++ src/video/SDL_video.c	2018-09-10 23:28:09.000000000 +0200
-@@ -1176,7 +1176,7 @@
-         return 0;
-     }
+@@ -1455,7 +1455,7 @@
+ set(_INSTALL_LIBS "SDL2main")
 
-#ifdef __MACOSX__
-+#if defined(__MACOSX__) && SDL_VIDEO_DRIVER_COCOA
-     /* if the window is going away and no resolution change is necessary,
-        do nothing, or else we may trigger an ugly double-transition
-      */
-@@ -2563,7 +2563,7 @@
-         return SDL_FALSE;
-     }
- 
-#ifdef __MACOSX__
-+#if defined(__MACOSX__) && SDL_VIDEO_DRIVER_COCOA
-     if (SDL_strcmp(_this->name, "cocoa") == 0) {  /* don't do this for X11, etc */
-         if (Cocoa_IsWindowInFullscreenSpace(window)) {
-             return SDL_FALSE;
+ if(SDL_SHARED)
+-  add_library(SDL2 SHARED ${SOURCE_FILES})
+  add_library(SDL2 SHARED ${SOURCE_FILES} ${VERSION_SOURCES})
+   if(UNIX)
+     set_target_properties(SDL2 PROPERTIES
+       VERSION ${LT_VERSION}
--- a/build_files/build_environment/patches/tinyxml.diff
+++ b/build_files/build_environment/patches/tinyxml.diff
@@ -1,34 +0,0 @@
-diff -Naur tinyxml.orig/CMakeLists.txt tinyxml/CMakeLists.txt
--- tinyxml.orig/CMakeLists.txt	1969-12-31 16:00:00.000000000 -0800
-+++ tinyxml/CMakeLists.txt	2013-06-18 17:10:59.000000000 -0700
-@@ -0,0 +1,30 @@
-+project(tinyxml)
-+
-+cmake_minimum_required(VERSION 2.8)
-+
-+add_library(tinyxml
-+    STATIC
-+    tinystr.cpp
-+    tinyxml.cpp
-+    tinyxmlerror.cpp
-+    tinyxmlparser.cpp)
-+
-+set(TINYXML_COMPILE_FLAGS "-DTIXML_USE_STL")
-+
-+if(UNIX)
-+    set(TINYXML_COMPILE_FLAGS "${TINYXML_COMPILE_FLAGS} -fPIC -fvisibility=hidden")
-+endif()
-+
-+if(OCIO_INLINES_HIDDEN AND UNIX)
-+    set(TINYXML_COMPILE_FLAGS "${TINYXML_COMPILE_FLAGS} -fvisibility-inlines-hidden")
-+endif()
-+
-+set_target_properties(tinyxml PROPERTIES
-+    COMPILE_FLAGS "${TINYXML_COMPILE_FLAGS}")
-+
-+install(TARGETS
-+    tinyxml
-+    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
-+install(FILES
-+    tinyxml.h tinystr.h
-+    DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
--- a/build_files/build_environment/patches/x264.diff
+++ b/build_files/build_environment/patches/x264.diff
@@ -1,22 +0,0 @@
--- x264-snapshot-20180811-2245-stable\configure	2018-08-11 14:45:05 -0600
-+++ external_x264\configure	2018-08-11 23:51:35 -0600
-@@ -396,7 +396,7 @@
- # list of all preprocessor HAVE values we can define
- CONFIG_HAVE="MALLOC_H ALTIVEC ALTIVEC_H MMX ARMV6 ARMV6T2 NEON BEOSTHREAD POSIXTHREAD WIN32THREAD THREAD LOG2F SWSCALE \
-              LAVF FFMS GPAC AVS GPL VECTOREXT INTERLACED CPU_COUNT OPENCL THP LSMASH X86_INLINE_ASM AS_FUNC INTEL_DISPATCHER \
-             MSA MMAP WINRT VSX ARM_INLINE_ASM STRTOK_R BITDEPTH8 BITDEPTH10"
-+             MSA MMAP WINRT VSX ARM_INLINE_ASM BITDEPTH8 BITDEPTH10"
- 
- # parse options
- 
-@@ -1071,10 +1071,6 @@
-     define HAVE_LOG2F
- fi
- 
-if cc_check 'string.h' '' 'strtok_r(0, 0, 0);' ; then
-    define HAVE_STRTOK_R
-fi
-
- if [ "$SYS" != "WINDOWS" ] && cpp_check "sys/mman.h unistd.h" "" "defined(MAP_PRIVATE)"; then
-     define HAVE_MMAP
- fi
--- a/build_files/build_environment/windows/build_deps.cmd
+++ b/build_files/build_environment/windows/build_deps.cmd
@@ -14,18 +14,10 @@ if NOT "%1" == "" (
    set BuildDir=VS14
    goto par2
  )
-	if "%1" == "2017" (
-    echo "Building for VS2017"
-    set VSVER=15.0
-    set VSVER_SHORT=15
-    set BuildDir=VS15
-    goto par2
-  )
-  
 )
 :usage

-Echo Usage build_deps 2013/2015/2017 x64/x86
+Echo Usage build_deps 2013/2015 x64/x86
 goto exit
 :par2
 if NOT "%2" == "" (
@@ -39,10 +31,6 @@ if NOT "%2" == "" (
 		if "%1" == "2015" (
 			set CMAKE_BUILDER=Visual Studio 14 2015
 		)
-		if "%1" == "2017" (
-			set CMAKE_BUILDER=Visual Studio 15 2017
-		)
-		
    goto start
  )
 	if "%2" == "x64" (
@@ -55,10 +43,6 @@ if NOT "%2" == "" (
 		if "%1" == "2015" (
 			set CMAKE_BUILDER=Visual Studio 14 2015 Win64
 		)
-		if "%1" == "2017" (
-			set CMAKE_BUILDER=Visual Studio 15 2017 Win64
-		)
-		
    goto start
  )
 )
--- a/build_files/buildbot/config/blender_linux.cmake
+++ b/build_files/buildbot/config/blender_linux.cmake
@@ -1,21 +1,11 @@
 # ######## Global feature set settings ########

-include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_release.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_full.cmake")

 # Detect which libc we'll be linking against.
 # Some of the paths will depend on this

-if(EXISTS "/lib/x86_64-linux-gnu/libc-2.24.so")
-	message(STATUS "Building in GLibc-2.24 environment")
-	set(GLIBC "2.24")
-	set(MULTILIB "/x86_64-linux-gnu")
-	set(LIBDIR_NAME "linux_x86_64")
-elseif(EXISTS "/lib/i386-linux-gnu//libc-2.24.so")
-	message(STATUS "Building in GLibc-2.24 environment")
-	set(GLIBC "2.24")
-	set(MULTILIB "/i386-linux-gnu")
-	set(LIBDIR_NAME "linux_i686")
-elseif(EXISTS "/lib/x86_64-linux-gnu/libc-2.19.so")
+if(EXISTS "/lib/x86_64-linux-gnu/libc-2.19.so")
 	message(STATUS "Building in GLibc-2.19 environment")
 	set(GLIBC "2.19")
 	set(MULTILIB "/x86_64-linux-gnu")
@@ -50,10 +40,7 @@ set(WITH_PYTHON_INSTALL_NUMPY    ON CACHE BOOL "" FORCE)
 set(WITH_PYTHON_INSTALL_REQUESTS ON CACHE BOOL "" FORCE)

 # ######## Release environment specific settings ########
-
-if (NOT ${GLIBC} STREQUAL "2.24")
-
-# All the hardcoded library paths and such
+# All the hardcoded libraru paths and such

 # LLVM libraries
 set(LLVM_VERSION             "3.4"  CACHE STRING "" FORCE)
@@ -160,24 +147,5 @@ set(BLOSC_LIBRARY
 	CACHE BOOL "" FORCE
 )

-else()
-
-set(LIBDIR "/opt/blender-deps/${LIBDIR_NAME}" CACHE BOOL "" FORCE)
-
-# TODO(sergey): Remove once Python is oficially bumped to 3.7.
-set(PYTHON_VERSION    3.7 CACHE BOOL "" FORCE)
-
-# Platform specific configuration, to ensure static linking against everything.
-
-set(Boost_USE_STATIC_LIBS    ON CACHE BOOL "" FORCE)
-
-# We need to link OpenCOLLADA against PCRE library. Even though it is not installed
-# on /usr, we do not really care -- all we care is PCRE_FOUND be TRUE and its
-# library pointing to a valid one.
-set(PCRE_INCLUDE_DIR          "/usr/include"                        CACHE STRING "" FORCE)
-set(PCRE_LIBRARY              "${LIBDIR}/opencollada/lib/libpcre.a" CACHE STRING "" FORCE)
-
-endif()
-
 # Additional linking libraries
-set(CMAKE_EXE_LINKER_FLAGS   "-lrt -static-libstdc++ -no-pie"  CACHE STRING "" FORCE)
+set(CMAKE_EXE_LINKER_FLAGS   "-lrt -static-libstdc++"  CACHE STRING "" FORCE)
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -48,7 +48,7 @@ if 'cmake' in builder:
    # cmake

    # Some fine-tuning configuration
-    blender_dir = os.path.abspath(blender_dir)
+    blender_dir = os.path.join('..', blender_dir)
    build_dir = os.path.abspath(os.path.join('..', 'build', builder))
    install_dir = os.path.abspath(os.path.join('..', 'install', builder))
    targets = ['blender']
@@ -59,7 +59,7 @@ if 'cmake' in builder:
    bits = 64

    # Config file to be used (relative to blender's sources root)
-    cmake_config_file = "build_files/cmake/config/blender_release.cmake"
+    cmake_config_file = "build_files/cmake/config/blender_full.cmake"
    cmake_cuda_config_file = None

    # Set build options.
@@ -77,13 +77,7 @@ if 'cmake' in builder:
        # cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/nvcc')

    elif builder.startswith('win'):
-        if builder.endswith('_vs2017'):
-            if builder.startswith('win64'):
-                cmake_options.extend(['-G', 'Visual Studio 15 2017 Win64'])
-            elif builder.startswith('win32'):
-                bits = 32
-                cmake_options.extend(['-G', 'Visual Studio 15 2017'])
-        elif builder.endswith('_vc2015'):
+        if builder.endswith('_vc2015'):
            if builder.startswith('win64'):
                cmake_options.extend(['-G', 'Visual Studio 14 2015 Win64'])
            elif builder.startswith('win32'):
@@ -101,9 +95,7 @@ if 'cmake' in builder:
    elif builder.startswith('linux'):
        tokens = builder.split("_")
        glibc = tokens[1]
-        if glibc == 'glibc224':
-            deb_name = "stretch"
-        elif glibc == 'glibc219':
+        if glibc == 'glibc219':
            deb_name = "jessie"
        elif glibc == 'glibc211':
            deb_name = "squeeze"
@@ -115,9 +107,8 @@ if 'cmake' in builder:
            bits = 32
            chroot_name = 'buildbot_' + deb_name + '_i686'
            targets = ['blender']
-        if deb_name != "stretch":
-            cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-7",
-                                        "-DCMAKE_CXX_COMPILER=/usr/bin/g++-7"])
+        cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-7",
+                                    "-DCMAKE_CXX_COMPILER=/usr/bin/g++-7"])

    cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file))

@@ -160,6 +151,10 @@ if 'cmake' in builder:
        if target != 'blender':
            target_build_dir += '_' + target
        target_name = 'install'
+        # Make sure build directory exists and enter it
+        if not os.path.isdir(target_build_dir):
+            os.mkdir(target_build_dir)
+        os.chdir(target_build_dir)
        # Tweaking CMake options to respect the target
        target_cmake_options = cmake_options[:]
        if target == 'cuda':
@@ -170,19 +165,6 @@ if 'cmake' in builder:
        # other targets don't compile cuda binaries.
        if 'cuda' in targets and target != 'cuda':
            target_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=OFF")
-        # Do extra git fetch because not all platform/git/buildbot combinations
-        # update the origin remote, causing buildinfo to detect local changes.
-        os.chdir(blender_dir)
-        print("Fetching remotes")
-        command = ['git', 'fetch', '--all']
-        print(command)
-        retcode = subprocess.call(target_chroot_prefix + command)
-        if retcode != 0:
-            sys.exit(retcode)
-        # Make sure build directory exists and enter it
-        if not os.path.isdir(target_build_dir):
-            os.mkdir(target_build_dir)
-        os.chdir(target_build_dir)
        # Configure the build
        print("CMake options:")
        print(target_cmake_options)
@@ -197,11 +179,11 @@ if 'cmake' in builder:
        if 'win32' in builder or 'win64' in builder:
            command = ['cmake', '--build', '.', '--target', target_name, '--config', 'Release']
        else:
-            command = ['make', '-s', '-j2', target_name]
+            command = target_chroot_prefix + ['make', '-s', '-j2', target_name]

        print("Executing command:")
        print(command)
-        retcode = subprocess.call(target_chroot_prefix + command)
+        retcode = subprocess.call(command)

        if retcode != 0:
            sys.exit(retcode)
--- a/build_files/cmake/Modules/FindAlembic.cmake
+++ b/build_files/cmake/Modules/FindAlembic.cmake
@@ -51,7 +51,7 @@ FIND_LIBRARY(ALEMBIC_LIBRARY
    lib64 lib lib/static
 )

-# handle the QUIETLY and REQUIRED arguments and set ALEMBIC_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set ALEMBIC_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALEMBIC DEFAULT_MSG ALEMBIC_LIBRARY ALEMBIC_INCLUDE_DIR)
--- a/build_files/cmake/Modules/FindEigen3.cmake
+++ b/build_files/cmake/Modules/FindEigen3.cmake
@@ -40,7 +40,7 @@ FIND_PATH(EIGEN3_INCLUDE_DIR
    include/eigen3
 )

-# handle the QUIETLY and REQUIRED arguments and set EIGEN3_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set EIGEN3_FOUND to TRUE if 
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Eigen3 DEFAULT_MSG
--- a/Show More
+++ b/Show More