Merge branch '28' into custom-manipulators

2017-10-09 20:49:27 +11:00 · 2017-06-26 19:38:40 +10:00 · 2017-06-26 15:47:40 +10:00 · 2017-06-26 15:45:11 +10:00 · 2017-06-26 15:10:59 +10:00 · 2017-06-26 14:18:46 +10:00
9028 changed files with 1883601 additions and 1563414 deletions
--- a/.arcconfig
+++ b/.arcconfig
@@ -1,7 +1,6 @@
 {
 	"project_id" : "Blender",
 	"conduit_uri" : "https://developer.blender.org/",
-	"git.default-relative-commit" : "origin/master",
+	"git.default-relative-commit" : "origin/blender2.8",
-	"arc.land.update.default" : "rebase",
+	"arc.land.update.default" : "rebase"
 	"arc.land.onto.default" : "master"
 }
--- a/.clang-format
+++ b/.clang-format
@@ -1,248 +0,0 @@
 # Configuration of clang-format
 # =============================
 #
 # Tested to work with versions: 6 to 8.
 # This causes parameters on continuations to align to the opening brace.
 #
 #   like_this_long_name(parameter_one,
 #                       parameter_two,
 #                       parameter_three);
 #
 AlignAfterOpenBracket: 'Align'
 # Disallow short functions on one line; break them up.
 AllowShortBlocksOnASingleLine: false
 # These two settings trigger stacking of parameters in most cases; this is
 # easier to read and also makes diffs easier to read (since an added or removed
 # parameter is obvious). For example, function calls will look like this:
 #
 #   like_this_long_name(parameter_one,
 #                       parameter_two,
 #                       parameter_three,
 #                       parameter_four,
 #                       parameter_five,
 #                       parameter_six);
 #
 # Instead of:
 #
 #   like_this_long_name(parameter_one, parameter_two, parameter_three, parameter_four,
 #                       parameter_five, parameter_six);
 #
 BinPackArguments: false
 BinPackParameters: false
 # Line width (don't exceed 100).
 ColumnLimit: 99
 # Cause initializer lists to have one member initialized per line, in the case
 # that all initializers can't fit on a single line.
 ConstructorInitializerAllOnOneLineOrOnePerLine: true
 # Indent the : after a constructor. For example:
 #
 #   explicit foo_class ()
 #       : member1_(5)
 #   {
 #   }
 #
 ConstructorInitializerIndentWidth: 4
 # Make access modifier slightly more visible.
 AccessModifierOffset: -1
 # This will unfortunately use spaces in some cases where it's not desired (like
 # function calls) but the overall result is better since it will allow
 # alignment to work properly with different tab width settings.
 ContinuationIndentWidth: 4
 # This tries to match Blender's style as much as possible. One
 BreakBeforeBraces: Custom
 BraceWrapping: {
    AfterClass: 'false'
    AfterControlStatement: 'false'
    AfterEnum : 'false'
    AfterFunction : 'true'
    AfterNamespace : 'false'
    AfterStruct : 'false'
    AfterUnion : 'false'
    BeforeCatch : 'true'
    BeforeElse : 'true'
    IndentBraces : 'false'
    AfterObjCDeclaration: 'true'
 }
 # For switch statements, indent the cases.
 IndentCaseLabels: true
 # Indent after the hash inside preprocessor directives
 IndentPPDirectives: AfterHash
 BreakBeforeTernaryOperators: false
 SpaceAfterTemplateKeyword: false
 # Handy comment at the end of each C++ name space.
 FixNamespaceComments: true
 # Use "if (...)" instead of "if(...)", but have function calls like foo().
 SpaceBeforeParens: ControlStatements
 SpaceInEmptyParentheses: false
 # Use two spaces before trailing comments, for example
 #
 #   foo = bar;  // comment
 #
 # Note that this doesn't work for C-style comments.
 SpacesBeforeTrailingComments: 2
 # Reflow comments, developers must disable formatting as with code to override this.
 ReflowComments: true
 # Never use tabs for indentation.
 # Note: TabWidth and IndentWidth must be the same, or strange things happen.
 UseTab: Never
 TabWidth: 2
 IndentWidth: 2
 # Add a big penalty on breaking after the return type of functions. For example,
 #
 #   static void foo(...)
 #
 # Instead of:
 #
 #   static void
 #   foo(very long content here that maybe could be stacked)
 #
 PenaltyReturnTypeOnItsOwnLine: 10000
 # Avoid having function calls broken onto a new line:
 #
 #   int a = foo(
 #       long, list, of, many, params);
 #
 # Instead of:
 #
 #   int a =
 #       foo(long, list, of, many, params);
 #
 PenaltyBreakAssignment: 100
 AllowShortFunctionsOnASingleLine: None
 # Disable for now since it complicates initial migration tests,
 # TODO: look into enabling this in the future.
 SortIncludes: false
 # Don't right align escaped newlines to the right because we have a wide default
 AlignEscapedNewlines: DontAlign
 # Always break:
 #
 #   const char *foo =
 #       "multi"
 #       "line";
 #
 # Instead of:
 #
 #   const char *foo = "multi"
 #                     "line";
 #
 AlwaysBreakBeforeMultilineStrings: true
 # We don't want literal strings to break,
 # however clang-format seems to ignore this (sigh).
 PenaltyBreakString: 1000000
 # There are macros in Blender for custom for loops; tell Clang to treat them
 # like loops rather than an expression, and so put the { on the same line.
 #
 # To find these use multi-line regex search:
 # "^\s+[A-Z][A-Z0-9_]+\s*\([^\n]*\)\n\s*\{"
 ForEachMacros:
  - BEGIN_ANIMFILTER_SUBCHANNELS
  - BLI_FOREACH_SPARSE_RANGE
  - BLI_SMALLSTACK_ITER_BEGIN
  - BMO_ITER
  - BMO_ITER_INDEX
  - BMW_ITER
  - BM_FACES_OF_VERT_ITER_BEGIN
  - BM_ITER_BPY_BM_SEQ
  - BM_ITER_ELEM
  - BM_ITER_ELEM_INDEX
  - BM_ITER_MESH
  - BM_ITER_MESH_INDEX
  - BM_ITER_MESH_MUTABLE
  - BM_LOOPS_OF_VERT_ITER_BEGIN
  - BOOST_FOREACH
  - CTX_DATA_BEGIN
  - CTX_DATA_BEGIN_WITH_ID
  - DEG_OBJECT_ITER_BEGIN
  - DEG_OBJECT_ITER_FOR_RENDER_ENGINE_BEGIN
  - DRIVER_TARGETS_LOOPER_BEGIN
  - DRIVER_TARGETS_USED_LOOPER_BEGIN
  - FOREACH_BASE_IN_EDIT_MODE_BEGIN
  - FOREACH_BASE_IN_MODE_BEGIN
  - FOREACH_BEGIN
  - FOREACH_COLLECTION_BEGIN
  - FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN
  - FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_BEGIN
  - FOREACH_EDIT_OBJECT_BEGIN
  - FOREACH_MAIN_ID_BEGIN
  - FOREACH_MAIN_LISTBASE_BEGIN
  - FOREACH_MAIN_LISTBASE_ID_BEGIN
  - FOREACH_NODETREE_BEGIN
  - FOREACH_OBJECT_BEGIN
  - FOREACH_OBJECT_FLAG_BEGIN
  - FOREACH_OBJECT_IN_EDIT_MODE_BEGIN
  - FOREACH_OBJECT_IN_MODE_BEGIN
  - FOREACH_OBJECT_RENDERABLE_BEGIN
  - FOREACH_PCHAN_SELECTED_IN_OBJECT_BEGIN
  - FOREACH_PCHAN_VISIBLE_IN_OBJECT_BEGIN
  - FOREACH_SCENE_COLLECTION_BEGIN
  - FOREACH_SCENE_OBJECT_BEGIN
  - FOREACH_SELECTED_BASE_BEGIN
  - FOREACH_SELECTED_EDITABLE_OBJECT_BEGIN
  - FOREACH_SELECTED_OBJECT_BEGIN
  - FOREACH_TRANS_DATA_CONTAINER
  - FOREACH_VIEW_LAYER_TO_RENDER_BEGIN
  - FOREACH_VISIBLE_BASE_BEGIN
  - FOREACH_VISIBLE_OBJECT_BEGIN
  - GHASH_FOREACH_BEGIN
  - GHASH_ITER
  - GHASH_ITER_INDEX
  - GPU_SELECT_LOAD_IF_PICKSEL_LIST
  - GP_EDITABLE_STROKES_BEGIN
  - GSET_FOREACH_BEGIN
  - GSET_ITER
  - GSET_ITER_INDEX
  - ITER_BEGIN
  - ITER_PIXELS
  - ITER_SLOTS
  - LISTBASE_CIRCULAR_BACKWARD_BEGIN
  - LISTBASE_CIRCULAR_FORWARD_BEGIN
  - LISTBASE_FOREACH
  - LISTBASE_FOREACH_MUTABLE
  - MAN2D_ITER_AXES_BEGIN
  - MAN_ITER_AXES_BEGIN
  - NODE_INSTANCE_HASH_ITER
  - NODE_SOCKET_TYPES_BEGIN
  - NODE_TREE_TYPES_BEGIN
  - NODE_TYPES_BEGIN
  - PIXEL_LOOPER_BEGIN
  - PIXEL_LOOPER_BEGIN_CHANNELS
  - RNA_BEGIN
  - RNA_PROP_BEGIN
  - RNA_STRUCT_BEGIN
  - RNA_STRUCT_BEGIN_SKIP_RNA_TYPE
  - SEQP_BEGIN
  - SEQ_BEGIN
  - foreach
 # Use once we bump the minimum verison to version 8.
 # # Without this string literals that in-line 'STRINGIFY' behave strangely (a bug?).
 # StatementMacros:
 #   - PyObject_VAR_HEAD
 #   - STRINGIFY
--- 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 = space
 indent_size = 2
 max_line_length = 99
 # CMake & Text
 [*.{cmake,txt}]
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
 indent_size = 2
 max_line_length = 99
 # 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 = space
 indent_size = 2
 max_line_length = 99
 # reStructuredText
 [*.rst]
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 indent_style = space
 indent_size = 3
 max_line_length = 120
--- a/.gitignore
+++ b/.gitignore
@@ -11,10 +11,6 @@ __pycache__/
 *.swo
 *#
 # Indexes for emacs, vi & others
 TAGS
 tags
 # QtCreator
 CMakeLists.txt.user
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,20 +1,24 @@
 [submodule "release/scripts/addons"]
 	path = release/scripts/addons
 	url = ../blender-addons.git
-	branch = master
+	branch = blender2.8
 	ignore = all
 	branch = master
 [submodule "release/scripts/addons_contrib"]
 	path = release/scripts/addons_contrib
 	url = ../blender-addons-contrib.git
 	branch = master
 	ignore = all
 	branch = master
 [submodule "release/datafiles/locale"]
 	path = release/datafiles/locale
 	url = ../blender-translations.git
 	branch = master
 	ignore = all
 	branch = master
 [submodule "source/tools"]
 	path = source/tools
 	url = ../blender-dev-tools.git
 	branch = master
 	ignore = all
 	branch = master
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/275
+++ b/275
@@ -24,138 +24,11 @@
 #   ../build_linux_i386
 # This is for users who like to configure & build blender with a single command.
 define HELP_TEXT
 Convenience Targets
   Provided for building Blender, (multiple at once can be used).
   * debug:         Build a debug binary.
   * full:          Enable all supported dependencies & options.
   * lite:          Disable non essential features for a smaller binary and faster build.
   * headless:      Build without an interface (renderfarm or server automation).
   * cycles:        Build Cycles standalone only, without Blender.
   * bpy:           Build as a python module which can be loaded from python directly.
   * deps:          Build library dependencies (intended only for platform maintainers).
   * config:        Run cmake configuration tool to set build options.
   Note: passing the argument 'BUILD_DIR=path' when calling make will override the default build dir.
   Note: passing the argument 'BUILD_CMAKE_ARGS=args' lets you add cmake arguments.
 Project Files
   Generate poject files for development environments.
   * project_qtcreator:     QtCreator Project Files.
   * project_netbeans:      NetBeans Project Files.
   * project_eclipse:       Eclipse CDT4 Project Files.
 Package Targets
   * package_debian:    Build a debian package.
   * package_pacman:    Build an arch linux pacman package.
   * package_archive:	Build an archive package.
 Testing Targets
   Not associated with building Blender.
   * test:
     Run ctest, currently tests import/export,
     operator execution and that python modules load
   * test_cmake:
     Runs our own cmake file checker
     which detects errors in the cmake file list definitions
   * test_pep8:
     Checks all python script are pep8
     which are tagged to use the stricter formatting
   * test_deprecated:
     Checks for deprecation tags in our code which may need to be removed
   * test_style_c:
     Checks C/C++ conforms with blenders style guide:
     https://wiki.blender.org/wiki/Source/Code_Style
   * test_style_c_qtc:
     Same as test_style but outputs QtCreator tasks format
   * test_style_osl:
     Checks OpenShadingLanguage conforms with blenders style guide:
     https://wiki.blender.org/wiki/Source/Code_Style
   * test_style_osl_qtc:
     Checks OpenShadingLanguage conforms with blenders style guide:
     https://wiki.blender.org/wiki/Source/Code_Style
 Static Source Code Checking
   Not associated with building Blender.
   * check_cppcheck:        Run blender source through cppcheck (C & C++).
   * check_clang_array:     Run blender source through clang array checking script (C & C++).
   * check_splint:          Run blenders source through splint (C only).
   * check_sparse:          Run blenders source through sparse (C only).
   * check_smatch:          Run blenders source through smatch (C only).
   * check_spelling_c:      Check for spelling errors (C/C++ only).
   * check_spelling_c_qtc:  Same as check_spelling_c but outputs QtCreator tasks format.
   * check_spelling_osl:    Check for spelling errors (OSL only).
   * check_spelling_py:     Check for spelling errors (Python only).
   * check_descriptions:    Check for duplicate/invalid descriptions.
 Utilities
   Not associated with building Blender.
   * icons:
     Updates PNG icons from SVG files.
     Optionally pass in variables: 'BLENDER_BIN', 'INKSCAPE_BIN'
     otherwise default paths are used.
     Example
        make icons INKSCAPE_BIN=/path/to/inkscape
   * icons_geom:
     Updates Geometry icons from BLEND file.
     Optionally pass in variable: 'BLENDER_BIN'
     otherwise default paths are used.
     Example
        make icons_geom BLENDER_BIN=/path/to/blender
   * tgz:
     Create a compressed archive of the source code.
   * update:
     updates git and all submodules
   * format
     Format source code using clang (uses PATHS if passed in). For example::
        make format PATHS="source/blender/blenlib source/blender/blenkernel"
 Environment Variables
   * BUILD_CMAKE_ARGS:      Arguments passed to CMake.
   * BUILD_DIR:             Override default build path.
   * PYTHON:                Use this for the Python command (used for checking tools).
   * NPROCS:                Number of processes to use building (auto-detect when omitted).
 Documentation Targets
   Not associated with building Blender.
   * doc_py:        Generate sphinx python api docs.
   * doc_doxy:      Generate doxygen C/C++ docs.
   * doc_dna:       Generate blender file format reference.
   * doc_man:       Generate manpage.
 Information
   * help:              This help message.
   * help_features:     Show a list of optional features when building.
 endef
 # HELP_TEXT (end)
 # System Vars
 OS:=$(shell uname -s)
 OS_NCASE:=$(shell uname -s | tr '[A-Z]' '[a-z]')
-CPU:=$(shell uname -m)
+# CPU:=$(shell uname -m)  # UNUSED
 # Source and Build DIR's
@@ -172,19 +45,8 @@ endif
 # Dependencies DIR's
 DEPS_SOURCE_DIR:=$(BLENDER_DIR)/build_files/build_environment
-
+DEPS_BUILD_DIR:=$(BUILD_DIR)/deps
-ifndef DEPS_BUILD_DIR
+DEPS_INSTALL_DIR:=$(shell dirname "$(BLENDER_DIR)")/lib/$(OS_NCASE)
 	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)_$(CPU)
 	endif
 endif
 # Allow to use alternative binary (pypy3, etc)
 ifndef PYTHON
@@ -222,18 +84,6 @@ ifneq "$(findstring bpy, $(MAKECMDGOALS))" ""
 endif
 # -----------------------------------------------------------------------------
 # Blender binary path
 # Allow passing in own BLENDER_BIN so developers who don't
 # use the default build path can still use utility helpers.
 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
@@ -285,7 +135,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
@@ -325,9 +175,82 @@ config: .FORCE
 # -----------------------------------------------------------------------------
 # Help for build targets
 export HELP_TEXT
 help: .FORCE
-	@echo "$$HELP_TEXT"
+	@echo ""
 	@echo "Convenience targets provided for building blender, (multiple at once can be used)"
 	@echo "  * debug     - build a debug binary"
 	@echo "  * full      - enable all supported dependencies & options"
 	@echo "  * lite      - disable non essential features for a smaller binary and faster build"
 	@echo "  * headless  - build without an interface (renderfarm or server automation)"
 	@echo "  * cycles    - build Cycles standalone only, without Blender"
 	@echo "  * bpy       - build as a python module which can be loaded from python directly"
 	@echo "  * deps      - build library dependencies (intended only for platform maintainers)"
 	@echo ""
 	@echo "  * config    - run cmake configuration tool to set build options"
 	@echo ""
 	@echo "  Note, passing the argument 'BUILD_DIR=path' when calling make will override the default build dir."
 	@echo "  Note, passing the argument 'BUILD_CMAKE_ARGS=args' lets you add cmake arguments."
 	@echo ""
 	@echo ""
 	@echo "Project Files for IDE's"
 	@echo "  * project_qtcreator - QtCreator Project Files"
 	@echo "  * project_netbeans  - NetBeans Project Files"
 	@echo "  * project_eclipse   - Eclipse CDT4 Project Files"
 	@echo ""
 	@echo "Package Targets"
 	@echo "  * package_debian  - build a debian package"
 	@echo "  * package_pacman  - build an arch linux pacman package"
 	@echo "  * package_archive - build an archive package"
 	@echo ""
 	@echo "Testing Targets (not associated with building blender)"
 	@echo "  * test               - run ctest, currently tests import/export,"
 	@echo "                         operator execution and that python modules load"
 	@echo "  * test_cmake         - runs our own cmake file checker"
 	@echo "                         which detects errors in the cmake file list definitions"
 	@echo "  * test_pep8          - checks all python script are pep8"
 	@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 "                         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 "                         http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
 	@echo "  * test_style_osl_qtc - checks OpenShadingLanguage conforms with blenders style guide:"
 	@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++)"
 	@echo "  * check_clang_array    - run blender source through clang array checking script (C & C++)"
 	@echo "  * check_splint         - run blenders source through splint (C only)"
 	@echo "  * check_sparse         - run blenders source through sparse (C only)"
 	@echo "  * check_smatch         - run blenders source through smatch (C only)"
 	@echo "  * check_spelling_c     - check for spelling errors (C/C++ only)"
 	@echo "  * check_spelling_c_qtc - same as check_spelling_c but outputs QtCreator tasks format"
 	@echo "  * check_spelling_osl   - check for spelling errors (OSL only)"
 	@echo "  * check_spelling_py    - check for spelling errors (Python only)"
 	@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 "  * tgz      - create a compressed archive of the source code."
 	@echo "  * update   - updates git and all submodules"
 	@echo ""
 	@echo "Environment Variables"
 	@echo "  * BUILD_CMAKE_ARGS    - arguments passed to CMake."
 	@echo "  * BUILD_DIR           - override default build path."
 	@echo "  * PYTHON              - use this for the Python command (used for checking tools)."
 	@echo "  * NPROCS              - number of processes to use building (auto-detect when omitted)."
 	@echo ""
 	@echo "Documentation Targets (not associated with building blender)"
 	@echo "  * doc_py   - generate sphinx python api docs"
 	@echo "  * doc_doxy - generate doxygen C/C++ docs"
 	@echo "  * doc_dna  - generate blender file format reference"
 	@echo "  * doc_man  - generate manpage"
 	@echo ""
 	@echo "Information"
 	@echo "  * help          - this help message"
 	@echo "  * help_features - show a list of optional features when building"
 	@echo ""
 # -----------------------------------------------------------------------------
 # Packages
@@ -408,7 +331,7 @@ test_style_osl_qtc: .FORCE
 #
 project_qtcreator: .FORCE
-	$(PYTHON) build_files/cmake/cmake_qtcreator_project.py --build-dir "$(BUILD_DIR)"
+	$(PYTHON) build_files/cmake/cmake_qtcreator_project.py "$(BUILD_DIR)"
 project_netbeans: .FORCE
 	$(PYTHON) build_files/cmake/cmake_netbeans_project.py "$(BUILD_DIR)"
@@ -481,7 +404,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"
 # -----------------------------------------------------------------------------
@@ -491,19 +414,12 @@ check_descriptions: .FORCE
 tgz: .FORCE
 	./build_files/utils/build_tgz.sh
 INKSCAPE_BIN?="inkscape"
 icons: .FORCE
-	BLENDER_BIN=$(BLENDER_BIN) INKSCAPE_BIN=$(INKSCAPE_BIN) \
+	"$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
-		"$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
+	"$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
 	BLENDER_BIN=$(BLENDER_BIN) INKSCAPE_BIN=$(INKSCAPE_BIN) \
 		"$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
 icons_geom: .FORCE
 	BLENDER_BIN=$(BLENDER_BIN) \
 	    "$(BLENDER_DIR)/release/datafiles/blender_icons_geom_update.py"
 update: .FORCE
-	if [ "$(OS_NCASE)" = "darwin" ] && [ ! -d "../lib/$(OS_NCASE)" ]; then \
+	if [ "$(OS_NCASE)" == "darwin" ] && [ ! -d "../lib/$(OS_NCASE)" ]; then \
 		svn checkout https://svn.blender.org/svnroot/bf-blender/trunk/lib/$(OS_NCASE) ../lib/$(OS_NCASE) ; \
 	fi
 	if [ -d "../lib" ]; then \
@@ -515,10 +431,6 @@ update: .FORCE
 	git submodule foreach git checkout master
 	git submodule foreach git pull --rebase origin master
 format: .FORCE
 	PATH="../lib/${OS_NCASE}/llvm/bin/:$(PATH)" \
 		python3 source/tools/utils_maintenance/clang_format_paths.py $(PATHS)
 # -----------------------------------------------------------------------------
 # Documentation
@@ -526,26 +438,33 @@ format: .FORCE
 # Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
 doc_py: .FORCE
-	ASAN_OPTIONS=halt_on_error=0 \
+	"$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup \
 	$(BLENDER_BIN) --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,22 +19,22 @@
 ####################################################################################################
 #
 # 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 users should download the precompiled libraries in lib/, Linux users
-# Windows and macOS, and install_deps.sh on Linux.
+# should run install_deps.sh for building dependencies.
 #
 # WINDOWS USAGE:
-#   Don't call this cmake file yourself, use build_deps.cmd
+#   Don't call this cmake file your self, use build_deps.cmd
 #   build_deps 2013 x64 / build_deps 2013 x86
 #   build_deps 2015 x64 / build_deps 2015 x86
 #
 # MAC OS X USAGE:
-#   Install with homebrew: brew install cmake 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:
-#   Install compiler cmake autoconf automake libtool yasm nasm tcl
+#   Install compiler, cmake, autoconf, automake, libtool, yasm
 #   Run "make deps" from main Blender directory
 #
 ####################################################################################################
@@ -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)
@@ -69,6 +58,7 @@ include(cmake/openexr.cmake)
 include(cmake/freetype.cmake)
 include(cmake/freeglut.cmake)
 include(cmake/glew.cmake)
 include(cmake/hdf5.cmake)
 include(cmake/alembic.cmake)
 include(cmake/glfw.cmake)
 include(cmake/clew.cmake)
@@ -79,9 +69,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,68 +78,55 @@ include(cmake/openvdb.cmake)
 include(cmake/python.cmake)
 include(cmake/python_site_packages.cmake)
 include(cmake/numpy.cmake)
-if(UNIX AND NOT APPLE)
+if (WITH_WEBP)
-  # Rely on PugiXML compiled with OpenImageIO
+	include(cmake/webp.cmake)
 else()
  include(cmake/pugixml.cmake)
 endif()
 if(WITH_WEBP)
  include(cmake/webp.cmake)
 endif()
 if(WITH_EMBREE)
  include(cmake/embree.cmake)
 endif()
 if(WIN32)
-  # HMD branch deps
+	include(cmake/hidapi.cmake)
-  include(cmake/hidapi.cmake)
+endif()
  # 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)
 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)
-  include(cmake/openjpeg.cmake)
+	include(cmake/openjpeg.cmake)
-  if(NOT WIN32 OR BUILD_MODE STREQUAL Release)
+	if(BUILD_MODE STREQUAL Release)
-    if(WIN32)
+		if(WIN32)
-      include(cmake/zlib_mingw.cmake)
+			include(cmake/zlib_mingw.cmake)
-    endif()
+		endif()
-    include(cmake/lame.cmake)
+		include(cmake/lame.cmake)
-    include(cmake/ogg.cmake)
+		include(cmake/ogg.cmake)
-    include(cmake/vorbis.cmake)
+		include(cmake/vorbis.cmake)
-    include(cmake/theora.cmake)
+		include(cmake/theora.cmake)
-    include(cmake/vpx.cmake)
+		include(cmake/vpx.cmake)
-    include(cmake/x264.cmake)
+		include(cmake/orc.cmake)
-    include(cmake/xvidcore.cmake)
+		include(cmake/schroedinger.cmake)
-    include(cmake/faad.cmake)
+		include(cmake/x264.cmake)
-    include(cmake/ffmpeg.cmake)
+		include(cmake/xvidcore.cmake)
-    include(cmake/fftw.cmake)
+		include(cmake/faad.cmake)
-    include(cmake/sndfile.cmake)
+		include(cmake/ffmpeg.cmake)
-    if(WIN32)
+		include(cmake/fftw.cmake)
-      include(cmake/iconv.cmake)
+		include(cmake/sndfile.cmake)
-    endif()
+		if(WIN32)
-    if(UNIX)
+			include(cmake/iconv.cmake)
-      include(cmake/flac.cmake)
+			include(cmake/lapack.cmake)
-      include(cmake/xml2.cmake)
+		endif()
-      if(NOT APPLE)
+		if(UNIX)
-        include(cmake/spnav.cmake)
+			include(cmake/flac.cmake)
-        include(cmake/jemalloc.cmake)
+			if(NOT APPLE)
-      endif()
+				include(cmake/spnav.cmake)
-    endif()
+				include(cmake/jemalloc.cmake)
-  endif()
+				include(cmake/xml2.cmake)
-endif()
+			endif()
-
+		endif()
-if(UNIX)
+	endif()
  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
@@ -17,89 +17,59 @@
 # ***** END GPL LICENSE BLOCK *****
 if(ALEMBIC_HDF5)
-  set(ALEMBIC_HDF5_HL)
+	set(ALEMBIC_HDF5_HL)
-  # in debug mode we do not build HDF5_hdf5_hl_LIBRARY which makes cmake really
+	# in debug mode we do not build HDF5_hdf5_hl_LIBRARY which makes cmake really
-  # unhappy, stub it with the debug mode lib. it's not linking it in at this
+	# unhappy, stub it with the debug mode lib. it's not linking it in at this
-  # point in time anyhow
+	# point in time anyhow
-  if(BUILD_MODE STREQUAL Debug)
+	if(BUILD_MODE STREQUAL Debug)
-    set(ALEMBIC_HDF5_HL -DHDF5_hdf5_hl_LIBRARY=${LIBDIR}/hdf5/lib/libhdf5_hl_D.${LIBEXT})
+		set(ALEMBIC_HDF5_HL -DHDF5_hdf5_hl_LIBRARY=${LIBDIR}/hdf5/lib/libhdf5_hl_D.${LIBEXT})
-  endif()
+	endif()
 endif()
 if(WIN32)
  set(ALEMBIC_ILMBASE ${LIBDIR}/openexr)
 else()
  set(ALEMBIC_ILMBASE ${LIBDIR}/ilmbase)
 endif()
 set(ALEMBIC_EXTRA_ARGS
-  -DBUILDSTATIC=ON
+	-DBUILDSTATIC=ON
-  -DLINKSTATIC=ON
+	-DLINKSTATIC=ON
-  -DALEMBIC_LIB_USES_BOOST=ON
+	-DALEMBIC_LIB_USES_BOOST=ON
-  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
+	-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-  -DBoost_USE_MULTITHREADED=ON
+	-DBoost_USE_MULTITHREADED=ON
-  -DUSE_STATIC_BOOST=On
+	-DUSE_STATIC_BOOST=On
-  -DBoost_USE_STATIC_LIBS=ON
+	-DBoost_USE_STATIC_LIBS=ON
-  -DBoost_USE_STATIC_RUNTIME=ON
+	-DBoost_USE_STATIC_RUNTIME=ON
-  -DBoost_DEBUG=ON
+	-DBoost_DEBUG=ON
-  -DBOOST_ROOT=${LIBDIR}/boost
+	-DBOOST_ROOT=${LIBDIR}/boost
-  -DBoost_NO_SYSTEM_PATHS=ON
+	-DBoost_NO_SYSTEM_PATHS=ON
-  -DILMBASE_ROOT=${ALEMBIC_ILMBASE}
+	-DILMBASE_ROOT=${LIBDIR}/ilmbase
-  -DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${ALEMBIC_ILMBASE}/include/OpenEXR
+	-DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${LIBDIR}/ilmbase/include/OpenEXR
-  -DALEMBIC_ILMBASE_HALF_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DALEMBIC_ILMBASE_HALF_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${LIBEXT}
-  -DALEMBIC_ILMBASE_IMATH_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DALEMBIC_ILMBASE_IMATH_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath-2_2${LIBEXT}
-  -DALEMBIC_ILMBASE_ILMTHREAD_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DALEMBIC_ILMBASE_ILMTHREAD_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread-2_2${LIBEXT}
-  -DALEMBIC_ILMBASE_IEX_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DALEMBIC_ILMBASE_IEX_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex-2_2${LIBEXT}
-  -DALEMBIC_ILMBASE_IEXMATH_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}IexMath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DUSE_PYILMBASE=0
-  -DUSE_PYILMBASE=0
+	-DUSE_PYALEMBIC=0
-  -DUSE_PYALEMBIC=0
+	-DUSE_ARNOLD=0
-  -DUSE_ARNOLD=0
+	-DUSE_MAYA=0
-  -DUSE_MAYA=0
+	-DUSE_PRMAN=0
-  -DUSE_PRMAN=0
+	-DUSE_HDF5=Off
-  -DUSE_HDF5=Off
+	-DUSE_STATIC_HDF5=Off
-  -DUSE_STATIC_HDF5=Off
+	-DHDF5_ROOT=${LIBDIR}/hdf5
-  -DHDF5_ROOT=${LIBDIR}/hdf5
+	-DUSE_TESTS=Off
-  -DUSE_TESTS=Off
+	-DALEMBIC_NO_OPENGL=1
-  -DALEMBIC_NO_OPENGL=1
+	-DUSE_BINARIES=ON
-  -DUSE_BINARIES=ON
+	-DALEMBIC_ILMBASE_LINK_STATIC=On
-  -DALEMBIC_ILMBASE_LINK_STATIC=On
+	-DALEMBIC_SHARED_LIBS=OFF
-  -DALEMBIC_SHARED_LIBS=OFF
+	-DGLUT_INCLUDE_DIR=""
-  -DGLUT_INCLUDE_DIR=""
+	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+	${ALEMBIC_HDF5_HL}
  ${ALEMBIC_HDF5_HL}
 )
 ExternalProject_Add(external_alembic
-  URL ${ALEMBIC_URI}
+	URL ${ALEMBIC_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${ALEMBIC_MD5}
+	URL_HASH MD5=${ALEMBIC_MD5}
-  PREFIX ${BUILD_DIR}/alembic
+	PREFIX ${BUILD_DIR}/alembic
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/alembic -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${ALEMBIC_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/alembic -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${ALEMBIC_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/alembic
+	INSTALL_DIR ${LIBDIR}/alembic
 )
-if(WIN32)
+add_dependencies(external_alembic external_boost external_zlib external_ilmbase)
  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/blendthumb.cmake
+++ b/build_files/build_environment/cmake/blendthumb.cmake
@@ -17,51 +17,45 @@
 # ***** END GPL LICENSE BLOCK *****
 if(BUILD_MODE STREQUAL Release)
-  if(WIN32)
+	if(WIN32)
-    set(THUMB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../release/windows/blendthumb)
+		set(THUMB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../release/windows/blendthumb)
-    ExternalProject_Add(external_zlib_32
+		ExternalProject_Add(external_zlib_32
-      URL ${ZLIB_URI}
+			URL ${ZLIB_URI}
-      CMAKE_GENERATOR ${GENERATOR_32}
+			CMAKE_GENERATOR ${GENERATOR_32}
-      URL_HASH MD5=${ZLIB_HASH}
+			URL_HASH MD5=${ZLIB_HASH}
-      DOWNLOAD_DIR ${DOWNLOAD_DIR}
+			DOWNLOAD_DIR ${DOWNLOAD_DIR}
-      PREFIX ${BUILD_DIR}/zlib32
+			PREFIX ${BUILD_DIR}/zlib32
-      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib32 ${DEFAULT_CMAKE_FLAGS}
+			CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib32 ${DEFAULT_CMAKE_FLAGS}
-      INSTALL_DIR ${LIBDIR}/zlib32
+			INSTALL_DIR ${LIBDIR}/zlib32
-    )
+		)
-    ExternalProject_Add(external_zlib_64
+		ExternalProject_Add(external_zlib_64
-      URL ${ZLIB_URI}
+			URL ${ZLIB_URI}
-      CMAKE_GENERATOR ${GENERATOR_64}
+			CMAKE_GENERATOR ${GENERATOR_64}
-      URL_HASH MD5=${ZLIB_HASH}
+			URL_HASH MD5=${ZLIB_HASH}
-      DOWNLOAD_DIR ${DOWNLOAD_DIR}
+			DOWNLOAD_DIR ${DOWNLOAD_DIR}
-      PREFIX ${BUILD_DIR}/zlib64
+			PREFIX ${BUILD_DIR}/zlib64
-      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib64 ${DEFAULT_CMAKE_FLAGS}
+			CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib64 ${DEFAULT_CMAKE_FLAGS}
-      INSTALL_DIR ${LIBDIR}/zlib64
+			INSTALL_DIR ${LIBDIR}/zlib64
-    )
+		)
-    ExternalProject_Add(external_blendthumb_32
+		ExternalProject_Add(external_blendthumb_32
-      CMAKE_GENERATOR ${GENERATOR_32}
+			CMAKE_GENERATOR ${GENERATOR_32}
-      SOURCE_DIR ${THUMB_DIR}
+			SOURCE_DIR ${THUMB_DIR}
-      PREFIX ${BUILD_DIR}/blendthumb32
+			PREFIX ${BUILD_DIR}/blendthumb32
-      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blendThumb32 ${DEFAULT_CMAKE_FLAGS} -DZLIB_INCLUDE=${LIBDIR}/zlib32/include -DZLIB_LIBS=${LIBDIR}/zlib32/lib/zlibstatic.lib
+			CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blendThumb32 ${DEFAULT_CMAKE_FLAGS} -DZLIB_INCLUDE=${LIBDIR}/zlib32/include -DZLIB_LIBS=${LIBDIR}/zlib32/lib/zlibstatic.lib
-      INSTALL_DIR ${LIBDIR}/blendthumb32
+			INSTALL_DIR ${LIBDIR}/blendthumb32
-    )
+		)
-    add_dependencies(
+		add_dependencies(external_blendthumb_32 external_zlib_32)
      external_blendthumb_32
      external_zlib_32
    )
-    ExternalProject_Add(external_blendthumb_64
+		ExternalProject_Add(external_blendthumb_64
-      CMAKE_GENERATOR ${GENERATOR_64}
+			CMAKE_GENERATOR ${GENERATOR_64}
-      SOURCE_DIR ${THUMB_DIR}
+			SOURCE_DIR ${THUMB_DIR}
-      PREFIX ${BUILD_DIR}/blendthumb64
+			PREFIX ${BUILD_DIR}/blendthumb64
-      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blendThumb64 ${DEFAULT_CMAKE_FLAGS} -DZLIB_INCLUDE=${LIBDIR}/zlib64/include -DZLIB_LIBS=${LIBDIR}/zlib64/lib/zlibstatic.lib
+			CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blendThumb64 ${DEFAULT_CMAKE_FLAGS} -DZLIB_INCLUDE=${LIBDIR}/zlib64/include -DZLIB_LIBS=${LIBDIR}/zlib64/lib/zlibstatic.lib
-      INSTALL_DIR ${LIBDIR}/blendthumb64
+			INSTALL_DIR ${LIBDIR}/blendthumb64
-    )
+		)
-    add_dependencies(
+		add_dependencies(external_blendthumb_64 external_zlib_64)
-      external_blendthumb_64
+	endif()
      external_zlib_64
    )
  endif()
 endif()
--- a/build_files/build_environment/cmake/blosc.cmake
+++ b/build_files/build_environment/cmake/blosc.cmake
@@ -17,59 +17,27 @@
 # ***** END GPL LICENSE BLOCK *****
 set(BLOSC_EXTRA_ARGS
-  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-  -DBUILD_TESTS=OFF
+	-DBUILD_TESTS=OFF
-  -DBUILD_BENCHMARKS=OFF
+	-DBUILD_BENCHMARKS=OFF
-  -DCMAKE_DEBUG_POSTFIX=_d
+	-DCMAKE_DEBUG_POSTFIX=_d
-  -DThreads_FOUND=1
+	-DThreads_FOUND=1
-  -DPTHREAD_LIBS=${LIBDIR}/pthreads/lib/pthreadVC3.lib
+	-DPTHREAD_LIBS=${LIBDIR}/pthreads/lib/pthreadVC2.lib
-  -DPTHREAD_INCLUDE_DIR=${LIBDIR}/pthreads/inc
+	-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}
+	URL ${BLOSC_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${BLOSC_HASH}
+	URL_HASH MD5=${BLOSC_HASH}
-  PREFIX ${BUILD_DIR}/blosc
+	PREFIX ${BUILD_DIR}/blosc
-  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/blosc/src/external_blosc < ${PATCH_DIR}/blosc.diff
+	PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/blosc/src/external_blosc < ${PATCH_DIR}/blosc.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blosc ${DEFAULT_CMAKE_FLAGS} ${BLOSC_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blosc ${DEFAULT_CMAKE_FLAGS} ${BLOSC_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/blosc
+	INSTALL_DIR ${LIBDIR}/blosc
 )
-add_dependencies(
+add_dependencies(external_blosc external_zlib)
  external_blosc
  external_zlib
 )
 if(WIN32)
-  add_dependencies(
+	add_dependencies(external_blosc external_pthreads)
    external_blosc
    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,94 +16,92 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 set(BOOST_ADDRESS_MODEL 64)
 if(WIN32)
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    set(PYTHON_ARCH x64)
+		set(PYTHON_ARCH x64)
-    set(PYTHON_ARCH2 win-AMD64)
+		set(PYTHON_ARCH2 win-AMD64)
-    set(PYTHON_OUTPUTDIR ${BUILD_DIR}/python/src/external_python/pcbuild/amd64/)
+		set(PYTHON_OUTPUTDIR ${BUILD_DIR}/python/src/external_python/pcbuild/amd64/)
-  else()
+	else()
-    set(PYTHON_ARCH x86)
+		set(PYTHON_ARCH x86)
-    set(PYTHON_ARCH2 win32)
+		set(PYTHON_ARCH2 win32)
-    set(PYTHON_OUTPUTDIR ${BUILD_DIR}/python/src/external_python/pcbuild/win32/)
+		set(PYTHON_OUTPUTDIR ${BUILD_DIR}/python/src/external_python/pcbuild/win32/)
-    set(BOOST_ADDRESS_MODEL 32)
+	endif()
-  endif()
+	if(MSVC12)
-  if(MSVC14)
+		set(BOOST_TOOLSET toolset=msvc-12.0)
-    set(BOOST_TOOLSET toolset=msvc-14.0)
+		set(BOOST_COMPILER_STRING -vc120)
-    set(BOOST_COMPILER_STRING -vc140)
+		set(PYTHON_COMPILER_STRING v120)
-  endif()
+	endif()
-  set(JAM_FILE ${BUILD_DIR}/boost/src/external_boost/user-config.jam)
+	if(MSVC14)
-  set(semi_path "${PATCH_DIR}/semi.txt")
+		set(BOOST_TOOLSET toolset=msvc-14.0)
-  FILE(TO_NATIVE_PATH ${semi_path} semi_path)
+		set(BOOST_COMPILER_STRING -vc140)
-  set(BOOST_CONFIGURE_COMMAND bootstrap.bat &&
+		set(PYTHON_COMPILER_STRING v140)
-                echo using python : ${PYTHON_OUTPUTDIR}\\python.exe > "${JAM_FILE}" &&
+	endif()
-                echo.   : ${BUILD_DIR}/python/src/external_python/include ${BUILD_DIR}/python/src/external_python/pc >> "${JAM_FILE}" &&
+	set(JAM_FILE ${BUILD_DIR}/boost/src/external_boost/user-config.jam)
-                echo.   : ${BUILD_DIR}/python/src/external_python/pcbuild >> "${JAM_FILE}" &&
+	set(semi_path "${PATCH_DIR}/semi.txt")
-                type ${semi_path} >> "${JAM_FILE}"
+	FILE(TO_NATIVE_PATH ${semi_path} semi_path)
-  )
+	set(BOOST_CONFIGURE_COMMAND bootstrap.bat &&
-  set(BOOST_BUILD_COMMAND bjam)
+								echo using python : ${PYTHON_OUTPUTDIR}\\python.exe > "${JAM_FILE}" &&
-  #--user-config=user-config.jam
+								echo.   : ${BUILD_DIR}/python/src/external_python/include ${BUILD_DIR}/python/src/external_python/pc >> "${JAM_FILE}" &&
-  set(BOOST_BUILD_OPTIONS runtime-link=static )
+								echo.   : ${BUILD_DIR}/python/src/external_python/pcbuild >> "${JAM_FILE}" &&
-  #set(BOOST_WITH_PYTHON --with-python)
+								type ${semi_path} >> "${JAM_FILE}"
-  set(BOOST_HARVEST_CMD   ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ )
+	)
-  if(BUILD_MODE STREQUAL Release)
+	set(BOOST_BUILD_COMMAND bjam)
-    set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-1_68/ ${HARVEST_TARGET}/boost/include/)
+	#--user-config=user-config.jam
-  endif()
+	set(BOOST_BUILD_OPTIONS runtime-link=static )
 	#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_60/ ${HARVEST_TARGET}/boost/include/)
 	endif()
 elseif(APPLE)
-  set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
+	set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
-  set(BOOST_BUILD_COMMAND ./b2)
+	set(BOOST_BUILD_COMMAND ./bjam)
-  set(BOOST_BUILD_OPTIONS toolset=darwin cxxflags=${PLATFORM_CXXFLAGS} linkflags=${PLATFORM_LDFLAGS} --disable-icu boost.locale.icu=off)
+	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_HARVEST_CMD echo .)
  set(BOOST_PATCH_COMMAND echo .)
 else()
-  set(BOOST_HARVEST_CMD echo .)
+	set(BOOST_HARVEST_CMD echo .)
-  set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
+	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_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
-  --with-filesystem
+	--with-filesystem
-  --with-locale
+	--with-locale
-  --with-thread
+	--with-thread
-  --with-regex
+	--with-regex
-  --with-system
+	--with-system
-  --with-date_time
+	--with-date_time
-  --with-wave
+	--with-wave
-  --with-atomic
+	--with-atomic
-  --with-serialization
+	--with-serialization
-  --with-program_options
+	--with-program_options
-  --with-iostreams
+	--with-iostreams
-  ${BOOST_WITH_PYTHON}
+	${BOOST_WITH_PYTHON}
-  ${BOOST_TOOLSET}
+	${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}
+	URL ${BOOST_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${BOOST_HASH}
+	URL_HASH MD5=${BOOST_MD5}
-  PREFIX ${BUILD_DIR}/boost
+	PREFIX ${BUILD_DIR}/boost
-  UPDATE_COMMAND  ""
+	UPDATE_COMMAND	""
-  PATCH_COMMAND ${BOOST_PATCH_COMMAND}
+	CONFIGURE_COMMAND ${BOOST_CONFIGURE_COMMAND}
-  CONFIGURE_COMMAND ${BOOST_CONFIGURE_COMMAND}
+	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_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_IN_SOURCE 1
-  BUILD_IN_SOURCE 1
+	INSTALL_COMMAND "${BOOST_HARVEST_CMD}"
  INSTALL_COMMAND "${BOOST_HARVEST_CMD}"
 )
 if(WIN32)
-  add_dependencies(
+	add_dependencies(external_boost Make_Python_Environment)
    external_boost
    Make_Python_Environment
  )
 endif()
--- 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
@@ -17,47 +17,35 @@
 # ***** END GPL LICENSE BLOCK *****
 set(CLANG_EXTRA_ARGS
-  -DCLANG_PATH_TO_LLVM_SOURCE=${BUILD_DIR}/ll/src/ll
+	-DCLANG_PATH_TO_LLVM_SOURCE=${BUILD_DIR}/ll/src/ll
-  -DCLANG_PATH_TO_LLVM_BUILD=${LIBDIR}/llvm
+	-DCLANG_PATH_TO_LLVM_BUILD=${LIBDIR}/llvm
-  -DLLVM_USE_CRT_RELEASE=MT
+	-DLLVM_USE_CRT_RELEASE=MT
-  -DLLVM_USE_CRT_DEBUG=MTd
+	-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}
+	URL ${CLANG_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${CLANG_HASH}
+	URL_HASH MD5=${CLANG_HASH}
-  PREFIX ${BUILD_DIR}/clang
+	PATCH_COMMAND ${PATCH_CMD} -p 2 -N -R -d ${BUILD_DIR}/clang/src/external_clang < ${PATCH_DIR}/clang.diff
-  CMAKE_GENERATOR ${CLANG_GENERATOR}
+	PREFIX ${BUILD_DIR}/clang
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/clang ${DEFAULT_CMAKE_FLAGS} ${CLANG_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/clang ${DEFAULT_CMAKE_FLAGS} ${CLANG_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/clang
+	INSTALL_DIR ${LIBDIR}/clang
 )
-if(MSVC)
+if (MSVC)
-  if(BUILD_MODE STREQUAL Release)
+	if (BUILD_MODE STREQUAL Release)
-    set(CLANG_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/ ${HARVEST_TARGET}/llvm/)
+		set(CLANG_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/ ${HARVEST_TARGET}/llvm/ )
-  else()
+	else()
-    set(CLANG_HARVEST_COMMAND
+		set(CLANG_HARVEST_COMMAND
-      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/lib/ ${HARVEST_TARGET}/llvm/debug/lib/ &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/lib/ ${HARVEST_TARGET}/llvm/debug/lib/ &&
-      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/bin/ ${HARVEST_TARGET}/llvm/debug/bin/ &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/bin/ ${HARVEST_TARGET}/llvm/debug/bin/ &&
-      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/include/ ${HARVEST_TARGET}/llvm/debug/include/
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/include/ ${HARVEST_TARGET}/llvm/debug/include/ 
-    )
+			)
-  endif()
+	endif()
-  ExternalProject_Add_Step(external_clang after_install
+	ExternalProject_Add_Step(external_clang after_install
-    COMMAND ${CLANG_HARVEST_COMMAND}
+		COMMAND ${CLANG_HARVEST_COMMAND}
-    DEPENDEES mkdir update patch download configure build install
+		DEPENDEES mkdir update patch download configure build install
-  )
+	)
 endif()
-add_dependencies(
+add_dependencies(external_clang ll)
  external_clang
  ll
 )
--- a/build_files/build_environment/cmake/clew.cmake
+++ b/build_files/build_environment/cmake/clew.cmake
@@ -19,10 +19,10 @@
 set(CLEW_EXTRA_ARGS)
 ExternalProject_Add(external_clew
-  URL ${CLEW_URI}
+	URL ${CLEW_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${CLEW_HASH}
+	URL_HASH MD5=${CLEW_HASH}
-  PREFIX ${BUILD_DIR}/clew
+	PREFIX ${BUILD_DIR}/clew
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/clew -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${CLEW_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/clew -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${CLEW_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/clew
+	INSTALL_DIR ${LIBDIR}/clew
 )
--- a/build_files/build_environment/cmake/cuew.cmake
+++ b/build_files/build_environment/cmake/cuew.cmake
@@ -19,11 +19,11 @@
 set(CUEW_EXTRA_ARGS)
 ExternalProject_Add(external_cuew
-  URL ${CUEW_URI}
+	URL ${CUEW_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${CUEW_HASH}
+	URL_HASH MD5=${CUEW_HASH}
-  PREFIX ${BUILD_DIR}/cuew
+	PREFIX ${BUILD_DIR}/cuew
-  PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/cuew/src/external_cuew < ${PATCH_DIR}/cuew.diff
+	PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/cuew/src/external_cuew < ${PATCH_DIR}/cuew.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/cuew -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${CUEW_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/cuew -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${CUEW_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/cuew
+	INSTALL_DIR ${LIBDIR}/cuew
 )
--- a/build_files/build_environment/cmake/embree.cmake
+++ b/build_files/build_environment/cmake/embree.cmake
@@ -1,69 +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 *****
 # Note the utility apps may use png/tiff/gif system libraries, but the
 # library itself does not depend on them, so should give no problems.
 set(EMBREE_EXTRA_ARGS
  -DEMBREE_ISPC_SUPPORT=OFF
  -DEMBREE_TUTORIALS=OFF
  -DEMBREE_STATIC_LIB=ON
  -DEMBREE_RAY_MASK=ON
  -DEMBREE_FILTER_FUNCTION=ON
  -DEMBREE_BACKFACE_CULLING=OFF
  -DEMBREE_TASKING_SYSTEM=INTERNAL
  -DEMBREE_MAX_ISA=AVX2
 )
 if(WIN32)
  set(EMBREE_BUILD_DIR ${BUILD_MODE}/)
 else()
  set(EMBREE_BUILD_DIR)
 endif()
 ExternalProject_Add(external_embree
  URL ${EMBREE_URI}
  DOWNLOAD_DIR ${DOWNLOAD_DIR}
  URL_HASH MD5=${EMBREE_HASH}
  PREFIX ${BUILD_DIR}/embree
  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
  INSTALL_DIR ${LIBDIR}/embree
 )
 if(WIN32)
  if(BUILD_MODE STREQUAL Release)
    ExternalProject_Add_Step(external_embree after_install
      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/embree ${HARVEST_TARGET}/embree
      DEPENDEES install
    )
  else()
  ExternalProject_Add_Step(external_embree after_install
      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree3.lib ${HARVEST_TARGET}/embree/lib/embree3_d.lib
      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_avx.lib ${HARVEST_TARGET}/embree/lib/embree_avx_d.lib
      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_avx2.lib ${HARVEST_TARGET}/embree/lib/embree_avx2_d.lib
      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_sse42.lib ${HARVEST_TARGET}/embree/lib/embree_sse42_d.lib
      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/lexers.lib ${HARVEST_TARGET}/embree/lib/lexers_d.lib
      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/math.lib ${HARVEST_TARGET}/embree/lib/math_d.lib
      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/simd.lib ${HARVEST_TARGET}/embree/lib/simd_d.lib
      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/sys.lib ${HARVEST_TARGET}/embree/lib/sys_d.lib
      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/tasking.lib ${HARVEST_TARGET}/embree/lib/tasking_d.lib
      DEPENDEES install
    )
  endif()
 endif()
--- a/build_files/build_environment/cmake/faad.cmake
+++ b/build_files/build_environment/cmake/faad.cmake
@@ -18,23 +18,18 @@
 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}
+	URL ${FAAD_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${FAAD_HASH}
+	URL_HASH MD5=${FAAD_HASH}
-  PREFIX ${BUILD_DIR}/faad
+	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
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make -j${MAKE_THREADS}
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && ${CONFIGURE_COMMAND} --disable-shared --enable-static --prefix=${LIBDIR}/faad
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make install
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make -j${MAKE_THREADS}
-  INSTALL_DIR ${LIBDIR}/faad
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make install
 	INSTALL_DIR ${LIBDIR}/faad
 )
 if(MSVC)
-  set_target_properties(external_faad PROPERTIES FOLDER Mingw)
+	set_target_properties(external_faad PROPERTIES FOLDER Mingw)
 endif()
--- 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,103 +16,93 @@
 #
 # ***** 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_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}/zlib/lib")
+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 --pkg-config-flags=--static --extra-cflags=${FFMPEG_CFLAGS} --extra-ldflags=${FFMPEG_LDFLAGS})
+set(FFMPEG_EXTRA_FLAGS --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_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} &&)
+	set(FFMPEG_ENV set ${FFMPEG_ENV} &&)
-  set(FFMPEG_EXTRA_FLAGS
+	set(FFMPEG_EXTRA_FLAGS
-    ${FFMPEG_EXTRA_FLAGS}
+		${FFMPEG_EXTRA_FLAGS}
-    --disable-static
+		--disable-static
-    --enable-shared
+		--enable-shared
-    --enable-w32threads
+		--enable-w32threads
-    --disable-pthreads
+		--disable-pthreads
-    --enable-libopenjpeg
+		--enable-libopenjpeg
-  )
+		)
  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
    set(FFMPEG_EXTRA_FLAGS
      ${FFMPEG_EXTRA_FLAGS}
      --x86asmexe=yasm
    )
  endif()
 else()
-  set(FFMPEG_EXTRA_FLAGS
+	set(FFMPEG_EXTRA_FLAGS
-    ${FFMPEG_EXTRA_FLAGS}
+		${FFMPEG_EXTRA_FLAGS}
-    --enable-static
+		--enable-static
-    --disable-shared
+		--disable-shared
-    --enable-libopenjpeg
+		--enable-libopenjpeg)
  )
 endif()
 if(APPLE)
-  set(FFMPEG_EXTRA_FLAGS
+	set(FFMPEG_EXTRA_FLAGS
-    ${FFMPEG_EXTRA_FLAGS}
+		${FFMPEG_EXTRA_FLAGS}
-    --target-os=darwin
+		--target-os=darwin
-    )
+		)
 endif()
 ExternalProject_Add(external_ffmpeg
-  URL ${FFMPEG_URI}
+	URL ${FFMPEG_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${FFMPEG_HASH}
+	URL_HASH MD5=${FFMPEG_HASH}
-  # OpenJpeg is compiled with pthread support on Linux, which is all fine and is what we
+	PREFIX ${BUILD_DIR}/ffmpeg
-  # want for maximum runtime performance, but due to static nature of that library we
+	CONFIGURE_COMMAND ${CONFIGURE_ENV_NO_PERL} &&
-  # need to force ffmpeg to link against pthread, otherwise test program used by autoconf
+		cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ &&
-  # will fail. This patch does that in a way that is compatible with multiple distributions.
+		${FFMPEG_ENV} ${CONFIGURE_COMMAND_NO_TARGET} ${FFMPEG_EXTRA_FLAGS}
-  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/ffmpeg/src/external_ffmpeg < ${PATCH_DIR}/ffmpeg.diff
+		--disable-lzma
-  PREFIX ${BUILD_DIR}/ffmpeg
+		--disable-avfilter
-  CONFIGURE_COMMAND ${CONFIGURE_ENV_NO_PERL} &&
+		--disable-vdpau
-    cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ &&
+		--disable-bzlib
-    ${FFMPEG_ENV} ${CONFIGURE_COMMAND_NO_TARGET} ${FFMPEG_EXTRA_FLAGS}
+		--disable-libgsm
-    --disable-lzma
+		--disable-libspeex
-    --disable-avfilter
+		--enable-libvpx
-    --disable-vdpau
+		--prefix=${LIBDIR}/ffmpeg
-    --disable-bzlib
+		--enable-libschroedinger
-    --disable-libgsm
+		--enable-libtheora
-    --disable-libspeex
+		--enable-libvorbis
-    --enable-libvpx
+		--enable-zlib
-    --prefix=${LIBDIR}/ffmpeg
+		--enable-stripping
-    --enable-libtheora
+		--enable-runtime-cpudetect
-    --enable-libvorbis
+		--disable-vaapi
-    --enable-zlib
+		--disable-nonfree
-    --enable-stripping
+		--enable-gpl
-    --enable-runtime-cpudetect
+		--disable-postproc
-    --disable-vaapi
+		--disable-x11grab
-    --disable-nonfree
+		--enable-libmp3lame
-    --enable-gpl
+		--disable-librtmp
-    --disable-postproc
+		--enable-libx264
-    --enable-libmp3lame
+		--enable-libxvid
-    --disable-librtmp
+		--disable-libopencore-amrnb
-    --enable-libx264
+		--disable-libopencore-amrwb
-    --enable-libxvid
+		--disable-libdc1394
-    --disable-libopencore-amrnb
+		--disable-version3
-    --disable-libopencore-amrwb
+		--disable-debug
-    --disable-libdc1394
+		--enable-optimizations
-    --disable-version3
+		--disable-sse
-    --disable-debug
+		--disable-ssse3
-    --enable-optimizations
+		--enable-ffplay
-    --disable-sse
+		--disable-openssl
-    --disable-ssse3
+		--disable-securetransport
-    --enable-ffplay
+		--disable-indev=avfoundation
-    --disable-openssl
+		--disable-indev=qtkit
-    --disable-securetransport
+		--disable-sdl
-    --disable-indev=avfoundation
+		--disable-gnutls
-    --disable-indev=qtkit
+		--disable-vda
-    --disable-sdl2
+		--disable-videotoolbox
-    --disable-gnutls
+		--disable-libxcb
-    --disable-videotoolbox
+		--disable-xlib
-    --disable-libxcb
+		--disable-audiotoolbox
-    --disable-xlib
+		--disable-cuvid
-    --disable-audiotoolbox
+		--disable-nvenc
-    --disable-cuvid
+		--disable-indev=jack
-    --disable-nvenc
+		--disable-indev=alsa
-    --disable-indev=jack
+		--disable-outdev=alsa
-    --disable-indev=alsa
+  PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/ffmpeg/src/external_ffmpeg < ${PATCH_DIR}/ffmpeg.diff
    --disable-outdev=alsa
    --disable-crystalhd
    --disable-sndio
  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}
@@ -120,33 +110,10 @@ ExternalProject_Add(external_ffmpeg
 )
 if(MSVC)
-  set_target_properties(external_ffmpeg PROPERTIES FOLDER Mingw)
+	set_target_properties(external_ffmpeg PROPERTIES FOLDER Mingw)
-endif()
+endif(MSVC)
-add_dependencies(
+add_dependencies(external_ffmpeg external_zlib external_faad external_openjpeg external_xvidcore external_x264 external_schroedinger external_vpx external_theora external_vorbis external_ogg external_lame)
  external_ffmpeg
  external_zlib
  external_faad
  external_openjpeg
  external_xvidcore
  external_x264
  external_vpx
  external_theora
  external_vorbis
  external_ogg
  external_lame
 )
 if(WIN32)
-  add_dependencies(
+	add_dependencies(external_ffmpeg external_zlib_mingw)
    external_ffmpeg
    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
@@ -19,29 +19,22 @@
 set(FFTW_EXTRA_ARGS)
 if(WIN32)
-  set(FFTW3_ENV set CFLAGS=-fno-stack-check -fno-stack-protector -mno-stack-arg-probe -fno-lto &&)
+	set(FFTW3_ENV set CFLAGS=-fno-stack-check -fno-stack-protector -mno-stack-arg-probe -fno-lto &&)
-  set(FFTW3_PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/fftw3/src/external_fftw3 < ${PATCH_DIR}/fftw3.diff)
+	set(FFTW3_PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/fftw3/src/external_fftw3 < ${PATCH_DIR}/fftw3.diff)
 endif()
 ExternalProject_Add(external_fftw3
-  URL ${FFTW_URI}
+	URL ${FFTW_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${FFTW_HASH}
+	URL_HASH MD5=${FFTW_HASH}
-  PREFIX ${BUILD_DIR}/fftw3
+	PREFIX ${BUILD_DIR}/fftw3
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && ${FFTW3_ENV} cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && ${CONFIGURE_COMMAND} --enable-static --prefix=${mingw_LIBDIR}/fftw3
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && ${FFTW3_ENV} cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && ${CONFIGURE_COMMAND} --enable-static --prefix=${mingw_LIBDIR}/fftw3
-  PATCH_COMMAND ${FFTW3_PATCH_COMMAND}
+	PATCH_COMMAND ${FFTW3_PATCH_COMMAND}
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && make -j${MAKE_THREADS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && make	-j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && make install
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && make install
-  INSTALL_DIR ${LIBDIR}/fftw3
+	INSTALL_DIR ${LIBDIR}/fftw3
 )
 if(MSVC)
-  set_target_properties(external_fftw3 PROPERTIES FOLDER Mingw)
+	set_target_properties(external_fftw3 PROPERTIES FOLDER Mingw)
-  if(BUILD_MODE STREQUAL Release)
+endif(MSVC)
    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/flac.cmake
+++ b/build_files/build_environment/cmake/flac.cmake
@@ -17,16 +17,16 @@
 # ***** END GPL LICENSE BLOCK *****
 ExternalProject_Add(external_flac
-  URL ${FLAC_URI}
+	URL ${FLAC_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH SHA256=${FLAC_HASH}
+	URL_HASH SHA256=${FLAC_HASH}
-  PREFIX ${BUILD_DIR}/flac
+	PREFIX ${BUILD_DIR}/flac
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flac/src/external_flac/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/flac --disable-shared --enable-static
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flac/src/external_flac/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/flac --disable-shared --enable-static
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flac/src/external_flac/ && make -j${MAKE_THREADS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flac/src/external_flac/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flac/src/external_flac/ && make install
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/flac/src/external_flac/ && make install
-  INSTALL_DIR ${LIBDIR}/flac
+	INSTALL_DIR ${LIBDIR}/flac
 )
 if(MSVC)
-  set_target_properties(external_flac PROPERTIES FOLDER Mingw)
+	set_target_properties(external_flac PROPERTIES FOLDER Mingw)
-endif()
+endif(MSVC)
--- a/build_files/build_environment/cmake/flexbison.cmake
+++ b/build_files/build_environment/cmake/flexbison.cmake
@@ -19,13 +19,13 @@
 set(FLEXBISON_EXTRA_ARGS)
 ExternalProject_Add(external_flexbison
-  URL ${FLEXBISON_URI}
+	URL ${FLEXBISON_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${FLEXBISON_HASH}
+	URL_HASH MD5=${FLEXBISON_HASH}
-  PREFIX ${BUILD_DIR}/flexbison
+	PREFIX ${BUILD_DIR}/flexbison
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/flexbison ${DEFAULT_CMAKE_FLAGS} ${FLEXBISON_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/flexbison ${DEFAULT_CMAKE_FLAGS} ${FLEXBISON_EXTRA_ARGS}
-  CONFIGURE_COMMAND echo .
+	CONFIGURE_COMMAND echo .
-  BUILD_COMMAND echo .
+	BUILD_COMMAND echo .
-  INSTALL_COMMAND COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/flexbison/src/external_flexbison/ ${LIBDIR}/flexbison/
+	INSTALL_COMMAND COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/flexbison/src/external_flexbison/ ${LIBDIR}/flexbison/
-  INSTALL_DIR ${LIBDIR}/flexbison
+	INSTALL_DIR ${LIBDIR}/flexbison
 )
--- a/build_files/build_environment/cmake/freeglut.cmake
+++ b/build_files/build_environment/cmake/freeglut.cmake
@@ -17,19 +17,19 @@
 # ***** END GPL LICENSE BLOCK *****
 if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
+	if(BUILD_MODE STREQUAL Release)
-    set(FREEGLUT_EXTRA_ARGS
+		set(FREEGLUT_EXTRA_ARGS
-      -DFREEGLUT_BUILD_SHARED_LIBS=Off
+			-DFREEGLUT_BUILD_SHARED_LIBS=Off
-      -DFREEGLUT_BUILD_STATIC_LIBS=On
+			-DFREEGLUT_BUILD_STATIC_LIBS=On
-    )
+		)
-    ExternalProject_Add(external_freeglut
+		ExternalProject_Add(external_freeglut
-      URL ${FREEGLUT_URI}
+			URL ${FREEGLUT_URI}
-      DOWNLOAD_DIR ${DOWNLOAD_DIR}
+			DOWNLOAD_DIR ${DOWNLOAD_DIR}
-      URL_HASH MD5=${FREEGLUT_HASH}
+			URL_HASH MD5=${FREEGLUT_HASH}
-      PREFIX ${BUILD_DIR}/freeglut
+			PREFIX ${BUILD_DIR}/freeglut
-      CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/freeglut ${DEFAULT_C_FLAGS} ${DEFAULT_CXX_FLAGS} ${FREEGLUT_EXTRA_ARGS}
+			CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/freeglut ${DEFAULT_C_FLAGS} ${DEFAULT_CXX_FLAGS} ${FREEGLUT_EXTRA_ARGS}
-      INSTALL_DIR ${LIBDIR}/freeglut
+			INSTALL_DIR ${LIBDIR}/freeglut
-    )
+		)
-  endif()
+	endif()
 endif()
--- a/build_files/build_environment/cmake/freetype.cmake
+++ b/build_files/build_environment/cmake/freetype.cmake
@@ -16,29 +16,13 @@
 #
 # ***** END GPL LICENSE BLOCK *****
-set(FREETYPE_EXTRA_ARGS
+set(FREETYPE_EXTRA_ARGS -DCMAKE_RELEASE_POSTFIX:STRING=2ST -DCMAKE_DEBUG_POSTFIX:STRING=2ST_d -DWITH_BZip2=OFF -DWITH_HarfBuzz=OFF)
  -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)
 ExternalProject_Add(external_freetype
-  URL ${FREETYPE_URI}
+	URL ${FREETYPE_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${FREETYPE_HASH}
+	URL_HASH MD5=${FREETYPE_HASH}
-  PREFIX ${BUILD_DIR}/freetype
+	PREFIX ${BUILD_DIR}/freetype
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/freetype ${DEFAULT_CMAKE_FLAGS} ${FREETYPE_EXTRA_ARGS}
+	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
  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/glew.cmake
+++ b/build_files/build_environment/cmake/glew.cmake
@@ -17,16 +17,16 @@
 # ***** END GPL LICENSE BLOCK *****
 set(GLEW_EXTRA_ARGS
-  -DBUILD_UTILS=Off
+	-DBUILD_UTILS=Off
-  -DBUILD_SHARED_LIBS=Off
+	-DBUILD_SHARED_LIBS=Off
 )
 ExternalProject_Add(external_glew
-  URL ${GLEW_URI}
+	URL ${GLEW_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${GLEW_HASH}
+	URL_HASH MD5=${GLEW_HASH}
-  PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_glew.txt ${BUILD_DIR}/glew/src/external_glew/CMakeLists.txt
+	PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_glew.txt	${BUILD_DIR}/glew/src/external_glew/CMakeLists.txt
-  PREFIX ${BUILD_DIR}/glew
+	PREFIX ${BUILD_DIR}/glew
-  CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${LIBDIR}/glew ${DEFAULT_CMAKE_FLAGS} ${GLEW_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${LIBDIR}/glew ${DEFAULT_CMAKE_FLAGS} ${GLEW_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/glew
+	INSTALL_DIR ${LIBDIR}/glew
 )
--- a/build_files/build_environment/cmake/glfw.cmake
+++ b/build_files/build_environment/cmake/glfw.cmake
@@ -19,10 +19,10 @@
 set(GLFW_EXTRA_ARGS)
 ExternalProject_Add(external_glfw
-  URL ${GLFW_URI}
+	URL ${GLFW_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${GLFW_HASH}
+	URL_HASH MD5=${GLFW_HASH}
-  PREFIX ${BUILD_DIR}/glfw
+	PREFIX ${BUILD_DIR}/glfw
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/glfw -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${GLFW_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/glfw -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${GLFW_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/glfw
+	INSTALL_DIR ${LIBDIR}/glfw
 )
--- a/build_files/build_environment/cmake/harvest.cmake
+++ b/build_files/build_environment/cmake/harvest.cmake
@@ -21,95 +21,190 @@
 ########################################################################
 if(NOT DEFINED HARVEST_TARGET)
-  set(HARVEST_TARGET ${CMAKE_CURRENT_SOURCE_DIR}/Harvest)
+	set(HARVEST_TARGET ${CMAKE_CURRENT_SOURCE_DIR}/Harvest)
 endif()
 message("HARVEST_TARGET = ${HARVEST_TARGET}")
 if(WIN32)
 if(BUILD_MODE STREQUAL Release)
-  add_custom_target(Harvest_Release_Results
+	add_custom_target(Harvest_Release_Results
-    COMMAND # jpeg rename libfile + copy include
+				# Zlib Rename the lib file and copy the include/bin folders
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
+		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstatic.lib ${HARVEST_TARGET}/zlib/lib/libz_st.lib &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zlib/include/ ${HARVEST_TARGET}/zlib/include/ &&
-        # OpenImageIO
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zlib/bin/ ${HARVEST_TARGET}/zlib/bin/ &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include &&
+				# jpeg rename libfile + copy include
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/idiff.exe ${HARVEST_TARGET}/OpenImageIO/bin/idiff.exe &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
-        # png
+				# FreeType, straight up copy
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib ${HARVEST_TARGET}/png/lib/libpng.lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype ${HARVEST_TARGET}/freetype &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/ &&
+				# pthreads, rename include dir
-        # freeglut-> opengl
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/inc/ ${HARVEST_TARGET}/pthreads/include/ &&
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/freeglut/lib/freeglut_static.lib ${HARVEST_TARGET}/opengl/lib/freeglut_static.lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/lib/ ${HARVEST_TARGET}/pthreads/lib &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freeglut/include/ ${HARVEST_TARGET}/opengl/include/ &&
+				# ffmpeg copy include+bin
-        # glew-> opengl
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/include ${HARVEST_TARGET}/ffmpeg/include &&
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/glew/lib/libglew32.lib ${HARVEST_TARGET}/opengl/lib/glew.lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/bin ${HARVEST_TARGET}/ffmpeg/lib &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/glew/include/ ${HARVEST_TARGET}/opengl/include/ &&
+				# sdl merge bin/lib folder, copy include
-        # sndfile
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/include/sdl2 ${HARVEST_TARGET}/sdl/include &&
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/lib/libsndfile.dll.a ${HARVEST_TARGET}/sndfile/lib/libsndfile-1.lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/lib ${HARVEST_TARGET}/sdl/lib &&
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/bin/libsndfile-1.dll ${HARVEST_TARGET}/sndfile/lib/libsndfile-1.dll &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/bin ${HARVEST_TARGET}/sdl/lib &&
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/include/sndfile.h ${HARVEST_TARGET}/sndfile/include/sndfile.h &&
+				# openal
-        # tiff
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/lib/openal32.lib ${HARVEST_TARGET}/openal/lib/openal32.lib &&
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiff.lib ${HARVEST_TARGET}/tiff/lib/libtiff.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/bin/openal32.dll ${HARVEST_TARGET}/openal/lib/openal32.dll &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tiff/include/ ${HARVEST_TARGET}/tiff/include/ &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openal/include/ ${HARVEST_TARGET}/openal/include/ &&
-        # BlendThumb
+				# OpenImageIO
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/BlendThumb64/bin/blendthumb.dll ${HARVEST_TARGET}/ThumbHandler/lib/BlendThumb64.dll &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include &&
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/BlendThumb32/bin/blendthumb.dll ${HARVEST_TARGET}/ThumbHandler/lib/BlendThumb.dll &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib &&
-        # hidapi
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/idiff.exe ${HARVEST_TARGET}/OpenImageIO/bin/idiff.exe &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hidapi/ ${HARVEST_TARGET}/hidapi/ &&
+				# openEXR
-        # webp, straight up copy
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ilmbase ${HARVEST_TARGET}/openexr &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/webp ${HARVEST_TARGET}/webp &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${HARVEST_TARGET}/openexr/lib &&
-    DEPENDS
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/include ${HARVEST_TARGET}/openexr/include &&
-  )
+				# png
-endif()
+				${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/ &&
 				# glew-> opengl
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/glew/lib/libglew32.lib ${HARVEST_TARGET}/opengl/lib/glew.lib &&
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/glew/include/ ${HARVEST_TARGET}/opengl/include/ &&
 				# sndfile
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/lib/libsndfile.dll.a ${HARVEST_TARGET}/sndfile/lib/libsndfile-1.lib &&
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/bin/libsndfile-1.dll ${HARVEST_TARGET}/sndfile/lib/libsndfile-1.dll &&
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/include/sndfile.h ${HARVEST_TARGET}/sndfile/include/sndfile.h &&
 				# 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 &&
 				# hdf5
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hdf5 ${HARVEST_TARGET}/hdf5 &&
 				# 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
 				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/webp ${HARVEST_TARGET}/webp
 		DEPENDS
 )
 endif(BUILD_MODE STREQUAL Release)
 if(BUILD_MODE STREQUAL Debug)
-  add_custom_target(Harvest_Debug_Results
+	add_custom_target(Harvest_Debug_Results
-        # OpenImageIO
+				# OpenImageIO
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_d.lib &&
+		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 &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/openimageio/lib/OpenImageIO_Util.lib ${HARVEST_TARGET}/openimageio/lib/OpenImageIO_Util_d.lib &&
-        # python
+				# ilmbase+openexr
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/python/ ${HARVEST_TARGET}/python/ &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/ilmbase/lib/Half.lib ${HARVEST_TARGET}/openexr/lib/Half_d.lib &&
-        # hdf5
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/ilmbase/lib/Iex-2_2.lib ${HARVEST_TARGET}/openexr/lib/Iex-2_2_d.lib &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hdf5/lib ${HARVEST_TARGET}/hdf5/lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/ilmbase/lib/IexMath-2_2.lib ${HARVEST_TARGET}/openexr/lib/IexMath-2_2_d.lib &&
-        # numpy
+				${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}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}d.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}d.tar.gz &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/ilmbase/lib/Imath-2_2.lib ${HARVEST_TARGET}/openexr/lib/Imath-2_2_d.lib &&
-        # python
+				${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}/python${PYTHON_SHORT_VERSION_NO_DOTS}_d.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_d.tar.gz
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/lib/IlmImfUtil-2_2.lib ${HARVEST_TARGET}/openexr/lib/IlmImfUtil-2_2_d.lib &&
-    DEPENDS Package_Python
+				# opencollada
-  )
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/buffer.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/buffer_d.lib &&
-endif()
+				${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
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}d.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}d.tar.gz &&
 				# python
 				${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_d.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_d.tar.gz
 		DEPENDS Package_Python
 )
 endif(BUILD_MODE STREQUAL Debug)
 else(WIN32)
 function(harvest from to)
-  set(pattern "")
+	set(pattern "")
-  foreach(f ${ARGN})
+	foreach(f ${ARGN})
-    set(pattern ${f})
+		set(pattern ${f})
-  endforeach()
+	endforeach()
-  if(pattern STREQUAL "")
+	if(pattern STREQUAL "")
-    get_filename_component(dirpath ${to} DIRECTORY)
+		get_filename_component(dirpath ${to} DIRECTORY)
-    get_filename_component(filename ${to} NAME)
+		get_filename_component(filename ${to} NAME)
-    install(
+		install(
-      FILES ${LIBDIR}/${from}
+			FILES ${LIBDIR}/${from}
-      DESTINATION ${HARVEST_TARGET}/${dirpath}
+			DESTINATION ${HARVEST_TARGET}/${dirpath}
-      RENAME ${filename})
+			RENAME ${filename})
-  else()
+	else()
-    install(
+		install(
-      DIRECTORY ${LIBDIR}/${from}/
+			DIRECTORY ${LIBDIR}/${from}/
-      DESTINATION ${HARVEST_TARGET}/${to}
+			DESTINATION ${HARVEST_TARGET}/${to}
-      USE_SOURCE_PERMISSIONS
+			USE_SOURCE_PERMISSIONS
-      FILES_MATCHING PATTERN ${pattern}
+			FILES_MATCHING PATTERN ${pattern}
-      PATTERN "pkgconfig" EXCLUDE
+			PATTERN "pkgconfig" EXCLUDE
-      PATTERN "cmake" EXCLUDE
+			PATTERN "cmake" EXCLUDE
-      PATTERN "__pycache__" EXCLUDE
+			PATTERN "clang" EXCLUDE
-      PATTERN "tests" EXCLUDE)
+			PATTERN "__pycache__" EXCLUDE
-  endif()
+			PATTERN "tests" EXCLUDE)
 	endif()
 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")
@@ -128,37 +223,17 @@ harvest(jemalloc/lib jemalloc/lib "*.a")
 harvest(jpg/include jpeg/include "*.h")
 harvest(jpg/lib jpeg/lib "libjpeg.a")
 harvest(lame/lib ffmpeg/lib "*.a")
 harvest(clang/bin llvm/bin "clang-format")
 harvest(clang/include llvm/include "*")
 harvest(llvm/include llvm/include "*")
 harvest(llvm/bin llvm/bin "llvm-config")
 harvest(llvm/lib llvm/lib "libLLVM*.a")
 if(APPLE)
  harvest(openmp/lib openmp/lib "*")
  harvest(openmp/include openmp/include "*.h")
 endif()
 harvest(ogg/lib ffmpeg/lib "*.a")
 harvest(openal/include openal/include "*.h")
 if(UNIX AND NOT APPLE)
-  harvest(openal/lib openal/lib "*.a")
+	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")
@@ -166,12 +241,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")
@@ -181,6 +257,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")
@@ -196,8 +273,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")
 harvest(embree/include embree/include "*.h")
 harvest(embree/lib embree/lib "*.a")
-endif()
+endif(WIN32)
--- a/build_files/build_environment/cmake/hdf5.cmake
+++ b/build_files/build_environment/cmake/hdf5.cmake
@@ -17,18 +17,18 @@
 # ***** END GPL LICENSE BLOCK *****
 set(HDF5_EXTRA_ARGS
-  -DHDF5_ENABLE_THREADSAFE=Off
+	-DHDF5_ENABLE_THREADSAFE=Off
-  -DHDF5_BUILD_CPP_LIB=Off
+	-DHDF5_BUILD_CPP_LIB=Off
-  -DBUILD_TESTING=Off
+	-DBUILD_TESTING=Off
-  -DHDF5_BUILD_TOOLS=Off
+	-DHDF5_BUILD_TOOLS=Off
-  -DHDF5_BUILD_EXAMPLES=Off
+	-DHDF5_BUILD_EXAMPLES=Off
-  -DHDF5_BUILD_HL_LIB=On
+	-DHDF5_BUILD_HL_LIB=On
-  -DBUILD_STATIC_CRT_LIBS=On
+	-DBUILD_STATIC_CRT_LIBS=On
-  -DBUILD_SHARED_LIBS=On
+	-DBUILD_SHARED_LIBS=On
 )
 if(WIN32)
-  set(HDF5_PATCH ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/hdf5/src/external_hdf5 < ${PATCH_DIR}/hdf5.diff)
+	set(HDF5_PATCH ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/hdf5/src/external_hdf5 < ${PATCH_DIR}/hdf5.diff)
 endif()
 ExternalProject_Add(external_hdf5
--- a/build_files/build_environment/cmake/hidapi.cmake
+++ b/build_files/build_environment/cmake/hidapi.cmake
@@ -19,11 +19,11 @@
 set(HIDAPI_EXTRA_ARGS)
 ExternalProject_Add(external_hidapi
-  URL ${HIDAPI_URI}
+	URL ${HIDAPI_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${HIDAPI_HASH}
+	URL_HASH MD5=${HIDAPI_HASH}
-  PREFIX ${BUILD_DIR}/hidapi
+	PREFIX ${BUILD_DIR}/hidapi
-  PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_hidapi.txt   ${BUILD_DIR}/hidapi/src/external_hidapi/cmakelists.txt && ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/hidapi/src/external_hidapi < ${PATCH_DIR}/hidapi.diff
+	PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_hidapi.txt	${BUILD_DIR}/hidapi/src/external_hidapi/cmakelists.txt && ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/hidapi/src/external_hidapi < ${PATCH_DIR}/hidapi.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/hidapi -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${HIDAPI_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/hidapi -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${HIDAPI_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/hidapi
+	INSTALL_DIR ${LIBDIR}/hidapi
 )
--- a/build_files/build_environment/cmake/iconv.cmake
+++ b/build_files/build_environment/cmake/iconv.cmake
@@ -19,23 +19,16 @@
 set(ICONV_EXTRA_ARGS)
 ExternalProject_Add(external_iconv
-  URL ${ICONV_URI}
+	URL ${ICONV_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${ICONV_HASH}
+	URL_HASH MD5=${ICONV_HASH}
-  PREFIX ${BUILD_DIR}/iconv
+	PREFIX ${BUILD_DIR}/iconv
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && ${CONFIGURE_COMMAND} --enable-static --prefix=${mingw_LIBDIR}/iconv
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && ${CONFIGURE_COMMAND} --enable-static --prefix=${mingw_LIBDIR}/iconv
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && make -j${MAKE_THREADS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && make install
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && make install
-  INSTALL_DIR ${LIBDIR}/iconv
+	INSTALL_DIR ${LIBDIR}/iconv
 )
 if(MSVC)
-  set_target_properties(external_iconv PROPERTIES FOLDER Mingw)
+	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
@@ -17,42 +17,19 @@
 # ***** END GPL LICENSE BLOCK *****
 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_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/jemalloc.cmake
+++ b/build_files/build_environment/cmake/jemalloc.cmake
@@ -17,12 +17,12 @@
 # ***** END GPL LICENSE BLOCK *****
 ExternalProject_Add(external_jemalloc
-  URL ${JEMALLOC_URI}
+	URL ${JEMALLOC_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${JEMALLOC_HASH}
+	URL_HASH MD5=${JEMALLOC_HASH}
-  PREFIX ${BUILD_DIR}/jemalloc
+	PREFIX ${BUILD_DIR}/jemalloc
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/jemalloc --disable-shared --enable-static --with-pic
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/jemalloc --disable-shared --enable-static --with-pic
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ && make -j${MAKE_THREADS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ && make install
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/jemalloc/src/external_jemalloc/ && make install
-  INSTALL_DIR ${LIBDIR}/jemalloc
+	INSTALL_DIR ${LIBDIR}/jemalloc
 )
--- a/build_files/build_environment/cmake/jpeg.cmake
+++ b/build_files/build_environment/cmake/jpeg.cmake
@@ -17,49 +17,49 @@
 # ***** END GPL LICENSE BLOCK *****
 if(WIN32)
-  # cmake for windows
+	# 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
+	ExternalProject_Add(external_jpeg
-    URL ${JPEG_URI}
+		URL ${JPEG_URI}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH MD5=${JPEG_HASH}
+		URL_HASH MD5=${JPEG_HASH}
-    PREFIX ${BUILD_DIR}/jpg
+		PREFIX ${BUILD_DIR}/jpg
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
+		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
-    INSTALL_DIR ${LIBDIR}/jpg
+		INSTALL_DIR ${LIBDIR}/jpg
-  )
+	)
-  if(BUILD_MODE STREQUAL Debug)
+	if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_jpeg after_install
+		ExternalProject_Add_Step(external_jpeg after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpegd${LIBEXT}  ${LIBDIR}/jpg/lib/jpeg${LIBEXT}
+			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpegd${LIBEXT}  ${LIBDIR}/jpg/lib/jpeg${LIBEXT}
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
-  if(BUILD_MODE STREQUAL Release)
+	if(BUILD_MODE STREQUAL Release)
-    set(JPEG_LIBRARY jpeg-static${LIBEXT})
+		set(JPEG_LIBRARY jpeg-static${LIBEXT})
-  else()
+	else()
-    set(JPEG_LIBRARY jpeg-staticd${LIBEXT})
+		set(JPEG_LIBRARY jpeg-staticd${LIBEXT})
-  endif()
+	endif()
 else(WIN32)
-  # autoconf for unix
+	# autoconf for unix
-  if(APPLE)
+	if(APPLE)
-    set(JPEG_EXTRA_ARGS --host x86_64-apple-darwin --with-jpeg8)
+		set(JPEG_EXTRA_ARGS --host x86_64-apple-darwin --with-jpeg8)
-  else()
+	else()
-    set(JPEG_EXTRA_ARGS --with-jpeg8)
+		set(JPEG_EXTRA_ARGS --with-jpeg8)
-  endif()
+	endif()
-  ExternalProject_Add(external_jpeg
+	ExternalProject_Add(external_jpeg
-    URL ${JPEG_URI}
+		URL ${JPEG_URI}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH MD5=${JPEG_HASH}
+		URL_HASH MD5=${JPEG_HASH}
-    CONFIGURE_COMMAND ${CONFIGURE_ENV} && autoreconf -fiv && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/jpg NASM=yasm ${JPEG_EXTRA_ARGS}
+		CONFIGURE_COMMAND ${CONFIGURE_ENV} && autoreconf -fiv && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/jpg NASM=yasm ${JPEG_EXTRA_ARGS}
-    BUILD_IN_SOURCE 1
+		BUILD_IN_SOURCE 1
-    BUILD_COMMAND ${CONFIGURE_ENV} && make install
+		BUILD_COMMAND ${CONFIGURE_ENV} && make install
-    PREFIX ${BUILD_DIR}/jpg
+		PREFIX ${BUILD_DIR}/jpg
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
+		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
-    INSTALL_DIR ${LIBDIR}/jpg
+		INSTALL_DIR ${LIBDIR}/jpg
-  )
+	)
-  set(JPEG_LIBRARY libjpeg${LIBEXT})
+	set(JPEG_LIBRARY libjpeg${LIBEXT})
 endif(WIN32)
--- a/build_files/build_environment/cmake/lame.cmake
+++ b/build_files/build_environment/cmake/lame.cmake
@@ -18,30 +18,30 @@
 set(LAME_EXTRA_ARGS)
 if(MSVC)
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
-  set(LAME_EXTRA_ARGS CFLAGS=-msse)
+	set(LAME_EXTRA_ARGS CFLAGS=-msse)
-  endif()
+	endif()
 endif()
 ExternalProject_Add(external_lame
-  URL ${LAME_URI}
+	URL ${LAME_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${LAME_HASH}
+	URL_HASH MD5=${LAME_HASH}
-  PREFIX ${BUILD_DIR}/lame
+	PREFIX ${BUILD_DIR}/lame
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/lame --disable-shared --enable-static ${LAME_EXTRA_ARGS}
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/lame --disable-shared --enable-static ${LAME_EXTRA_ARGS}
-    --enable-export=full
+		--enable-export=full
-    --with-fileio=sndfile
+		--with-fileio=sndfile
-    --without-vorbis
+		--without-vorbis
-    --with-pic
+		--with-pic
-    --disable-mp3x
+		--disable-mp3x
-    --disable-mp3rtp
+		--disable-mp3rtp
-    --disable-gtktest
+		--disable-gtktest
-    --disable-frontend
+		--enable-export=full
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && make -j${MAKE_THREADS}
+	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_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && make install
-  INSTALL_DIR ${LIBDIR}/lame
+	INSTALL_DIR ${LIBDIR}/lame
 )
 if(MSVC)
-  set_target_properties(external_lame PROPERTIES FOLDER Mingw)
+	set_target_properties(external_lame PROPERTIES FOLDER Mingw)
 endif()
--- 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
@@ -17,42 +17,45 @@
 # ***** END GPL LICENSE BLOCK *****
 set(LLVM_EXTRA_ARGS
-  -DLLVM_USE_CRT_RELEASE=MT
+	-DLLVM_USE_CRT_RELEASE=MT
-  -DLLVM_USE_CRT_DEBUG=MTd
+	-DLLVM_USE_CRT_DEBUG=MTd
-  -DLLVM_INCLUDE_TESTS=OFF
+	-DLLVM_INCLUDE_TESTS=OFF
-  -DLLVM_TARGETS_TO_BUILD=X86
+	-DLLVM_TARGETS_TO_BUILD=X86
-  -DLLVM_INCLUDE_EXAMPLES=OFF
+	-DLLVM_INCLUDE_EXAMPLES=OFF
-  -DLLVM_ENABLE_TERMINFO=OFF
+	-DLLVM_ENABLE_TERMINFO=OFF
 )
 if(WIN32)
-  set(LLVM_GENERATOR "Ninja")
+	set(LLVM_GENERATOR "NMake Makefiles")
 else()
-  set(LLVM_GENERATOR "Unix Makefiles")
+	set(LLVM_GENERATOR "Unix Makefiles")
 endif()
 # short project name due to long filename issues on windows
 ExternalProject_Add(ll
-  URL ${LLVM_URI}
+	URL ${LLVM_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${LLVM_HASH}
+	URL_HASH MD5=${LLVM_HASH}
-  CMAKE_GENERATOR ${LLVM_GENERATOR}
+	CMAKE_GENERATOR ${LLVM_GENERATOR}
-  PREFIX ${BUILD_DIR}/ll
+	PREFIX ${BUILD_DIR}/ll
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/llvm ${DEFAULT_CMAKE_FLAGS} ${LLVM_EXTRA_ARGS}
+	PATCH_COMMAND ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/ll/src/ll < ${PATCH_DIR}/llvm-alloca-fix.diff
-  INSTALL_DIR ${LIBDIR}/llvm
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/llvm ${DEFAULT_CMAKE_FLAGS} ${LLVM_EXTRA_ARGS}
 	INSTALL_DIR ${LIBDIR}/llvm
 )
-if(MSVC)
+if (MSVC)
-  if(BUILD_MODE STREQUAL Release)
+	if (BUILD_MODE STREQUAL Release)
-    set(LLVM_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/ ${HARVEST_TARGET}/llvm/ )
+		set(LLVM_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/ ${HARVEST_TARGET}/llvm/ )
-  else()
+	else()
-    set(LLVM_HARVEST_COMMAND
+		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/include/ ${HARVEST_TARGET}/llvm/debug/include/
+				${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
+	endif()
-    COMMAND ${LLVM_HARVEST_COMMAND}
+	ExternalProject_Add_Step(ll after_install
-    DEPENDEES mkdir update patch download configure build install
+		COMMAND ${LLVM_HARVEST_COMMAND}
-  )
+		DEPENDEES mkdir update patch download configure build install
 	)
 endif()
--- a/build_files/build_environment/cmake/lzma.cmake
+++ b/build_files/build_environment/cmake/lzma.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 *****
 set(LZMA_PATCH_CMD echo .)
 ExternalProject_Add(external_lzma
  URL ${LZMA_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
 )
--- a/build_files/build_environment/cmake/numpy.cmake
+++ b/build_files/build_environment/cmake/numpy.cmake
@@ -17,50 +17,41 @@
 # ***** END GPL LICENSE BLOCK *****
 if(MSVC)
-  if(BUILD_MODE STREQUAL Debug)
+	if(BUILD_MODE STREQUAL Debug)
-    set(NUMPY_DIR_POSTFIX -pydebug)
+		set(NUMPY_DIR_POSTFIX -pydebug)
-    set(NUMPY_ARCHIVE_POSTFIX d)
+		set(NUMPY_ARCHIVE_POSTFIX d)
-    set(NUMPY_BUILD_OPTION --debug)
+		set(NUMPY_BUILD_OPTION --debug)
-  else()
+	else()
-    set(NUMPY_DIR_POSTFIX)
+		set(NUMPY_DIR_POSTFIX)
-    set(NUMPY_ARCHIVE_POSTFIX)
+		set(NUMPY_ARCHIVE_POSTFIX)
-    set(NUMPY_BUILD_OPTION)
+		set(NUMPY_BUILD_OPTION)
-  endif()
+	endif(BUILD_MODE STREQUAL Debug)
 endif()
 set(NUMPY_POSTFIX)
 if(WIN32)
-  set(NUMPY_INSTALL
+	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 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 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 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_INSTALL echo .)
-  set(NUMPY_PATCH echo .)
+	set(NUMPY_PATCH echo .)
 endif()
 ExternalProject_Add(external_numpy
-  URL ${NUMPY_URI}
+	URL ${NUMPY_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${NUMPY_HASH}
+	URL_HASH MD5=${NUMPY_HASH}
-  PREFIX ${BUILD_DIR}/numpy
+	PREFIX ${BUILD_DIR}/numpy
-  PATCH_COMMAND ${NUMPY_PATCH}
+	PATCH_COMMAND ${NUMPY_PATCH}
-  CONFIGURE_COMMAND ""
+	CONFIGURE_COMMAND ""
-  LOG_BUILD 1
+	LOG_BUILD 1
-  BUILD_COMMAND ${PYTHON_BINARY} ${BUILD_DIR}/numpy/src/external_numpy/setup.py build ${NUMPY_BUILD_OPTION} install --old-and-unmanageable
+	BUILD_COMMAND ${PYTHON_BINARY} ${BUILD_DIR}/numpy/src/external_numpy/setup.py build ${NUMPY_BUILD_OPTION} install --old-and-unmanageable
-  INSTALL_COMMAND ${NUMPY_INSTALL}
+	INSTALL_COMMAND ${NUMPY_INSTALL}
 )
-if(WIN32)
+add_dependencies(external_numpy Make_Python_Environment)
  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/ogg.cmake
+++ b/build_files/build_environment/cmake/ogg.cmake
@@ -17,16 +17,16 @@
 # ***** END GPL LICENSE BLOCK *****
 ExternalProject_Add(external_ogg
-  URL ${OGG_URI}
+	URL ${OGG_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH SHA256=${OGG_HASH}
+	URL_HASH SHA256=${OGG_HASH}
-  PREFIX ${BUILD_DIR}/ogg
+	PREFIX ${BUILD_DIR}/ogg
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ogg --disable-shared --enable-static
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ogg --disable-shared --enable-static
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && make -j${MAKE_THREADS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && make install
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ogg/src/external_ogg/ && make install
-  INSTALL_DIR ${LIBDIR}/ogg
+	INSTALL_DIR ${LIBDIR}/ogg
 )
 if(MSVC)
-  set_target_properties(external_ogg PROPERTIES FOLDER Mingw)
+	set_target_properties(external_ogg PROPERTIES FOLDER Mingw)
 endif()
--- a/build_files/build_environment/cmake/openal.cmake
+++ b/build_files/build_environment/cmake/openal.cmake
@@ -17,51 +17,26 @@
 # ***** END GPL LICENSE BLOCK *****
 if(BUILD_MODE STREQUAL Release)
-  set(OPENAL_EXTRA_ARGS
+	set(OPENAL_EXTRA_ARGS
-    -DALSOFT_UTILS=OFF
+		-DALSOFT_UTILS=Off
-    -DALSOFT_NO_CONFIG_UTIL=ON
+		-DALSOFT_NO_CONFIG_UTIL=On
-    -DALSOFT_EXAMPLES=OFF
+		-DALSOFT_EXAMPLES=Off
-    -DALSOFT_TESTS=OFF
+		-DALSOFT_TESTS=Off
-    -DALSOFT_CONFIG=OFF
+		-DALSOFT_CONFIG=Off
-    -DALSOFT_HRTF_DEFS=OFF
+		-DALSOFT_HRTF_DEFS=Off
-    -DALSOFT_INSTALL=ON
+		-DALSOFT_INSTALL=On
-    -DALSOFT_BACKEND_SNDIO=OFF
+	)
  )
-  if(UNIX)
+	if(UNIX)
-    set(OPENAL_EXTRA_ARGS
+		set(OPENAL_EXTRA_ARGS ${OPENAL_EXTRA_ARGS} -DLIBTYPE=STATIC)
-      ${OPENAL_EXTRA_ARGS}
+	endif()
      -DLIBTYPE=STATIC
    )
  endif()
  if(UNIX AND NOT APPLE)
    # Ensure we have backends for playback.
    set(OPENAL_EXTRA_ARGS
      ${OPENAL_EXTRA_ARGS}
      -DALSOFT_REQUIRE_ALSA=ON
      -DALSOFT_REQUIRE_OSS=ON
      -DALSOFT_REQUIRE_PULSEAUDIO=ON
    )
  endif()
  ExternalProject_Add(external_openal
    URL ${OPENAL_URI}
    DOWNLOAD_DIR ${DOWNLOAD_DIR}
    URL_HASH MD5=${OPENAL_HASH}
    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()
 	ExternalProject_Add(external_openal
 		URL ${OPENAL_URI}
 		DOWNLOAD_DIR ${DOWNLOAD_DIR}
 		URL_HASH MD5=${OPENAL_HASH}
 		PREFIX ${BUILD_DIR}/openal
 		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openal ${DEFAULT_CMAKE_FLAGS} ${OPENAL_EXTRA_ARGS}
 		INSTALL_DIR ${LIBDIR}/openal
 	)
 endif()
--- a/build_files/build_environment/cmake/opencollada.cmake
+++ b/build_files/build_environment/cmake/opencollada.cmake
@@ -16,50 +16,22 @@
 #
 # ***** END GPL LICENSE BLOCK *****
-if(UNIX)
+if(UNIX AND NOT APPLE)
-  set(OPENCOLLADA_EXTRA_ARGS
+	set(OPENCOLLADA_EXTRA_ARGS
-    -DLIBXML2_INCLUDE_DIR=${LIBDIR}/xml2/include/libxml2
+		-DLIBXML2_INCLUDE_DIR=${LIBDIR}/xml2/include/libxml2
-    -DLIBXML2_LIBRARIES=${LIBDIR}/xml2/lib/libxml2.a)
+		-DLIBXML2_LIBRARIES=${LIBDIR}/xml2/lib/libxml2.a)
 endif()
 ExternalProject_Add(external_opencollada
-  URL ${OPENCOLLADA_URI}
+	URL ${OPENCOLLADA_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${OPENCOLLADA_HASH}
+	URL_HASH MD5=${OPENCOLLADA_HASH}
-  PREFIX ${BUILD_DIR}/opencollada
+	PREFIX ${BUILD_DIR}/opencollada
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencollada/src/external_opencollada < ${PATCH_DIR}/opencollada.diff
+	PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencollada/src/external_opencollada < ${PATCH_DIR}/opencollada.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencollada ${DEFAULT_CMAKE_FLAGS} ${OPENCOLLADA_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencollada ${DEFAULT_CMAKE_FLAGS} ${OPENCOLLADA_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/opencollada
+	INSTALL_DIR ${LIBDIR}/opencollada
 )
-if(UNIX)
+if(UNIX AND NOT APPLE)
-  add_dependencies(
+	add_dependencies(external_opencollada external_xml2)
    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,96 +17,54 @@
 # ***** END GPL LICENSE BLOCK *****
 set(OPENCOLORIO_EXTRA_ARGS
-  -DOCIO_BUILD_APPS=OFF
+	-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-  -DOCIO_BUILD_PYGLUE=OFF
+	-DBoost_USE_MULTITHREADED=ON
-  -DOCIO_BUILD_NUKE=OFF
+	-DBoost_USE_STATIC_LIBS=ON
-  -DOCIO_USE_BOOST_PTR=OFF
+	-DBoost_USE_STATIC_RUNTIME=ON
-  -DOCIO_BUILD_STATIC=ON
+	-DBOOST_ROOT=${LIBDIR}/boost
-  -DOCIO_BUILD_SHARED=OFF
+	-DBOOST_INCLUDEDIR=${LIBDIR}/boost/include/boost_1_60/boost
-  -DOCIO_BUILD_TRUELIGHT=OFF
+	-DBoost_NO_SYSTEM_PATHS=ON
-  -DOCIO_BUILD_DOCS=OFF
+	-DBoost_DEBUG=ON
-  -DOCIO_BUILD_PYGLUE=OFF
+	-DBoost_MAJOR_VERSION=1
-  -DOCIO_BUILD_JNIGLUE=OFF
+	-DBoost_MINOR_VERSION=60
-  -DOCIO_STATIC_JNIGLUE=OFF
+	-DOCIO_BUILD_APPS=OFF
 	-DOCIO_BUILD_PYGLUE=OFF
 	-DOCIO_BUILD_NUKE=OFF
 )
 if(WIN32)
-  set(OCIO_PATCH opencolorio_win.diff)
+	set(OPENCOLORIO_EXTRA_ARGS
-  set(OPENCOLORIO_EXTRA_ARGS
+		${OPENCOLORIO_EXTRA_ARGS}
-    ${OPENCOLORIO_EXTRA_ARGS}
+		-DOCIO_USE_BOOST_PTR=ON
-    -DOCIO_BUILD_TESTS=OFF
+		-DOCIO_BUILD_STATIC=OFF
-    -DOCIO_USE_SSE=ON
+		-DOCIO_BUILD_SHARED=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
  )
 else()
-  set(OCIO_PATCH opencolorio.diff)
+	set(OPENCOLORIO_EXTRA_ARGS
-  set(OPENCOLORIO_EXTRA_ARGS
+		${OPENCOLORIO_EXTRA_ARGS}
-    ${OPENCOLORIO_EXTRA_ARGS}
+		-DOCIO_USE_BOOST_PTR=OFF
-  )
+		-DOCIO_BUILD_STATIC=ON
 		-DOCIO_BUILD_SHARED=OFF
 	)
 endif()
 ExternalProject_Add(external_opencolorio
-  URL ${OPENCOLORIO_URI}
+	URL ${OPENCOLORIO_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${OPENCOLORIO_HASH}
+	URL_HASH MD5=${OPENCOLORIO_HASH}
-  PREFIX ${BUILD_DIR}/opencolorio
+	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}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencolorio ${DEFAULT_CMAKE_FLAGS} ${OPENCOLORIO_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/opencolorio
+	INSTALL_DIR ${LIBDIR}/opencolorio
 )
 if(NOT WIN32)
-  add_custom_command(
+	add_custom_command(
-    OUTPUT ${LIBDIR}/opencolorio/lib/libtinyxml.a
+		OUTPUT ${LIBDIR}/opencolorio/lib/libtinyxml.a
-    COMMAND cp ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/libtinyxml.a ${LIBDIR}/opencolorio/lib/libtinyxml.a
+		COMMAND cp ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/libtinyxml.a ${LIBDIR}/opencolorio/lib/libtinyxml.a
-    COMMAND cp ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/libyaml-cpp.a ${LIBDIR}/opencolorio/lib/libyaml-cpp.a
+		COMMAND cp ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/libyaml-cpp.a ${LIBDIR}/opencolorio/lib/libyaml-cpp.a
-  )
+	)
-  add_custom_target(external_opencolorio_extra ALL DEPENDS external_opencolorio ${LIBDIR}/opencolorio/lib/libtinyxml.a)
+	add_custom_target(external_opencolorio_extra ALL DEPENDS external_opencolorio ${LIBDIR}/opencolorio/lib/libtinyxml.a)
 endif()
-add_dependencies(
+add_dependencies(external_opencolorio external_boost)
  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
@@ -17,62 +17,25 @@
 # ***** END GPL LICENSE BLOCK *****
 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_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()
-add_dependencies(
+set(OPENEXR_EXTRA_ARGS
-  external_openexr
+	-DBUILD_SHARED_LIBS=OFF
-  external_zlib
+	-DCMAKE_CXX_STANDARD_LIBRARIES=${OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES}
-  external_ilmbase
+	-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 external_ilmbase)
--- a/build_files/build_environment/cmake/openimageio.cmake
+++ b/build_files/build_environment/cmake/openimageio.cmake
@@ -17,136 +17,116 @@
 # ***** END GPL LICENSE BLOCK *****
 if(BUILD_MODE STREQUAL Release)
-  set(OIIO_TOOLS ON)
+	set(OIIO_TOOLS ON)
 else()
-  set(OIIO_TOOLS OFF)
+	set(OIIO_TOOLS OFF)
 endif()
 if(UNIX AND NOT APPLE)
-  # This causes linking to static pthread libraries which gives link errors.
+	# This causes linking to static pthread libraries which gives link errors.
-  # Since we manually specify library paths it should static link other libs.
+	# Since we manually specify library paths it should static link other libs.
-  set(OPENIMAGEIO_LINKSTATIC -DLINKSTATIC=OFF)
+	set(OPENIMAGEIO_LINKSTATIC -DLINKSTATIC=OFF)
 else()
-  set(OPENIMAGEIO_LINKSTATIC -DLINKSTATIC=ON)
+	set(OPENIMAGEIO_LINKSTATIC -DLINKSTATIC=ON)
 endif()
 if(WIN32)
-  set(PNG_LIBNAME libpng16_static${LIBEXT})
+	set(PNG_LIBNAME libpng16_static${LIBEXT})
-  set(OIIO_SIMD_FLAGS -DUSE_SIMD=sse2 -DOPJ_STATIC=1)
+	set(OIIO_SIMD_FLAGS -DUSE_SIMD=sse2 -DOPJ_STATIC=1)
-  set(OPENJPEG_POSTFIX _msvc)
+	set(OPENJPEG_POSTFIX _msvc)
 else()
-  set(PNG_LIBNAME libpng${LIBEXT})
+	set(PNG_LIBNAME libpng${LIBEXT})
-  set(OIIO_SIMD_FLAGS)
+	set(OIIO_SIMD_FLAGS)
 endif()
-if(WITH_WEBP)
+if (WITH_WEBP)
-  set(WEBP_ARGS
+	set(WEBP_ARGS	-DWEBP_INCLUDE_DIR=${LIBDIR}/webp/include
-    -DWEBP_INCLUDE_DIR=${LIBDIR}/webp/include
+					-DWEBP_LIBRARY=${LIBDIR}/webp/lib/${LIBPREFIX}webp${LIBEXT} )
-    -DWEBP_LIBRARY=${LIBDIR}/webp/lib/${LIBPREFIX}webp${LIBEXT}
+	set(WEBP_DEP external_webp)
  )
  set(WEBP_DEP external_webp)
 endif() 
-if(MSVC)
+if (MSVC)
-  set(OPENJPEG_FLAGS
+set(OPENJPEG_FLAGS -DOPENJPEG_HOME=${LIBDIR}/openjpeg_msvc
-    -DOPENJPEG_HOME=${LIBDIR}/openjpeg_msvc
+				   -DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg_msvc/include/openjpeg-${OPENJPEG_SHORT_VERSION}
-    -DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg_msvc/include/openjpeg-${OPENJPEG_SHORT_VERSION}
+				   -DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg_msvc/lib/openjpeg${LIBEXT}
-    -DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg_msvc/lib/openjp2${LIBEXT}
+				   -DOPENJPEG_LIBRARY_DEBUG=${LIBDIR}/openjpeg_msvc/lib/openjpeg${LIBEXT}
-    -DOPENJPEG_LIBRARY_DEBUG=${LIBDIR}/openjpeg_msvc/lib/openjp2${LIBEXT}
+   )
  )
 else()
-  set(OPENJPEG_FLAGS
+set(OPENJPEG_FLAGS 	-DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg/include/openjpeg-${OPENJPEG_SHORT_VERSION}
-    -DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg/include/openjpeg-${OPENJPEG_SHORT_VERSION}
+					-DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg/lib/${OPENJPEG_LIBRARY}
-    -DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg/lib/${OPENJPEG_LIBRARY}
+	)
  )
 endif()
 set(OPENIMAGEIO_EXTRA_ARGS
-  -DBUILDSTATIC=ON
+	-DBUILDSTATIC=ON
-  ${OPENIMAGEIO_LINKSTATIC}
+	${OPENIMAGEIO_LINKSTATIC}
-  -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/openexr/
+	-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_COMPILER:STRING=${BOOST_COMPILER_STRING}
-  -DBoost_USE_MULTITHREADED=ON
+	-DBoost_USE_MULTITHREADED=ON
-  -DBoost_USE_STATIC_LIBS=ON
+	-DBoost_USE_STATIC_LIBS=ON
-  -DBoost_USE_STATIC_RUNTIME=ON
+	-DBoost_USE_STATIC_RUNTIME=ON
-  -DBOOST_ROOT=${LIBDIR}/boost
+	-DBOOST_ROOT=${LIBDIR}/boost
-  -DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
+	-DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
-  -DBoost_NO_SYSTEM_PATHS=ON
+	-DBoost_NO_SYSTEM_PATHS=ON
-  -OIIO_BUILD_CPP11=ON
+	-OIIO_BUILD_CPP11=ON
-  -DUSE_OPENGL=OFF
+	-DUSE_OPENGL=OFF
-  -DUSE_TBB=OFF
+	-DUSE_TBB=OFF
-  -DUSE_FIELD3D=OFF
+	-DUSE_FIELD3D=OFF
-  -DUSE_QT=OFF
+	-DUSE_QT=OFF
-  -DUSE_PYTHON=OFF
+	-DUSE_PYTHON=OFF
-  -DUSE_GIF=OFF
+	-DUSE_GIF=OFF
-  -DUSE_OPENCV=OFF
+	-DUSE_OPENCV=OFF
-  -DUSE_OPENSSL=OFF
+	-DUSE_OPENSSL=OFF
-  -DUSE_OPENJPEG=ON
+	-DUSE_OPENJPEG=ON
-  -DUSE_FFMPEG=OFF
+	-DUSE_FFMPEG=OFF
-  -DUSE_PTEX=OFF
+	-DUSE_PTEX=OFF
-  -DUSE_FREETYPE=OFF
+	-DUSE_FREETYPE=OFF
-  -DUSE_LIBRAW=OFF
+	-DUSE_LIBRAW=OFF
-  -DUSE_PYTHON=OFF
+	-DUSE_PYTHON=OFF
-  -DUSE_PYTHON3=OFF
+	-DUSE_PYTHON3=OFF
-  -DUSE_OCIO=OFF
+	-DUSE_OCIO=OFF
-  -DUSE_WEBP=${WITH_WEBP}
+	-DOIIO_BUILD_TOOLS=${OIIO_TOOLS}
-  -DOIIO_BUILD_TOOLS=${OIIO_TOOLS}
+	-DOIIO_BUILD_TESTS=OFF
-  -DOIIO_BUILD_TESTS=OFF
+	-DBUILD_TESTING=OFF
-  -DBUILD_TESTING=OFF
+	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include
-  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include
+	-DPNG_LIBRARY=${LIBDIR}/png/lib/${PNG_LIBNAME}
-  -DPNG_LIBRARY=${LIBDIR}/png/lib/${PNG_LIBNAME}
+	-DPNG_PNG_INCLUDE_DIR=${LIBDIR}/png/include
-  -DPNG_PNG_INCLUDE_DIR=${LIBDIR}/png/include
+	-DTIFF_LIBRARY=${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT}
-  -DTIFF_LIBRARY=${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT}
+	-DTIFF_INCLUDE_DIR=${LIBDIR}/tiff/include
-  -DTIFF_INCLUDE_DIR=${LIBDIR}/tiff/include
+	-DJPEG_LIBRARY=${LIBDIR}/jpg/lib/${JPEG_LIBRARY}
-  -DJPEG_LIBRARY=${LIBDIR}/jpg/lib/${JPEG_LIBRARY}
+	-DJPEG_INCLUDE_DIR=${LIBDIR}/jpg/include
-  -DJPEG_INCLUDE_DIR=${LIBDIR}/jpg/include
+	${OPENJPEG_FLAGS}
-  ${OPENJPEG_FLAGS}
+	-DOCIO_PATH=${LIBDIR}/opencolorio/
-  -DOCIO_PATH=${LIBDIR}/opencolorio/
+	-DOpenEXR_USE_STATIC_LIBS=On
-  -DOpenEXR_USE_STATIC_LIBS=On
+	-DOPENEXR_HOME=${LIBDIR}/openexr/
-  -DOPENEXR_HOME=${LIBDIR}/openexr/
+	-DILMBASE_INCLUDE_PATH=${LIBDIR}/ilmbase/
-  -DILMBASE_INCLUDE_PATH=${LIBDIR}/ilmbase/
+	-DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase/
-  -DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase/
+	-DILMBASE_INCLUDE_DIR=${LIBDIR}/ilmbase/include/
-  -DILMBASE_INCLUDE_DIR=${LIBDIR}/ilmbase/include/
+	-DOPENEXR_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${LIBEXT}
-  -DOPENEXR_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath-2_2${LIBEXT}
-  -DOPENEXR_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread-2_2${LIBEXT}
-  -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex-2_2${LIBEXT}
-  -DOPENEXR_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
-  -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
+	-DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf-2_2${LIBEXT}
-  -DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+	-DSTOP_ON_WARNING=OFF
-  -DSTOP_ON_WARNING=OFF
+	${WEBP_FLAGS}
-  ${WEBP_FLAGS}
+	${OIIO_SIMD_FLAGS}
  ${OIIO_SIMD_FLAGS}
 )
 ExternalProject_Add(external_openimageio
-  URL ${OPENIMAGEIO_URI}
+	URL ${OPENIMAGEIO_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${OPENIMAGEIO_HASH}
+	URL_HASH MD5=${OPENIMAGEIO_HASH}
-  PREFIX ${BUILD_DIR}/openimageio
+	PREFIX ${BUILD_DIR}/openimageio
-  PATCH_COMMAND
+	PATCH_COMMAND ${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/src/include < ${PATCH_DIR}/openimageio_gdi.diff &&
-    ${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/src/include < ${PATCH_DIR}/openimageio_gdi.diff &&
+				${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio_staticexr.diff
-    ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio_static_libs.diff
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimageio ${DEFAULT_CMAKE_FLAGS} ${OPENIMAGEIO_EXTRA_ARGS}
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimageio ${DEFAULT_CMAKE_FLAGS} ${OPENIMAGEIO_EXTRA_ARGS}
+	INSTALL_DIR ${LIBDIR}/openimageio
  INSTALL_DIR ${LIBDIR}/openimageio
 )
-add_dependencies(
+add_dependencies(external_openimageio external_png external_zlib external_ilmbase external_openexr external_jpeg external_boost external_tiff external_opencolorio external_openjpeg${OPENJPEG_POSTFIX} ${WEBP_DEP})
  external_openimageio
  external_png external_zlib
  external_ilmbase
  external_openexr
  external_jpeg
  external_boost
  external_tiff
  external_opencolorio
  external_openjpeg${OPENJPEG_POSTFIX}
  ${WEBP_DEP}
 )
 if(NOT WIN32)
-  add_dependencies(
+	add_dependencies(external_openimageio external_opencolorio_extra)
    external_openimageio
    external_opencolorio_extra
  )
 endif()
--- a/build_files/build_environment/cmake/openjpeg.cmake
+++ b/build_files/build_environment/cmake/openjpeg.cmake
@@ -22,43 +22,36 @@
 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})
+	set(OPENJPEG_EXTRA_ARGS ${DEFAULT_CMAKE_FLAGS})
 endif()
 ExternalProject_Add(external_openjpeg
-  URL ${OPENJPEG_URI}
+	URL ${OPENJPEG_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH SHA256=${OPENJPEG_HASH}
+	URL_HASH SHA256=${OPENJPEG_HASH}
-  PREFIX ${BUILD_DIR}/openjpeg
+	PREFIX ${BUILD_DIR}/openjpeg
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build && ${CMAKE_COMMAND} ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF ${BUILD_DIR}/openjpeg/src/external_openjpeg
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build && ${CMAKE_COMMAND} ${OPENJPEG_EXTRA_ARGS} -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openjpeg -DBUILD_SHARED_LIBS=Off -DBUILD_THIRDPARTY=OFF ${BUILD_DIR}/openjpeg/src/external_openjpeg
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build/ && make -j${MAKE_THREADS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build/ && make install
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openjpeg/src/external_openjpeg-build/ && make install
-  INSTALL_DIR ${LIBDIR}/openjpeg
+	INSTALL_DIR ${LIBDIR}/openjpeg
 )
 #on windows ffmpeg wants a mingw build, while oiio needs a msvc build
-if(MSVC)
+if (MSVC)
-  set(OPENJPEG_EXTRA_ARGS ${DEFAULT_CMAKE_FLAGS})
+	set(OPENJPEG_EXTRA_ARGS ${DEFAULT_CMAKE_FLAGS})
-  ExternalProject_Add(external_openjpeg_msvc
+ExternalProject_Add(external_openjpeg_msvc
-    URL ${OPENJPEG_URI}
+	URL ${OPENJPEG_URI}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH SHA256=${OPENJPEG_HASH}
+	URL_HASH SHA256=${OPENJPEG_HASH}
-    PREFIX ${BUILD_DIR}/openjpeg_msvc
+	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
+	INSTALL_DIR ${LIBDIR}/openjpeg_msvc
-  )
+)
  if(BUILD_MODE STREQUAL Release)
    ExternalProject_Add_Step(external_openjpeg_msvc after_install
      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openjpeg_msvc/lib ${HARVEST_TARGET}/openjpeg/lib &&
          ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openjpeg_msvc/include ${HARVEST_TARGET}/openjpeg/include
      DEPENDEES install
    )
  endif()
 endif()
-set(OPENJPEG_LIBRARY libopenjp2${LIBEXT})
+	set(OPENJPEG_LIBRARY libopenjpeg${LIBEXT})
 if(MSVC)
-  set_target_properties(external_openjpeg PROPERTIES FOLDER Mingw)
+	set_target_properties(external_openjpeg PROPERTIES FOLDER Mingw)
-endif()
+endif(MSVC)
--- a/build_files/build_environment/cmake/openmp.cmake
+++ b/build_files/build_environment/cmake/openmp.cmake
@@ -1,33 +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_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id @executable_path/../Resources/lib/libomp.dylib runtime/src/libomp.dylib && make install
  INSTALL_DIR ${LIBDIR}/openmp
 )
 add_dependencies(
  external_openmp
  external_clang
 )
--- a/build_files/build_environment/cmake/opensubdiv.cmake
+++ b/build_files/build_environment/cmake/opensubdiv.cmake
@@ -17,86 +17,55 @@
 # ***** END GPL LICENSE BLOCK *****
 set(OPENSUBDIV_EXTRA_ARGS
-  -DNO_EXAMPLES=ON
+	-DNO_EXAMPLES=ON
-  -DNO_REGRESSION=ON
+	-DNO_REGRESSION=ON
-  -DNO_PYTHON=ON
+	-DNO_PYTHON=ON
-  -DNO_MAYA=ON
+	-DNO_MAYA=ON
-  -DNO_PTEX=ON
+	-DNO_PTEX=ON
-  -DNO_DOC=ON
+	-DNO_DOC=ON
-  -DNO_CLEW=OFF
+	-DNO_CLEW=OFF
-  -DNO_OPENCL=OFF
+	-DNO_OPENCL=OFF
-  -DNO_TUTORIALS=ON
+	-DNO_TUTORIALS=ON
-  -DGLEW_INCLUDE_DIR=${LIBDIR}/glew/include
+	-DGLEW_INCLUDE_DIR=${LIBDIR}/glew/include
-  -DGLEW_LIBRARY=${LIBDIR}/glew/lib/libGLEW${LIBEXT}
+	-DGLEW_LIBRARY=${LIBDIR}/glew/lib/libGLEW${LIBEXT}
-  -DGLFW_INCLUDE_DIR=${LIBDIR}/glfw/include
+	-DGLFW_INCLUDE_DIR=${LIBDIR}/glfw/include
-  -DGLFW_LIBRARIES=${LIBDIR}/glfw/lib/glfw3${LIBEXT}
+	-DGLFW_LIBRARIES=${LIBDIR}/glfw/lib/glfw3${LIBEXT}
 )
 if(WIN32)
-  set(OPENSUBDIV_EXTRA_ARGS
+	#no cuda support for vc15 yet
-    ${OPENSUBDIV_EXTRA_ARGS}
+	if(msvc15)
-    -DTBB_INCLUDE_DIR=${LIBDIR}/tbb/include
+		set(OPENSUBDIV_CUDA ON)
-    -DTBB_LIBRARIES=${LIBDIR}/tbb/lib/tbb_static.lib
+	else()
-    -DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL
+		set(OPENSUBDIV_CUDA ON)
-    -DCLEW_LIBRARY=${LIBDIR}/clew/lib/clew${LIBEXT}
+	endif()
    -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()
 	set(OPENSUBDIV_EXTRA_ARGS
 		${OPENSUBDIV_EXTRA_ARGS}
 		-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
 	)
 else()
-  set(OPENSUBDIV_EXTRA_ARGS
+	set(OPENSUBDIV_EXTRA_ARGS
-    ${OPENSUBDIV_EXTRA_ARGS}
+		${OPENSUBDIV_EXTRA_ARGS}
-    -DNO_CUDA=ON
+		-DNO_CUDA=ON
-    -DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include
+		-DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include
-    -DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL
+		-DCLEW_LIBRARY=${LIBDIR}/clew/lib/static/${LIBPREFIX}clew${LIBEXT}
-    -DCLEW_LIBRARY=${LIBDIR}/clew/lib/static/${LIBPREFIX}clew${LIBEXT}
+	)
  )
 endif()
 ExternalProject_Add(external_opensubdiv
-  URL ${OPENSUBDIV_URI}
+	URL ${OPENSUBDIV_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${OPENSUBDIV_Hash}
+	URL_HASH MD5=${OPENSUBDIV_Hash}
-  PREFIX ${BUILD_DIR}/opensubdiv
+	PREFIX ${BUILD_DIR}/opensubdiv
-  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/opensubdiv/src/external_opensubdiv < ${PATCH_DIR}/opensubdiv.diff
+	PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/opensubdiv/src/external_opensubdiv < ${PATCH_DIR}/opensubdiv.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opensubdiv -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${OPENSUBDIV_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opensubdiv -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${OPENSUBDIV_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/opensubdiv
+	INSTALL_DIR ${LIBDIR}/opensubdiv
 )
-if(WIN32)
+add_dependencies(external_opensubdiv external_glew external_glfw external_clew external_cuew)
  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
@@ -17,86 +17,55 @@
 # ***** END GPL LICENSE BLOCK *****
 if(BUILD_MODE STREQUAL Debug)
-  set(BLOSC_POST _d)
+	set(BLOSC_POST _d)
 endif()
 set(OPENVDB_EXTRA_ARGS
-  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
+	-DILMBASE_HOME=${LIBDIR}/ilmbase/
-  -DBoost_USE_MULTITHREADED=ON
+	-DILMBASE_CUSTOM=ON
-  -DBoost_USE_STATIC_LIBS=ON
+	-DILMBASE_CUSTOM_LIBRARIES=Half;Imath-2_2;IlmThread-2_2;Iex-2_2
-  -DBoost_USE_STATIC_RUNTIME=ON
+	-DILMBASE_INCLUDE_DIR=${LIBDIR}/ilmbase/include/
-  -DBOOST_ROOT=${LIBDIR}/boost
+	-DILMBASE_HALF_LIBRARIES=${LIBDIR}/ilmbase/lib/Half${LIBEXT}
-  -DBoost_NO_SYSTEM_PATHS=ON
+	-DILMBASE_IMATH_LIBRARIES=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath-2_2${LIBEXT}
-  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+	-DILMBASE_ILMTHREAD_LIBRARIES=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread-2_2${LIBEXT}
-  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+	-DILMBASE_IEX_LIBRARIES=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex-2_2${LIBEXT}
-  -DBLOSC_INCLUDE_DIR=${LIBDIR}/blosc/include/
+	-DOPENEXR_HOME=${LIBDIR}/openexr/
-  -DBLOSC_blosc_LIBRARY=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
+	-DOPENEXR_USE_STATIC_LIBS=ON
-  -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF
+	-DOPENEXR_CUSTOM=ON
-  -DOPENVDB_BUILD_UNITTESTS=Off
+	-DOPENEXR_CUSTOM_LIBRARY=IlmImf-2_2
-  -DOPENVDB_BUILD_PYTHON_MODULE=Off
+	-DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
-  -DGLEW_LOCATION=${LIBDIR}/glew/
+	-DOPENEXR_ILMIMF_LIBRARIES=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf-2_2${LIBEXT}
-  -DBLOSC_LOCATION=${LIBDIR}/blosc/
+	-DTBB_ROOT_DIR=${LIBDIR}/tbb/
-  -DTBB_LOCATION=${LIBDIR}/tbb/
+	-DTBB_INCLUDE_DIRS=${LIBDIR}/tbb/include
-  -DTBB_ROOT=${LIBDIR}/tbb/
+	-DTBB_LIBRARY=${LIBDIR}/tbb/lib/tbb_static${LIBEXT}
-  -DOPENEXR_LOCATION=${LIBDIR}/openexr
+	-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-  -DILMBASE_LOCATION=${LIBDIR}/ilmbase
+	-DBoost_USE_MULTITHREADED=ON
-  -DIlmbase_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DBoost_USE_STATIC_LIBS=ON
-  -DIlmbase_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DBoost_USE_STATIC_RUNTIME=ON
-  -DIlmbase_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DBOOST_ROOT=${LIBDIR}/boost
-  -DOpenexr_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+	-DBoost_NO_SYSTEM_PATHS=ON
-  -DTBB_LIBRARYDIR=${LIBDIR}/tbb/lib
+	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-  -DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
+	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-  -DTBB_LIBRARY_PATH=${LIBDIR}/tbb/lib
+	-DWITH_BLOSC=ON
 	-DBLOSC_INCLUDE_DIR=${LIBDIR}/blosc/include/
 	-DBLOSC_LIBRARY=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
 )
-if(WIN32)
+set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS})
-  # Namespaces seem to be buggy and cause linker errors due to things not
+
-  # being in the correct namespace
+# CMake script for OpenVDB based on https://raw.githubusercontent.com/diekev/openvdb-cmake/master/CMakeLists.txt
-  # needs to link pthreads due to it being a blosc dependency
+# can't be in external_openvdb because of how the includes are setup.
  set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
    -DOPENEXR_NAMESPACE_VERSIONING=OFF
    -DEXTRA_LIBS:FILEPATH=${LIBDIR}/pthreads/lib/pthreadVC3.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()
 ExternalProject_Add(openvdb
-  URL ${OPENVDB_URI}
+	URL ${OPENVDB_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${OPENVDB_HASH}
+	URL_HASH MD5=${OPENVDB_HASH}
-  PREFIX ${BUILD_DIR}/openvdb
+	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_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openvdb ${DEFAULT_CMAKE_FLAGS} ${OPENVDB_EXTRA_ARGS}
+						${CMAKE_COMMAND} -E copy_directory ${PATCH_DIR}/cmake/  ${BUILD_DIR}/openvdb/src/openvdb/cmake/ &&
-  INSTALL_DIR ${LIBDIR}/openvdb
+						${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
 )
-add_dependencies(
+add_dependencies(openvdb external_tbb external_boost external_ilmbase external_openexr external_zlib external_blosc)
  openvdb
  external_tbb
  external_boost
  external_ilmbase
  external_openexr
  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
@@ -17,23 +17,22 @@
 # ***** END GPL LICENSE BLOCK *****
 if(WIN32)
-  option(ENABLE_MINGW64 "Enable building of ffmpeg/iconv/libsndfile/lapack/fftw3 by installing mingw64" ON)
+	option(ENABLE_MINGW64 "Enable building of ffmpeg/iconv/libsndfile/lapack/fftw3 by installing mingw64" ON)
 endif()
 option(WITH_WEBP "Enable building of oiio with webp support" OFF)
 option(WITH_EMBREE "Enable building of Embree" OFF)
 set(MAKE_THREADS 1 CACHE STRING "Number of threads to run make with")
 if(NOT BUILD_MODE)
-  set(BUILD_MODE "Release")
+	set(BUILD_MODE "Release")
-  message(STATUS "Build type not specified: defaulting to a release build.")
+	message(STATUS "Build type not specified: defaulting to a release build.")
 endif()
-message("BuildMode = ${BUILD_MODE}")
+Message("BuildMode = ${BUILD_MODE}")
 if(BUILD_MODE STREQUAL "Debug")
-  set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Debug)
+	set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Debug)
-else(BUILD_MODE STREQUAL "Debug")
+ELSE(BUILD_MODE STREQUAL "Debug")
-  set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Release)
+	set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Release)
-endif()
+ENDIF(BUILD_MODE STREQUAL "Debug")
 option(DOWNLOAD_DIR "Path for downloaded files" ${CMAKE_CURRENT_SOURCE_DIR}/downloads)
 file(TO_CMAKE_PATH ${DOWNLOAD_DIR} DOWNLOAD_DIR)
@@ -46,173 +45,166 @@ message("PATCH_DIR = ${PATCH_DIR}")
 message("BUILD_DIR = ${BUILD_DIR}")
 if(WIN32)
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    set(PATCH_CMD ${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/patch.exe)
+		set(PATCH_CMD ${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/patch.exe)
-  else()
+	else()
-    set(PATCH_CMD ${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/patch.exe)
+		set(PATCH_CMD ${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/patch.exe)
-  endif()
+	endif()
-  set(LIBEXT ".lib")
+	set(LIBEXT ".lib")
-  set(LIBPREFIX "")
+	set(LIBPREFIX "")
-  # For OIIO and OSL
+	# For OIIO and OSL
-  set(COMMON_DEFINES /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS)
+	set(COMMON_DEFINES /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS)
-  if(MSVC_VERSION GREATER 1909)
+	# TODO FIXME highly MSVC specific
-    set(COMMON_MSVC_FLAGS "/Wv:18") #some deps with warnings as error aren't quite ready for dealing with the new 2017 warnings.
+	if(WITH_OPTIMIZED_DEBUG)
-  endif()
+		set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(COMMON_MSVC_FLAGS "${COMMON_MSVC_FLAGS} /bigobj")
+	else()
-  if(WITH_OPTIMIZED_DEBUG)
+		set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd /Zi /Ob0 /Od /RTC1 /D_DEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+	endif()
-  else()
+	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_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_RELEASE "/MT /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  endif()
+	set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
  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")
-  if(WITH_OPTIMIZED_DEBUG)
+	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()
+	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()
+	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_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 ${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_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 ${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_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_FLAGS)
-  set(PLATFORM_CXX_FLAGS)
+	set(PLATFORM_CXX_FLAGS)
-  set(PLATFORM_CMAKE_FLAGS)
+	set(PLATFORM_CMAKE_FLAGS)
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    set(MINGW_PATH ${DOWNLOAD_DIR}/mingw/mingw64)
+		set(MINGW_PATH ${DOWNLOAD_DIR}/mingw/mingw64)
-    set(MINGW_SHELL ming64sh.cmd)
+		set(MINGW_SHELL ming64sh.cmd)
-    set(PERL_SHELL ${DOWNLOAD_DIR}/perl/portableshell.bat)
+		set(PERL_SHELL ${DOWNLOAD_DIR}/perl/portableshell.bat)
-    set(MINGW_HOST x86_64-w64-mingw32)
+		set(MINGW_HOST x86_64-w64-mingw32)
-  else()
+	else()
-    set(MINGW_PATH ${DOWNLOAD_DIR}/mingw/mingw32)
+		set(MINGW_PATH ${DOWNLOAD_DIR}/mingw/mingw32)
-    set(MINGW_SHELL ming32sh.cmd)
+		set(MINGW_SHELL ming32sh.cmd)
-    set(PERL_SHELL ${DOWNLOAD_DIR}/perl32/portableshell.bat)
+		set(PERL_SHELL ${DOWNLOAD_DIR}/perl32/portableshell.bat)
-    set(MINGW_HOST i686-w64-mingw32)
+		set(MINGW_HOST i686-w64-mingw32)
-  endif()
+	endif()
-  set(CONFIGURE_ENV
+	set(CONFIGURE_ENV
-    cd ${MINGW_PATH} &&
+		cd ${MINGW_PATH} &&
-    call ${MINGW_SHELL} &&
+		call ${MINGW_SHELL} &&
-    call ${PERL_SHELL} &&
+		call ${PERL_SHELL} &&
-    set path &&
+		set path &&
-    set CFLAGS=-g &&
+		set CFLAGS=-g &&
-    set LDFLAGS=-Wl,--as-needed -static-libgcc
+		set LDFLAGS=-Wl,--as-needed -static-libgcc
-  )
+	)
-  set(CONFIGURE_ENV_NO_PERL
+	set(CONFIGURE_ENV_NO_PERL
-    cd ${MINGW_PATH} &&
+		cd ${MINGW_PATH} &&
-    call ${MINGW_SHELL} &&
+		call ${MINGW_SHELL} &&
-    set path &&
+		set path &&
-    set CFLAGS=-g &&
+		set CFLAGS=-g &&
-    set LDFLAGS=-Wl,--as-needed -static-libgcc
+		set LDFLAGS=-Wl,--as-needed -static-libgcc
-  )
+	)
-  set(CONFIGURE_COMMAND sh ./configure)
+	set(CONFIGURE_COMMAND sh ./configure)
-  set(CONFIGURE_COMMAND_NO_TARGET ${CONFIGURE_COMMAND})
+	set(CONFIGURE_COMMAND_NO_TARGET ${CONFIGURE_COMMAND})
 else()
-  set(PATCH_CMD patch)
+	set(PATCH_CMD patch)
-  set(LIBEXT ".a")
+	set(LIBEXT ".a")
-  set(LIBPREFIX "lib")
+	set(LIBPREFIX "lib")
-  if(APPLE)
+	if(APPLE)
-    # Let's get the current Xcode dir, to support xcode-select
+# Let's get the current Xcode dir, to support xcode-select
-    execute_process(
+  	    	execute_process(
-      COMMAND xcode-select --print-path
+			COMMAND xcode-select --print-path
-      OUTPUT_VARIABLE XCODE_DEV_PATH OUTPUT_STRIP_TRAILING_WHITESPACE
+			OUTPUT_VARIABLE XCODE_DEV_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
-    )
+		set(OSX_ARCHITECTURES x86_64)
-    set(OSX_ARCHITECTURES x86_64)
+		set(OSX_DEPLOYMENT_TARGET 10.9)
-    set(OSX_DEPLOYMENT_TARGET 10.11)
+		set(OSX_SDK_VERSION 10.12)
-    set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
+		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}")
+		set(PLATFORM_CFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}")
-    set(PLATFORM_CXXFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++")
+		set(PLATFORM_CXXFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++")
-    set(PLATFORM_LDFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}")
+		set(PLATFORM_LDFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}")
-    set(PLATFORM_BUILD_TARGET --build=x86_64-apple-darwin15.0.0) # OS X 10.11
+		set(PLATFORM_BUILD_TARGET --build=x86_64-apple-darwin13.0.0) # OS X 10.9
-    set(PLATFORM_CMAKE_FLAGS
+		set(PLATFORM_CMAKE_FLAGS
-      -DCMAKE_OSX_ARCHITECTURES:STRING=${OSX_ARCHITECTURES}
+			 -DCMAKE_OSX_ARCHITECTURES:STRING=${OSX_ARCHITECTURES}
-      -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_DEPLOYMENT_TARGET}
+			 -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_DEPLOYMENT_TARGET}
-      -DCMAKE_OSX_SYSROOT:PATH=${OSX_SYSROOT}
+			 -DCMAKE_OSX_SYSROOT:PATH=${OSX_SYSROOT}
-    )
+		)
-  else()
+	else()
-    set(PLATFORM_CFLAGS "-fPIC")
+		set(PLATFORM_CFLAGS "-fPIC")
-    set(PLATFORM_CXXFLAGS "-std=c++11 -fPIC")
+		set(PLATFORM_CXXFLAGS "-std=c++11 -fPIC")
-    set(PLATFORM_LDFLAGS)
+		set(PLATFORM_LDFLAGS)
-    set(PLATFORM_BUILD_TARGET)
+		set(PLATFORM_BUILD_TARGET)
-    set(PLATFORM_CMAKE_FLAGS -DCMAKE_INSTALL_LIBDIR=lib)
+		set(PLATFORM_CMAKE_FLAGS)
-  endif()
+	endif()
-  if(WITH_OPTIMIZED_DEBUG)
+	if(WITH_OPTIMIZED_DEBUG)
-    set(BLENDER_CMAKE_C_FLAGS_DEBUG "-O2 -DNDEBUG ${PLATFORM_CFLAGS}")
+		set(BLENDER_CMAKE_C_FLAGS_DEBUG "-O2 -DNDEBUG")
-  else()
+	else()
-    set(BLENDER_CMAKE_C_FLAGS_DEBUG "-g ${PLATFORM_CFLAGS}")
+		set(BLENDER_CMAKE_C_FLAGS_DEBUG "-g")
-  endif()
+	endif()
-  set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG ${PLATFORM_CFLAGS}")
+	set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG")
-  set(BLENDER_CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${PLATFORM_CFLAGS}")
+	set(BLENDER_CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
-  set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${PLATFORM_CFLAGS}")
+	set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG")
-  if(WITH_OPTIMIZED_DEBUG)
+	if(WITH_OPTIMIZED_DEBUG)
-    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "-O2 -DNDEBUG ${PLATFORM_CXXFLAGS}")
+		set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "-O2 -DNDEBUG ${PLATFORM_CXXFLAGS}")
-  else()
+	else()
-    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "-g ${PLATFORM_CXXFLAGS}")
+		set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "-g ${PLATFORM_CXXFLAGS}")
-  endif()
+	endif()
-  set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG ${PLATFORM_CXXFLAGS}")
+	set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG ${PLATFORM_CXXFLAGS}")
-  set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${PLATFORM_CXXFLAGS}")
+	set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${PLATFORM_CXXFLAGS}")
-  set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${PLATFORM_CXXFLAGS}")
+	set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${PLATFORM_CXXFLAGS}")
-  set(CONFIGURE_ENV
+	set(CONFIGURE_ENV
-    export MACOSX_DEPLOYMENT_TARGET=${OSX_DEPLOYMENT_TARGET} &&
+		export MACOSX_DEPLOYMENT_TARGET=${OSX_DEPLOYMENT_TARGET} &&
-    export CFLAGS=${PLATFORM_CFLAGS} &&
+		export CFLAGS=${PLATFORM_CFLAGS} &&
-    export CXXFLAGS=${PLATFORM_CXXFLAGS} &&
+		export CXXFLAGS=${PLATFORM_CXXFLAGS} &&
-    export LDFLAGS=${PLATFORM_LDFLAGS}
+		export LDFLAGS=${PLATFORM_LDFLAGS}
-  )
+	)
-  set(CONFIGURE_ENV_NO_PERL ${CONFIGURE_ENV})
+	set(CONFIGURE_ENV_NO_PERL ${CONFIGURE_ENV})
-  set(CONFIGURE_COMMAND ./configure ${PLATFORM_BUILD_TARGET})
+	set(CONFIGURE_COMMAND ./configure ${PLATFORM_BUILD_TARGET})
-  set(CONFIGURE_COMMAND_NO_TARGET ./configure)
+	set(CONFIGURE_COMMAND_NO_TARGET ./configure)
 endif()
 set(DEFAULT_CMAKE_FLAGS
-  -DCMAKE_BUILD_TYPE=${BUILD_MODE}
+	-DCMAKE_BUILD_TYPE=${BUILD_MODE}
-  -DCMAKE_C_FLAGS_DEBUG=${BLENDER_CMAKE_C_FLAGS_DEBUG}
+	-DCMAKE_C_FLAGS_DEBUG=${BLENDER_CMAKE_C_FLAGS_DEBUG}
-  -DCMAKE_C_FLAGS_MINSIZEREL=${BLENDER_CMAKE_C_FLAGS_MINSIZEREL}
+	-DCMAKE_C_FLAGS_MINSIZEREL=${BLENDER_CMAKE_C_FLAGS_MINSIZEREL}
-  -DCMAKE_C_FLAGS_RELEASE=${BLENDER_CMAKE_C_FLAGS_RELEASE}
+	-DCMAKE_C_FLAGS_RELEASE=${BLENDER_CMAKE_C_FLAGS_RELEASE}
-  -DCMAKE_C_FLAGS_RELWITHDEBINFO=${BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO}
+	-DCMAKE_C_FLAGS_RELWITHDEBINFO=${BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO}
-  -DCMAKE_CXX_FLAGS_DEBUG=${BLENDER_CMAKE_CXX_FLAGS_DEBUG}
+	-DCMAKE_CXX_FLAGS_DEBUG=${BLENDER_CMAKE_CXX_FLAGS_DEBUG}
-  -DCMAKE_CXX_FLAGS_MINSIZEREL=${BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL}
+	-DCMAKE_CXX_FLAGS_MINSIZEREL=${BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL}
-  -DCMAKE_CXX_FLAGS_RELEASE=${BLENDER_CMAKE_CXX_FLAGS_RELEASE}
+	-DCMAKE_CXX_FLAGS_RELEASE=${BLENDER_CMAKE_CXX_FLAGS_RELEASE}
-  -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
+	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
-  ${PLATFORM_CMAKE_FLAGS}
+	${PLATFORM_CMAKE_FLAGS}
 )
 if(WIN32)
-  #we need both flavors to build the thumbnail dlls
+	#we need both flavors to build the thumbnail dlls
-  if(MSVC12)
+	if(MSVC12)
-    set(GENERATOR_32 "Visual Studio 12 2013")
+		set(GENERATOR_32 "Visual Studio 12 2013")
-    set(GENERATOR_64 "Visual Studio 12 2013 Win64")
+		set(GENERATOR_64 "Visual Studio 12 2013 Win64")
-  elseif(MSVC14)
+	elseif(MSVC14)
-    set(GENERATOR_32 "Visual Studio 14 2015")
+		set(GENERATOR_32 "Visual Studio 14 2015")
-    set(GENERATOR_64 "Visual Studio 14 2015 Win64")
+		set(GENERATOR_64 "Visual Studio 14 2015 Win64")
-  endif()
+	endif()
 endif()
 if(WIN32)
-  if(BUILD_MODE STREQUAL Debug)
+	set(ZLIB_LIBRARY zlibstatic${LIBEXT})
    set(ZLIB_LIBRARY zlibstaticd${LIBEXT})
  else()
    set(ZLIB_LIBRARY zlibstatic${LIBEXT})
  endif()
 else()
-  set(ZLIB_LIBRARY libz${LIBEXT})
+	set(ZLIB_LIBRARY libz${LIBEXT})
 endif()
 if(MSVC)
-  set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+	set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 endif()
 set(CMAKE_INSTALL_MESSAGE LAZY)
--- a/build_files/build_environment/cmake/orc.cmake
+++ b/build_files/build_environment/cmake/orc.cmake
@@ -0,0 +1,32 @@
 # ***** 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_orc
 	URL ${ORC_URI}
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
 	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
@@ -17,124 +17,71 @@
 # ***** END GPL LICENSE BLOCK *****
 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_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_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")
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
-    set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=0)
+		set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=0)
-  else()
+	else()
-    set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=sse2)
+		set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=sse2)
-  endif()
+	endif()
  SET(OSL_PLATFORM_FLAGS -DLINKSTATIC=ON)
 else()
-  set(OSL_CMAKE_CXX_STANDARD_LIBRARIES)
+	set(OSL_CMAKE_CXX_STANDARD_LIBRARIES)
-  set(OSL_FLEX_BISON)
+	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_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}")
  SET(OSL_PLATFORM_FLAGS)
 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_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/${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_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}
+	-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-  -DBoost_USE_MULTITHREADED=ON
+	-DBoost_USE_MULTITHREADED=ON
-  -DBoost_USE_STATIC_LIBS=ON
+	-DBoost_USE_STATIC_LIBS=ON
-  -DBoost_USE_STATIC_RUNTIME=ON
+	-DBoost_USE_STATIC_RUNTIME=ON
-  -DBOOST_ROOT=${LIBDIR}/boost
+	-DBOOST_ROOT=${LIBDIR}/boost
-  -DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
+	-DBOOST_LIBRARYDIR=${LIBDIR}/boost/lib/
-  -DBoost_NO_SYSTEM_PATHS=ON
+	-DBoost_NO_SYSTEM_PATHS=ON
-  -DLLVM_DIRECTORY=${LIBDIR}/llvm
+	-DLLVM_DIRECTORY=${LIBDIR}/llvm
-  -DLLVM_INCLUDES=${LIBDIR}/llvm/include
+	-DLLVM_INCLUDES=${LIBDIR}/llvm/include
-  -DLLVM_LIB_DIR=${LIBDIR}/llvm/lib
+	-DLLVM_LIB_DIR=${LIBDIR}/llvm/lib
-  -DLLVM_VERSION=3.4
+	-DLLVM_VERSION=3.4
-  -DLLVM_LIBRARY=${OSL_LLVM_LIBRARY}
+	-DLLVM_LIBRARY=${OSL_LLVM_LIBRARY}
-  -DOPENEXR_HOME=${LIBDIR}/openexr/
+	-DOPENEXR_HOME=${LIBDIR}/openexr/
-  -DILMBASE_HOME=${LIBDIR}/ilmbase/
+	-DILMBASE_HOME=${LIBDIR}/ilmbase/
-  -DILMBASE_INCLUDE_DIR=${LIBDIR}/ilmbase/include/
+	-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-2_2${LIBEXT}
-  -DOPENEXR_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread-2_2${LIBEXT}
-  -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex-2_2${LIBEXT}
-  -DOPENEXR_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
-  -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
+	-DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf-2_2${LIBEXT}
-  -DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+	-DOSL_BUILD_TESTS=OFF
-  -DOSL_BUILD_TESTS=OFF
+	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+	-DOPENIMAGEIOHOME=${LIBDIR}/openimageio/
-  -DOPENIMAGEIOHOME=${LIBDIR}/openimageio/
+	-DOPENIMAGEIO_LIBRARY=${OSL_OPENIMAGEIO_LIBRARY}
-  -DOPENIMAGEIO_LIBRARY=${OSL_OPENIMAGEIO_LIBRARY}
+	-DOPENIMAGEIO_INCLUDES=${LIBDIR}/openimageio/include
-  -DOPENIMAGEIO_INCLUDES=${LIBDIR}/openimageio/include
+	${OSL_FLEX_BISON}
-  ${OSL_FLEX_BISON}
+	-DCMAKE_CXX_STANDARD_LIBRARIES=${OSL_CMAKE_CXX_STANDARD_LIBRARIES}
-  -DCMAKE_CXX_STANDARD_LIBRARIES=${OSL_CMAKE_CXX_STANDARD_LIBRARIES}
+	-DBUILDSTATIC=ON
-  -DBUILDSTATIC=ON
+	-DLINKSTATIC=ON
-  ${OSL_PLATFORM_FLAGS}
+	-DOSL_BUILD_PLUGINS=Off
-  -DOSL_BUILD_PLUGINS=Off
+	-DSTOP_ON_WARNING=OFF
-  -DSTOP_ON_WARNING=OFF
+	-DOSL_BUILD_CPP11=ON
-  -DUSE_LLVM_BITCODE=OFF
+	-DUSE_LLVM_BITCODE=OFF
-  -DUSE_PARTIO=OFF
+	${OSL_SIMD_FLAGS}
  ${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}
+	URL ${OSL_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  LIST_SEPARATOR ^^
+	LIST_SEPARATOR ^^
-  URL_HASH MD5=${OSL_HASH}
+	URL_HASH MD5=${OSL_HASH}
-  PREFIX ${BUILD_DIR}/osl
+	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 &&
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/osl -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${DEFAULT_CMAKE_FLAGS} ${OSL_EXTRA_ARGS}
+				${PATCH_CMD} -p 0 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl_simd_oiio.diff
-  INSTALL_DIR ${LIBDIR}/osl
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/osl -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${DEFAULT_CMAKE_FLAGS} ${OSL_EXTRA_ARGS}
 	INSTALL_DIR ${LIBDIR}/osl
 )
-add_dependencies(
+add_dependencies(external_osl external_boost ll external_clang external_ilmbase external_openexr external_zlib external_flexbison external_openimageio)
  external_osl
  external_boost
  ll
  external_clang
  external_ilmbase
  external_openexr
  external_zlib
  external_flexbison
  external_openimageio
 )
 if(UNIX AND NOT APPLE)
  # Rely on PugiXML compiled with OpenImageIO
 else()
  add_dependencies(
    external_osl
    external_pugixml
  )
 endif()
 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/png.cmake
+++ b/build_files/build_environment/cmake/png.cmake
@@ -17,28 +17,25 @@
 # ***** END GPL LICENSE BLOCK *****
 set(PNG_EXTRA_ARGS
-  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-  -DPNG_STATIC=ON
+	-DPNG_STATIC=ON
 )
 ExternalProject_Add(external_png
-  URL ${PNG_URI}
+	URL ${PNG_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${PNG_HASH}
+	URL_HASH MD5=${PNG_HASH}
-  PREFIX ${BUILD_DIR}/png
+	PREFIX ${BUILD_DIR}/png
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/png ${DEFAULT_CMAKE_FLAGS} ${PNG_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/png ${DEFAULT_CMAKE_FLAGS} ${PNG_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/png
+	INSTALL_DIR	${LIBDIR}/png
 )
-add_dependencies(
+add_dependencies(external_png external_zlib)
  external_png
  external_zlib
 )
-if(WIN32 AND BUILD_MODE STREQUAL Debug)
+if(BUILD_MODE STREQUAL Debug)
-  ExternalProject_Add_Step(external_png after_install
+	ExternalProject_Add_Step(external_png after_install
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_staticd${LIBEXT} ${LIBDIR}/png/lib/libpng16${LIBEXT}
+		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_staticd${LIBEXT} ${LIBDIR}/png/lib/libpng16${LIBEXT}
-    DEPENDEES install
+		DEPENDEES install
-  )
+	)
 endif()
--- a/build_files/build_environment/cmake/pthreads.cmake
+++ b/build_files/build_environment/cmake/pthreads.cmake
@@ -17,37 +17,29 @@
 # ***** END GPL LICENSE BLOCK *****
 if(WIN32)
 		set(PTHREAD_XCFLAGS /MD)
-    if(MSVC14) # vs2015 has timespec
+		if(MSVC14) # vs2015 has timespec
-      set(PTHREAD_CPPFLAGS "/I. /DHAVE_CONFIG_H /D_TIMESPEC_DEFINED ")
+			set(PTHREAD_CPPFLAGS "/I. /DHAVE_PTW32_CONFIG_H /D_TIMESPEC_DEFINED ")
-    else() # everything before doesn't
+		else() # everything before doesn't
-      set(PTHREAD_CPPFLAGS "/I. /DHAVE_CONFIG_H ")
+			set(PTHREAD_CPPFLAGS "/I. /DHAVE_PTW32_CONFIG_H ")
-    endif()
+		endif()
-    set(PTHREADS_BUILD cd ${BUILD_DIR}/pthreads/src/external_pthreads/ && cd && nmake VC-static /e CPPFLAGS=${PTHREAD_CPPFLAGS} /e XLIBS=/NODEFAULTLIB:msvcr)
+		set(PTHREADS_BUILD cd ${BUILD_DIR}/pthreads/src/external_pthreads/ && cd && nmake VC /e CPPFLAGS=${PTHREAD_CPPFLAGS} /e XCFLAGS=${PTHREAD_XCFLAGS} /e XLIBS=/NODEFAULTLIB:msvcr)
    ExternalProject_Add(external_pthreads
      URL ${PTHREADS_URI}
      DOWNLOAD_DIR ${DOWNLOAD_DIR}
      URL_HASH MD5=${PTHREADS_HASH}
      PREFIX ${BUILD_DIR}/pthreads
      CONFIGURE_COMMAND echo .
      BUILD_COMMAND ${PTHREADS_BUILD}
      INSTALL_COMMAND COMMAND
        ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/libpthreadVC3${LIBEXT} ${LIBDIR}/pthreads/lib/pthreadVC3${LIBEXT} &&
        ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthread.h ${LIBDIR}/pthreads/inc/pthread.h &&
        ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/sched.h ${LIBDIR}/pthreads/inc/sched.h &&
        ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/semaphore.h ${LIBDIR}/pthreads/inc/semaphore.h &&
        ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/_ptw32.h ${LIBDIR}/pthreads/inc/_ptw32.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()
 		ExternalProject_Add(external_pthreads
 			URL ${PTHREADS_URI}
 			DOWNLOAD_DIR ${DOWNLOAD_DIR}
 			URL_HASH SHA512=${PTHREADS_SHA512}
 			PREFIX ${BUILD_DIR}/pthreads
 			CONFIGURE_COMMAND echo .
 			PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/pthreads/src/external_pthreads < ${PATCH_DIR}/pthreads.diff
 			BUILD_COMMAND ${PTHREADS_BUILD}
 			INSTALL_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthreadVC2.dll ${LIBDIR}/pthreads/lib/pthreadVC2.dll &&
 															${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthreadVC2${LIBEXT} ${LIBDIR}/pthreads/lib/pthreadVC2${LIBEXT} &&
 															${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthread.h ${LIBDIR}/pthreads/inc/pthread.h &&
 															${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/sched.h ${LIBDIR}/pthreads/inc/sched.h &&
 															${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/semaphore.h ${LIBDIR}/pthreads/inc/semaphore.h
 			INSTALL_DIR ${LIBDIR}/pthreads
 		)
 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
@@ -18,164 +18,121 @@
 set(PYTHON_POSTFIX)
 if(BUILD_MODE STREQUAL Debug)
-  set(PYTHON_POSTFIX _d)
+	set(PYTHON_POSTFIX _d)
 endif()
 if(WIN32)
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+	set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe)
    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)
 		string(REPLACE "/" "\\" ${ResultingPath} "${MsysPath}")
 	endmacro()
-  macro(cmake_to_dos_path MsysPath ResultingPath)
+	set(PYTHON_EXTERNALS_FOLDER ${BUILD_DIR}/python/src/external_python/externals)
-    string(REPLACE "/" "\\" ${ResultingPath} "${MsysPath}")
+	set(DOWNLOADS_EXTERNALS_FOLDER ${DOWNLOAD_DIR}/externals)
  endmacro()
-  set(PYTHON_EXTERNALS_FOLDER ${BUILD_DIR}/python/src/external_python/externals)
+	cmake_to_dos_path(${PYTHON_EXTERNALS_FOLDER} PYTHON_EXTERNALS_FOLDER_DOS)
-  set(DOWNLOADS_EXTERNALS_FOLDER ${DOWNLOAD_DIR}/externals)
+	cmake_to_dos_path(${DOWNLOADS_EXTERNALS_FOLDER} DOWNLOADS_EXTERNALS_FOLDER_DOS)
-  cmake_to_dos_path(${PYTHON_EXTERNALS_FOLDER} PYTHON_EXTERNALS_FOLDER_DOS)
+	message("Python externals = ${PYTHON_EXTERNALS_FOLDER}")
-  cmake_to_dos_path(${DOWNLOADS_EXTERNALS_FOLDER} DOWNLOADS_EXTERNALS_FOLDER_DOS)
+	message("Python externals_dos = ${PYTHON_EXTERNALS_FOLDER_DOS}")
 	message("Python DOWNLOADS_EXTERNALS_FOLDER = ${DOWNLOADS_EXTERNALS_FOLDER}")
 	message("Python DOWNLOADS_EXTERNALS_FOLDER_DOS = ${DOWNLOADS_EXTERNALS_FOLDER_DOS}")
-  message("Python externals = ${PYTHON_EXTERNALS_FOLDER}")
+	ExternalProject_Add(external_python
-  message("Python externals_dos = ${PYTHON_EXTERNALS_FOLDER_DOS}")
+		URL ${PYTHON_URI}
-  message("Python DOWNLOADS_EXTERNALS_FOLDER = ${DOWNLOADS_EXTERNALS_FOLDER}")
+		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  message("Python DOWNLOADS_EXTERNALS_FOLDER_DOS = ${DOWNLOADS_EXTERNALS_FOLDER_DOS}")
+		URL_HASH MD5=${PYTHON_HASH}
-
+		PREFIX ${BUILD_DIR}/python
-  ExternalProject_Add(external_python
+		PATCH_COMMAND echo mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}" &&
-    URL ${PYTHON_URI}
+						 mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}" &&
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+						 ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python.diff &&
-    URL_HASH MD5=${PYTHON_HASH}
+						 ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/python/src/external_python/pc < ${PATCH_DIR}/pyshell.diff
-    PREFIX ${BUILD_DIR}/python
+		CONFIGURE_COMMAND ""
-    PATCH_COMMAND
+		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}
-      echo mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}" &&
+		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 &&
-      mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}"
+								${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 &&
-    CONFIGURE_COMMAND ""
+								${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 &&
-    BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p ${PYTHON_ARCH} -c ${BUILD_MODE}
+								${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/include ${LIBDIR}/python/include/Python${PYTHON_SHORT_VERSION} &&
-    INSTALL_COMMAND COMMAND
+								${CMAKE_COMMAND} -E copy "${BUILD_DIR}/python/src/external_python/PC/pyconfig.h" ${LIBDIR}/python/include/Python${PYTHON_SHORT_VERSION}/pyconfig.h
-      ${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 &&
+	Message("PythinRedist = ${BUILD_DIR}/python/src/external_python/redist")
-      ${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 &&
+	Message("POutput = ${PYTHON_OUTPUTDIR}")
      ${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} &&
      ${CMAKE_COMMAND} -E copy "${BUILD_DIR}/python/src/external_python/PC/pyconfig.h" ${LIBDIR}/python/include/Python${PYTHON_SHORT_VERSION}/pyconfig.h
  )
  message("PythinRedist = ${BUILD_DIR}/python/src/external_python/redist")
  message("POutput = ${PYTHON_OUTPUTDIR}")
 else()
-  if(APPLE)
+	if(APPLE)
-    # disable functions that can be in 10.13 sdk but aren't available on 10.9 target
+		# we need to manually add homebrew headers to get ssl module building
-    set(PYTHON_FUNC_CONFIGS
+		set(PYTHON_CFLAGS "-I/usr/local/opt/openssl/include -I${OSX_SYSROOT}/usr/include ${PLATFORM_CFLAGS}")
-      export ac_cv_func_futimens=no &&
+		set(PYTHON_LDFLAGS "-L/usr/local/opt/openssl/lib ${PLATFORM_LDFLAGS}")
-      export ac_cv_func_utimensat=no &&
+		set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV} && export CFLAGS=${PYTHON_CFLAGS} && export LDFLAGS=${PYTHON_LDFLAGS})
-      export ac_cv_func_basename_r=no &&
+		set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python.exe)
-      export ac_cv_func_clock_getres=no &&
+		set(PYTHON_PATCH ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_apple.diff)
-      export ac_cv_func_clock_gettime=no &&
+	else()
-      export ac_cv_func_clock_settime=no &&
+		set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV})
-      export ac_cv_func_dirname_r=no &&
+		set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python)
-      export ac_cv_func_getentropy=no &&
+	endif()
      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})
    set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python.exe)
  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")
+	ExternalProject_Add(external_python
-  set(PYTHON_CFLAGS "-I${LIBDIR}/sqlite/include -I${LIBDIR}/bzip2/include -I${LIBDIR}/lzma/include -I${LIBDIR}/zlib/include")
+		URL ${PYTHON_URI}
-  set(PYTHON_LDFLAGS "-L${LIBDIR}/ffi/lib -L${LIBDIR}/sqlite/lib -L${LIBDIR}/bzip2/lib -L${LIBDIR}/lzma/lib -L${LIBDIR}/zlib/lib")
+		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  set(PYTHON_CONFIGURE_EXTRA_ENV
+		URL_HASH MD5=${PYTHON_HASH}
-    export CFLAGS=${PYTHON_CFLAGS} &&
+		PREFIX ${BUILD_DIR}/python
-    export CPPFLAGS=${PYTHON_CFLAGS} &&
+		PATCH_COMMAND ${PYTHON_PATCH}
-    export LDFLAGS=${PYTHON_LDFLAGS} &&
+		CONFIGURE_COMMAND ${PYTHON_CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/python
-    export PKG_CONFIG_PATH=${LIBDIR}/ffi/lib/pkgconfig)
+		BUILD_COMMAND ${PYTHON_CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && make -j${MAKE_THREADS}
-  set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_linux.diff)
+		INSTALL_COMMAND ${PYTHON_CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && make install
 		INSTALL_DIR ${LIBDIR}/python)
-  ExternalProject_Add(external_python
+	add_custom_target(Make_Python_Environment ALL DEPENDS 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}
    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)
  add_custom_target(Make_Python_Environment ALL DEPENDS external_python)
 endif()
 if(MSVC)
-  add_custom_command(
+	add_custom_command(
-    OUTPUT ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz
+		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
+		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_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}/_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}/_ctypes${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ctypes${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}/_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}/_sqlite3${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_sqlite3${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}/_ssl${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ssl${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}/pyexpat${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/pyexpat${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}/select${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/select${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}/unicodedata${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/unicodedata${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}/winsound${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/winsound${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}/_ctypes${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ctypes${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}/_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}/_overlapped${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_overlapped${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}/_queue${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_queue${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}/_socket${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_socket${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}/_sqlite3${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_sqlite3${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}/_ssl${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ssl${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}/_testbuffer${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testbuffer${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}/_testcapi${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testcapi${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}/_testimportmultiple${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testimportmultiple${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}/_testmultiphase${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testmultiphase${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}/pyexpat${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/pyexpat${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}/python${PYTHON_POSTFIX}.exe" ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe
+		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 "${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 copy "${PYTHON_OUTPUTDIR}/sqlite3${PYTHON_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/redist/lib/sqlite3${PYTHON_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)
+	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)
-  add_custom_command(OUTPUT ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe
+	if(MSVC12)
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/redist ${BUILD_DIR}/python/src/external_python/run
+		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)
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/include ${BUILD_DIR}/python/src/external_python/run/include
+	else()
-    COMMAND ${CMAKE_COMMAND} -E copy "${BUILD_DIR}/python/src/external_python/PC/pyconfig.h" ${BUILD_DIR}/python/src/external_python/run/include/pyconfig.h
+		set(PYTHON_DISTUTIL_PATCH echo "No patch needed")
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll
+	endif()
    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}.lib  #missing postfix on purpose, distutils is not expecting it
    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
  )
  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_custom_command(OUTPUT ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe
-  add_dependencies(
+		COMMAND	${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/redist ${BUILD_DIR}/python/src/external_python/run
-    external_python
+		COMMAND	${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/include ${BUILD_DIR}/python/src/external_python/run/include
-    external_bzip2
+		COMMAND	${CMAKE_COMMAND} -E copy "${BUILD_DIR}/python/src/external_python/PC/pyconfig.h" ${BUILD_DIR}/python/src/external_python/run/include/pyconfig.h
-    external_ffi
+		COMMAND	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll
-    external_lzma
+		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}.lib  #missing postfix on purpose, distutils is not expecting it
-    external_ssl
+		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.
-    external_sqlite
+		COMMAND	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_POSTFIX}.exe" ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe
-    external_zlib
+		COMMAND	${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe -m ensurepip --upgrade
-  )
+		COMMAND	${PYTHON_DISTUTIL_PATCH}
-endif()
+	)
 	add_custom_target(Make_Python_Environment ALL DEPENDS ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe Package_Python)
 endif(MSVC)
--- 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/python_site_packages.cmake
+++ b/build_files/build_environment/cmake/python_site_packages.cmake
@@ -16,26 +16,23 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 if(WIN32)
-  set(HARVEST_CMD cmd /C FOR /d /r ${BUILD_DIR}/python/src/external_python/run/lib/site-packages %d IN (__pycache__) DO @IF EXIST "%d" rd /s /q "%d" &&
+	set(HARVEST_CMD cmd /C FOR /d /r ${BUILD_DIR}/python/src/external_python/run/lib/site-packages %d IN (__pycache__) DO @IF EXIST "%d" rd /s /q "%d" &&
-    ${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/idna ${HARVEST_TARGET}/Release/site-packages/idna &&
+					${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/idna ${HARVEST_TARGET}/Release/site-packages/idna &&
-    ${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/chardet ${HARVEST_TARGET}/Release/site-packages/chardet &&
+					${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/chardet ${HARVEST_TARGET}/Release/site-packages/chardet &&
-    ${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/urllib3 ${HARVEST_TARGET}/Release/site-packages/urllib3 &&
+					${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/urllib3 ${HARVEST_TARGET}/Release/site-packages/urllib3 &&
-    ${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/certifi ${HARVEST_TARGET}/Release/site-packages/certifi &&
+					${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/certifi ${HARVEST_TARGET}/Release/site-packages/certifi &&
-    ${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/requests ${HARVEST_TARGET}/Release/site-packages/requests
+					${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/requests ${HARVEST_TARGET}/Release/site-packages/requests 
-  )
+		)
 else()
-  set(HARVEST_CMD echo .)
+	set(HARVEST_CMD echo .) 
 endif()
 ExternalProject_Add(external_python_site_packages
-  DOWNLOAD_COMMAND ""
+	DOWNLOAD_COMMAND ""
-  CONFIGURE_COMMAND ""
+	CONFIGURE_COMMAND ""
-  BUILD_COMMAND ""
+	BUILD_COMMAND ""
-  PREFIX ${BUILD_DIR}/site_packages
+	PREFIX ${BUILD_DIR}/site_packages
-  INSTALL_COMMAND ${PYTHON_BINARY} -m pip install idna==${IDNA_VERSION} chardet==${CHARDET_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} --no-binary :all: && ${HARVEST_CMD}
+	INSTALL_COMMAND ${PYTHON_BINARY} -m pip install idna==${IDNA_VERSION} chardet==${CHARDET_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} --no-binary :all: && ${HARVEST_CMD}
 )
-add_dependencies(
+add_dependencies(external_python_site_packages Make_Python_Environment)
  external_python_site_packages
  Make_Python_Environment
 )
--- a/build_files/build_environment/cmake/schroedinger.cmake
+++ b/build_files/build_environment/cmake/schroedinger.cmake
@@ -0,0 +1,45 @@
 # ***** 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
@@ -17,33 +17,23 @@
 # ***** END GPL LICENSE BLOCK *****
 if(WIN32)
-  set(SDL_EXTRA_ARGS
+	set(SDL_EXTRA_ARGS
-    -DSDL_STATIC=Off
+		-DSDL_STATIC=Off
-  )
+	)
 else()
-  set(SDL_EXTRA_ARGS
+	set(SDL_EXTRA_ARGS
-    -DSDL_STATIC=ON
+		-DSDL_STATIC=ON
-    -DSDL_SHARED=OFF
+		-DSDL_SHARED=OFF
-    -DSDL_VIDEO=OFF
+		-DSDL_VIDEO=OFF
-    -DSNDIO=OFF
+	)
  )
 endif()
 ExternalProject_Add(external_sdl
-  URL ${SDL_URI}
+	URL ${SDL_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${SDL_HASH}
+	URL_HASH MD5=${SDL_HASH}
-  PREFIX ${BUILD_DIR}/sdl
+	PREFIX ${BUILD_DIR}/sdl
-  PATCH_COMMAND ${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/sdl/src/external_sdl < ${PATCH_DIR}/sdl.diff
+	PATCH_COMMAND ${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/sdl/src/external_sdl < ${PATCH_DIR}/sdl.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/sdl ${DEFAULT_CMAKE_FLAGS} ${SDL_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/sdl ${DEFAULT_CMAKE_FLAGS} ${SDL_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/sdl
+	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
@@ -24,204 +24,196 @@
 message("LIBDIR = ${LIBDIR}")
 macro(cmake_to_msys_path MsysPath ResultingPath)
-  string(REPLACE ":" "" TmpPath "${MsysPath}")
+	string(REPLACE ":" "" TmpPath "${MsysPath}")
-  string(SUBSTRING ${TmpPath} 0 1 Drive)
+	string(SUBSTRING ${TmpPath} 0 1 Drive)
-  string(SUBSTRING ${TmpPath} 1 255 PathPart)
+	string(SUBSTRING ${TmpPath} 1 255 PathPart)
-  string(TOLOWER ${Drive} LowerDrive)
+	string(TOLOWER ${Drive} LowerDrive)
-  string(CONCAT ${ResultingPath} "/" ${LowerDrive} ${PathPart})
+	string(CONCAT ${ResultingPath} "/" ${LowerDrive} ${PathPart})
 endmacro()
 cmake_to_msys_path(${LIBDIR} mingw_LIBDIR)
 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")
+	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
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/mingw
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/mingw
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}
-  )
+	)
 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")
+	message("Extracting mingw32")
-  execute_process(
+	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
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw
-  )
+	)
 endif()
 message("Checking for pkg-config")
 if(NOT EXISTS "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
-  message("Downloading pkg-config")
+	message("Downloading pkg-config")
-  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip" "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
+	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip" "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
 endif()
 # extract pkgconfig
 if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/pkg-config.exe") AND (EXISTS "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"))
-  message("Extracting pkg-config")
+	message("Extracting pkg-config")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"
+		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/
-  )
+	)
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1/bin/pkg-config.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/pkg-config.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1/bin/pkg-config.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/pkg-config.exe"
-  )
+	)
 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")
+	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")
+	message("Extracting nasm")
-  execute_process(
+	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}/
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/
-  )
+	)
-  execute_process(
+	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")
+	message("Downloading mingw-get")
-  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/Installer/mingw-get/mingw-get-0.6.2-beta-20131004-1/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip" "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
+	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/Installer/mingw-get/mingw-get-0.6.2-beta-20131004-1/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip" "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
 endif()
 # extract mingw_get
 if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get.exe") AND (EXISTS "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"))
-  message("Extracting mingw-get")
+	message("Extracting mingw-get")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"
+		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw/mingw32/
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw/mingw32/
-  )
+	)
 endif()
 if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/make.exe"))
-  message("Installing MSYS")
+	message("Installing MSYS")
-  execute_process(
+	execute_process(
-    COMMAND ${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get install msys msys-patch
+		COMMAND ${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get install msys msys-patch
-    WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw32/bin/
+		WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw32/bin/
-  )
+	)
 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")
-  message("Downloading CoreUtils 5.97")
+	message("Downloading CoreUtils 5.97")
-  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/MSYS/Base/msys-core/_obsolete/coreutils-5.97-MSYS-1.0.11-2/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2" "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
+	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/MSYS/Base/msys-core/_obsolete/coreutils-5.97-MSYS-1.0.11-2/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2" "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
 endif()
 if((EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/pr.exe"))
-  message("Installing pr from CoreUtils 5.97")
+	message("Installing pr from CoreUtils 5.97")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/tmp_coreutils
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/tmp_coreutils
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}
-  )
+	)
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2
+		COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
-  )
+	)
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy ${DOWNLOAD_DIR}/tmp_coreutils/coreutils-5.97/bin/pr.exe "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/pr.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy ${DOWNLOAD_DIR}/tmp_coreutils/coreutils-5.97/bin/pr.exe "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/pr.exe"
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
-  )
+	)
 endif()
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd")
-  message("Installing ming32sh.cmd")
+	message("Installing ming32sh.cmd")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/ming32sh.cmd  ${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd
+		COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/ming32sh.cmd  ${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd
-  )
+	)
 endif()
 message("Checking for perl")
 # download perl for libvpx
 if(NOT EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip")
-  message("Downloading perl")
+	message("Downloading perl")
-  file(DOWNLOAD "http://strawberryperl.com/download/5.22.1.3/strawberry-perl-5.22.1.3-32bit-portable.zip" "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip")
+	file(DOWNLOAD "http://strawberryperl.com/download/5.22.1.3/strawberry-perl-5.22.1.3-32bit-portable.zip" "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip")
 endif()
 # make perl root directory
 if(NOT EXISTS "${DOWNLOAD_DIR}/perl32")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/perl32
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/perl32
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}
-  )
+	)
 endif()
 # extract perl
 if((NOT EXISTS "${DOWNLOAD_DIR}/perl32/portable.perl") AND (EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip"))
-  message("Extracting perl")
+	message("Extracting perl")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip
+		COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/perl32
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/perl32
-  )
+	)
 endif()
 # get yasm for vpx
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/yasm.exe")
-  message("Downloading yasm")
+	message("Downloading yasm")
-  file(DOWNLOAD "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win32.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/yasm.exe")
+	file(DOWNLOAD "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win32.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/yasm.exe")
 endif()
 message("checking i686-w64-mingw32-strings")
 # copy strings.exe to i686-w64-mingw32-strings for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strings.exe")
-  message("fixing i686-w64-mingw32-strings.exe")
+	message("fixing i686-w64-mingw32-strings.exe")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/strings.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strings.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/strings.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strings.exe"
-  )
+	)
 endif()
 message("checking i686-w64-mingw32-ar.exe")
 # copy ar.exe to i686-w64-mingw32-ar.exe for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ar.exe")
-  message("fixing i686-w64-mingw32-ar.exe")
+	message("fixing i686-w64-mingw32-ar.exe")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/ar.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ar.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/ar.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ar.exe"
-  )
+	)
 endif()
 message("checking i686-w64-mingw32-strip.exe")
 # copy strip.exe to i686-w64-mingw32-strip.exe for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strip.exe")
-  message("fixing i686-w64-mingw32-strip.exe")
+	message("fixing i686-w64-mingw32-strip.exe")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/strip.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strip.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/strip.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strip.exe"
-  )
+	)
 endif()
 message("checking i686-w64-mingw32-ranlib.exe")
 # copy ranlib.exe to i686-w64-mingw32-ranlib.exe for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ranlib.exe")
-  message("fixing i686-w64-mingw32-ranlib.exe")
+	message("fixing i686-w64-mingw32-ranlib.exe")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/ranlib.exe" "${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
@@ -24,204 +24,196 @@
 message("LIBDIR = ${LIBDIR}")
 macro(cmake_to_msys_path MsysPath ResultingPath)
-  string(REPLACE ":" "" TmpPath "${MsysPath}")
+	string(REPLACE ":" "" TmpPath "${MsysPath}")
-  string(SUBSTRING ${TmpPath} 0 1 Drive)
+	string(SUBSTRING ${TmpPath} 0 1 Drive)
-  string(SUBSTRING ${TmpPath} 1 255 PathPart)
+	string(SUBSTRING ${TmpPath} 1 255 PathPart)
-  string(TOLOWER ${Drive} LowerDrive)
+	string(TOLOWER ${Drive} LowerDrive)
-  string(CONCAT ${ResultingPath} "/" ${LowerDrive} ${PathPart})
+	string(CONCAT ${ResultingPath} "/" ${LowerDrive} ${PathPart})
 endmacro()
 cmake_to_msys_path(${LIBDIR} mingw_LIBDIR)
 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")
+	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
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/mingw
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/mingw
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}
-  )
+	)
 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")
+	message("Extracting mingw64")
-  execute_process(
+	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
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw
-  )
+	)
 endif()
 message("Checking for pkg-config")
 if(NOT EXISTS "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
-  message("Downloading pkg-config")
+	message("Downloading pkg-config")
-  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip" "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
+	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip" "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
 endif()
 # extract pkgconfig
 if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/pkg-config.exe") AND (EXISTS "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"))
-  message("Extracting pkg-config")
+	message("Extracting pkg-config")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"
+		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/
-  )
+	)
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1/bin/pkg-config.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/pkg-config.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1/bin/pkg-config.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/pkg-config.exe"
-  )
+	)
 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")
+	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")
+	message("Extracting nasm")
-  execute_process(
+	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}/
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/
-  )
+	)
-  execute_process(
+	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")
-  message("Downloading mingw-get")
+	message("Downloading mingw-get")
-  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/Installer/mingw-get/mingw-get-0.6.2-beta-20131004-1/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip" "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
+	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/Installer/mingw-get/mingw-get-0.6.2-beta-20131004-1/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip" "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
 endif()
 # extract mingw_get
 if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get.exe") AND (EXISTS "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"))
-  message("Extracting mingw-get")
+	message("Extracting mingw-get")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"
+		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw/mingw64/
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw/mingw64/
-  )
+	)
 endif()
 if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/make.exe"))
-  message("Installing MSYS")
+	message("Installing MSYS")
-  execute_process(
+	execute_process(
-    COMMAND ${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get install msys msys-patch
+		COMMAND ${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get install msys msys-patch
-    WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw64/bin/
+		WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw64/bin/
-  )
+	)
 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")
-  message("Downloading CoreUtils 5.97")
+	message("Downloading CoreUtils 5.97")
-  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/MSYS/Base/msys-core/_obsolete/coreutils-5.97-MSYS-1.0.11-2/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2" "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
+	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/MSYS/Base/msys-core/_obsolete/coreutils-5.97-MSYS-1.0.11-2/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2" "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
 endif()
 if((EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/pr.exe"))
-  message("Installing pr from CoreUtils 5.97")
+	message("Installing pr from CoreUtils 5.97")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/tmp_coreutils
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/tmp_coreutils
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}
-  )
+	)
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2
+		COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
-  )
+	)
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy ${DOWNLOAD_DIR}/tmp_coreutils/coreutils-5.97/bin/pr.exe "${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/pr.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy ${DOWNLOAD_DIR}/tmp_coreutils/coreutils-5.97/bin/pr.exe "${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/pr.exe"
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
-  )
+	)
 endif()
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/ming64sh.cmd")
-  message("Installing ming64sh.cmd")
+	message("Installing ming64sh.cmd")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/ming64sh.cmd  ${DOWNLOAD_DIR}/mingw/mingw64/ming64sh.cmd
+		COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/ming64sh.cmd  ${DOWNLOAD_DIR}/mingw/mingw64/ming64sh.cmd
-  )
+	)
 endif()
 message("Checking for perl")
 # download perl for libvpx
 if(NOT EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip")
-  message("Downloading perl")
+	message("Downloading perl")
-  file(DOWNLOAD "http://strawberryperl.com/download/5.22.1.3/strawberry-perl-5.22.1.3-64bit-portable.zip" "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip")
+	file(DOWNLOAD "http://strawberryperl.com/download/5.22.1.3/strawberry-perl-5.22.1.3-64bit-portable.zip" "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip")
 endif()
 # make perl root directory
 if(NOT EXISTS "${DOWNLOAD_DIR}/perl")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/perl
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/perl
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}
-  )
+	)
 endif()
 # extract perl
 if((NOT EXISTS "${DOWNLOAD_DIR}/perl/portable.perl") AND (EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip"))
-  message("Extracting perl")
+	message("Extracting perl")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip
+		COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/perl
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/perl
-  )
+	)
 endif()
 # get yasm for vpx
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/yasm.exe")
-  message("Downloading yasm")
+	message("Downloading yasm")
-  file(DOWNLOAD "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win64.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/yasm.exe")
+	file(DOWNLOAD "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win64.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/yasm.exe")
 endif()
 message("checking x86_64-w64-mingw32-strings.exe")
 # copy strings.exe to x86_64-w64-mingw32-strings.exe for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-strings.exe")
-  message("fixing x86_64-w64-mingw32-strings.exe")
+	message("fixing x86_64-w64-mingw32-strings.exe")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/strings.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-strings.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/strings.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-strings.exe"
-  )
+	)
 endif()
 message("checking x86_64-w64-mingw32-ar.exe")
 # copy ar.exe to x86_64-w64-mingw32-ar.exe for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-ar.exe")
-  message("fixing x86_64-w64-mingw32-ar.exe")
+	message("fixing x86_64-w64-mingw32-ar.exe")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/ar.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-ar.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/ar.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-ar.exe"
-  )
+	)
 endif()
 message("checking x86_64-w64-mingw32-strip.exe")
 # copy strip.exe to x86_64-w64-mingw32-strip.exe for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-strip.exe")
-  message("fixing x86_64-w64-mingw32-strip.exe")
+	message("fixing x86_64-w64-mingw32-strip.exe")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/strip.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-strip.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/strip.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-strip.exe"
-  )
+	)
 endif()
 message("checking x86_64-w64-mingw32-ranlib.exe")
 # copy ranlib.exe to x86_64-w64-mingw32-ranlib.exe for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-ranlib.exe")
-  message("fixing x86_64-w64-mingw32-ranlib.exe")
+	message("fixing x86_64-w64-mingw32-ranlib.exe")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/ranlib.exe" "${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/sndfile.cmake
+++ b/build_files/build_environment/cmake/sndfile.cmake
@@ -20,43 +20,36 @@ set(SNDFILE_EXTRA_ARGS)
 set(SNDFILE_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/flac/lib/pkgconfig:${mingw_LIBDIR})
 if(WIN32)
-  set(SNDFILE_ENV set ${SNDFILE_ENV} &&)
+	set(SNDFILE_ENV set ${SNDFILE_ENV} &&)
-  #shared for windows because static libs will drag in a libgcc dependency.
+	#shared for windows because static libs will drag in a libgcc dependency.
-  set(SNDFILE_OPTIONS --disable-static --enable-shared )
+	set(SNDFILE_OPTIONS --disable-static --enable-shared )
 else()
-  set(SNDFILE_OPTIONS --enable-static --disable-shared )
+	set(SNDFILE_OPTIONS --enable-static --disable-shared )
 endif()
-if(UNIX)
+if(APPLE)
-  set(SNDFILE_PATCH_CMD ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/sndfile/src/external_sndfile < ${PATCH_DIR}/sndfile.diff)
+	set(SNDFILE_PATCH_CMD ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/sndfile/src/external_sndfile < ${PATCH_DIR}/sndfile.diff)
 else()
-  set(SNDFILE_PATCH_CMD)
+	set(SNDFILE_PATCH_CMD)
 endif()
 ExternalProject_Add(external_sndfile
-  URL ${SNDFILE_URI}
+	URL ${SNDFILE_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${SNDFILE_HASH}
+	URL_HASH MD5=${SNDFILE_HASH}
-  PREFIX ${BUILD_DIR}/sndfile
+	PREFIX ${BUILD_DIR}/sndfile
-  PATCH_COMMAND ${SNDFILE_PATCH_CMD}
+	PATCH_COMMAND ${SNDFILE_PATCH_CMD}
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && ${SNDFILE_ENV} ${CONFIGURE_COMMAND} ${SNDFILE_OPTIONS} --prefix=${mingw_LIBDIR}/sndfile
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && ${SNDFILE_ENV} ${CONFIGURE_COMMAND} ${SNDFILE_OPTIONS} --prefix=${mingw_LIBDIR}/sndfile
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make -j${MAKE_THREADS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make install
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sndfile/src/external_sndfile/ && make install
-  INSTALL_DIR ${LIBDIR}/sndfile
+	INSTALL_DIR ${LIBDIR}/sndfile
 )
 if(MSVC)
-  set_target_properties(external_sndfile PROPERTIES FOLDER Mingw)
+	set_target_properties(external_sndfile PROPERTIES FOLDER Mingw)
 endif()
-add_dependencies(
+add_dependencies(external_sndfile external_ogg external_vorbis)
  external_sndfile
  external_ogg
  external_vorbis
 )
 if(UNIX)
-  add_dependencies(
+	add_dependencies(external_sndfile external_flac)
    external_sndfile
    external_flac
  )
 endif()
--- a/build_files/build_environment/cmake/spnav.cmake
+++ b/build_files/build_environment/cmake/spnav.cmake
@@ -17,12 +17,12 @@
 # ***** END GPL LICENSE BLOCK *****
 ExternalProject_Add(external_spnav
-  URL ${SPNAV_URI}
+	URL ${SPNAV_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${SPNAV_HASH}
+	URL_HASH MD5=${SPNAV_HASH}
-  PREFIX ${BUILD_DIR}/spnav
+	PREFIX ${BUILD_DIR}/spnav
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/spnav --disable-shared --enable-static --with-pic
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/spnav --disable-shared --enable-static --with-pic
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && make -j${MAKE_THREADS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && make install
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/spnav/src/external_spnav/ && make install
-  INSTALL_DIR ${LIBDIR}/spnav
+	INSTALL_DIR ${LIBDIR}/spnav
 )
--- 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
@@ -17,36 +17,20 @@
 # ***** END GPL LICENSE BLOCK *****
 set(TBB_EXTRA_ARGS
-  -DTBB_BUILD_SHARED=Off
+	-DTBB_BUILD_SHARED=Off
-  -DTBB_BUILD_TBBMALLOC=Off
+	-DTBB_BUILD_TBBMALLOC=Off
-  -DTBB_BUILD_TBBMALLOC_PROXY=Off
+	-DTBB_BUILD_TBBMALLOC_PROXY=Off
-  -DTBB_BUILD_STATIC=On
+	-DTBB_BUILD_STATIC=On
 )
 # CMake script for TBB from https://github.com/wjakob/tbb/blob/master/CMakeLists.txt
 ExternalProject_Add(external_tbb
-  URL ${TBB_URI}
+	URL ${TBB_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${TBB_HASH}
+	URL_HASH MD5=${TBB_HASH}
-  PREFIX ${BUILD_DIR}/tbb
+	PREFIX ${BUILD_DIR}/tbb
-  PATCH_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_tbb.txt ${BUILD_DIR}/tbb/src/external_tbb/CMakeLists.txt &&
+	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/vs2010/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}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tbb ${DEFAULT_CMAKE_FLAGS} ${TBB_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/tbb
+	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/theora.cmake
+++ b/build_files/build_environment/cmake/theora.cmake
@@ -17,28 +17,24 @@
 # ***** END GPL LICENSE BLOCK *****
 ExternalProject_Add(external_theora
-  URL ${THEORA_URI}
+	URL ${THEORA_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH SHA256=${THEORA_HASH}
+	URL_HASH SHA256=${THEORA_HASH}
-  PREFIX ${BUILD_DIR}/theora
+	PREFIX ${BUILD_DIR}/theora
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/theora
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/theora
-    --disable-shared
+		--disable-shared
-    --enable-static
+		--enable-static
-    --with-pic
+		--with-pic
-    --with-ogg=${LIBDIR}/ogg
+		--with-ogg=${LIBDIR}/ogg
-    --with-vorbis=${LIBDIR}/vorbis
+		--with-vorbis=${LIBDIR}/vorbis
-    --disable-examples
+		--disable-examples
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && make -j${MAKE_THREADS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && make install
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && make install
-  INSTALL_DIR ${LIBDIR}/theora
+	INSTALL_DIR ${LIBDIR}/theora
 )
-add_dependencies(
+add_dependencies(external_theora external_vorbis external_ogg)
  external_theora
  external_vorbis
  external_ogg
 )
 if(MSVC)
-  set_target_properties(external_theora PROPERTIES FOLDER Mingw)
+	set_target_properties(external_theora PROPERTIES FOLDER Mingw)
 endif()
--- a/build_files/build_environment/cmake/tiff.cmake
+++ b/build_files/build_environment/cmake/tiff.cmake
@@ -17,31 +17,28 @@
 # ***** END GPL LICENSE BLOCK *****
 set(TIFF_EXTRA_ARGS
-  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include
+	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include
-  -DPNG_STATIC=ON
+	-DPNG_STATIC=ON
-  -DBUILD_SHARED_LIBS=OFF
+	-DBUILD_SHARED_LIBS=OFF
-  -Dlzma=OFF
+	-Dlzma=OFF
-  -Djbig=OFF
+	-Djbig=OFF
 )
 ExternalProject_Add(external_tiff
-  URL ${TIFF_URI}
+	URL ${TIFF_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${TIFF_HASH}
+	URL_HASH MD5=${TIFF_HASH}
-  PREFIX ${BUILD_DIR}/tiff
+	PREFIX ${BUILD_DIR}/tiff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tiff ${DEFAULT_CMAKE_FLAGS} ${TIFF_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tiff ${DEFAULT_CMAKE_FLAGS} ${TIFF_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/tiff
+	INSTALL_DIR ${LIBDIR}/tiff
 )
-add_dependencies(
+add_dependencies(external_tiff external_zlib)
  external_tiff
  external_zlib
 )
-if(WIN32 AND BUILD_MODE STREQUAL Debug)
+if(BUILD_MODE STREQUAL Debug)
-  ExternalProject_Add_Step(external_tiff after_install
+	ExternalProject_Add_Step(external_tiff after_install
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiffd${LIBEXT} ${LIBDIR}/tiff/lib/tiff${LIBEXT}
+		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiffd${LIBEXT} ${LIBDIR}/tiff/lib/tiff${LIBEXT}
-    DEPENDEES install
+		DEPENDEES install
-  )
+	)
 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_VERSION 1.2.8)
-set(ZLIB_URI https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz)
+set(ZLIB_URI https://netcologne.dl.sourceforge.net/project/libpng/zlib/${ZLIB_VERSION}/zlib-${ZLIB_VERSION}.tar.gz)
-set(ZLIB_HASH 1c9f62f0778697a09d36121ead88e08e)
+set(ZLIB_HASH 44d667c142d7cda120332623eab69f40)
-set(OPENAL_VERSION 1.18.2)
+set(OPENAL_VERSION 1.17.2)
-set(OPENAL_URI http://openal-soft.org/openal-releases/openal-soft-${OPENAL_VERSION}.tar.bz2)
+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_VERSION 1.6.21)
-set(PNG_URI http://prdownloads.sourceforge.net/libpng/libpng-${PNG_VERSION}.tar.xz)
+set(PNG_URI http://prdownloads.sourceforge.net/libpng/libpng-${PNG_VERSION}.tar.gz)
-set(PNG_HASH 678b7e696a62a193ed3503b04bf449d6)
+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 1.60.0)
-set(BOOST_VERSION_NODOTS 1_68_0)
+set(BOOST_VERSION_NODOTS 1_60_0)
-set(BOOST_URI https://dl.bintray.com/boostorg/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_NODOTS}.tar.gz)
+set(BOOST_URI http://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/boost_${BOOST_VERSION_NODOTS}.tar.bz2/download)
-set(BOOST_HASH 5d8b4503582fffa9eefdb9045359c239)
+set(BOOST_MD5 65a840e1a0b13a558ff19eeb2c4f0cbe)
-set(BLOSC_VERSION 1.14.4)
+set(BLOSC_VERSION 1.7.1)
-set(BLOSC_URI https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.tar.gz)
+set(BLOSC_URI https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.zip)
-set(BLOSC_HASH e80dfc71e4cba03b8d01ed0876547ffe)
+set(BLOSC_HASH ff5cc729a5a25934ef714217218eed26)
-set(PTHREADS_VERSION 3.0.0)
+set(PTHREADS_VERSION 2-9-1)
-set(PTHREADS_URI http://sourceforge.mirrorservice.org/p/pt/pthreads4w/pthreads4w-code-v${PTHREADS_VERSION}.zip)
+set(PTHREADS_URI ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-${PTHREADS_VERSION}-release.tar.gz)
-set(PTHREADS_HASH f3bf81bb395840b3446197bcf4ecd653)
+set(PTHREADS_SHA512 9c06e85310766834370c3dceb83faafd397da18a32411ca7645c8eb6b9495fea54ca2872f4a3e8d83cb5fdc5dea7f3f0464be5bb9af3222a6534574a184bd551)
-set(ILMBASE_VERSION 2.3.0)
+set(ILMBASE_VERSION 2.2.0)
-if(WIN32)
+set(ILMBASE_URI http://download.savannah.nongnu.org/releases/openexr/ilmbase-${ILMBASE_VERSION}.tar.gz)
-  if(BUILD_MODE STREQUAL Release)
+set(ILMBASE_HASH b540db502c5fa42078249f43d18a4652)
    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(OPENEXR_VERSION 2.3.0)
+set(OPENEXR_VERSION 2.2.0)
-if(WIN32) #release 2.3.0 tarball has broken cmake support
+set(OPENEXR_URI http://download.savannah.nongnu.org/releases/openexr/openexr-2.2.0.tar.gz)
-  set(OPENEXR_URI https://github.com/openexr/openexr/archive/0ac2ea34c8f3134148a5df4052e40f155b76f6fb.tar.gz)
+set(OPENEXR_HASH b64e931c82aa3790329c21418373db4e)
  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(FREETYPE_VERSION 2.9.1)
+set(FREETYPE_VERSION 263)
-set(FREETYPE_URI http://prdownloads.sourceforge.net/freetype/freetype-${FREETYPE_VERSION}.tar.gz)
+set(FREETYPE_URI http://download.savannah.gnu.org/releases/freetype/ft${FREETYPE_VERSION}.zip)
-set(FREETYPE_HASH 3adb0e35d3c100c456357345ccfa8056)
+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_VERSION 1.7.1)
-set(ALEMBIC_URI https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.tar.gz)
+set(ALEMBIC_URI https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.zip)
-set(ALEMBIC_MD5 d095c2feb5e183b824904db7b63c1d30)
+set(ALEMBIC_MD5 cf7705055501d5ea0cb8256866496f79)
 ## hash is for 3.1.2
 set(GLFW_GIT_UID 30306e54705c3adae9fe082c816a3be71963485c)
@@ -105,122 +88,134 @@ 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_VERSION v3_1_1)
-set(OPENSUBDIV_Hash 29c79dc01ef616aab02670bed5544ddd)
+set(OPENSUBDIV_Hash 25a9a6a94136b0eb85ce69e9c8cb6ab3)
-set(OPENSUBDIV_URI https://github.com/PixarAnimationStudios/OpenSubdiv/archive/${OPENSUBDIV_VERSION}.tar.gz)
+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.68)
+set(OPENCOLLADA_VERSION v1.6.51)
 set(OPENCOLLADA_URI https://github.com/KhronosGroup/OpenCOLLADA/archive/${OPENCOLLADA_VERSION}.tar.gz)
-set(OPENCOLLADA_HASH ee7dae874019fea7be11613d07567493)
+set(OPENCOLLADA_HASH 23db5087faed4bc4cc1dfe456c0d4701)
-set(OPENCOLORIO_VERSION 1.1.0)
+set(OPENCOLORIO_URI https://github.com/imageworks/OpenColorIO/archive/6de971097c7f552300f669ed69ca0b6cf5a70843.zip)
-set(OPENCOLORIO_URI https://github.com/imageworks/OpenColorIO/archive/v${OPENCOLORIO_VERSION}.tar.gz)
+set(OPENCOLORIO_HASH c9de0fd98f26ce6f2e08d617ca68b8e4)
 set(OPENCOLORIO_HASH 802d8f5b1d1fe316ec5f76511aa611b8)
-set(LLVM_VERSION 6.0.1)
+set(LLVM_VERSION 3.4.2)
-set(LLVM_URI http://releases.llvm.org/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz)
+set(LLVM_URI http://llvm.org/releases/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.gz)
-set(LLVM_HASH c88c98709300ce2c285391f387fecce0)
+set(LLVM_HASH a20669f75967440de949ac3b1bad439c)
-set(CLANG_URI http://releases.llvm.org/${LLVM_VERSION}/cfe-${LLVM_VERSION}.src.tar.xz)
+set(CLANG_URI http://llvm.org/releases/${LLVM_VERSION}/cfe-${LLVM_VERSION}.src.tar.gz)
-set(CLANG_HASH 4e419bd4e3b55aa06d872320f754bd85)
+set(CLANG_HASH 87945973b7c73038871c5f849a818588)
-set(OPENMP_URI http://releases.llvm.org/${LLVM_VERSION}/openmp-${LLVM_VERSION}.src.tar.xz)
+set(OPENIMAGEIO_VERSION 1.7.15)
-set(OPENMP_HASH 4826402ae3633c36c51ba4d0e5527d30)
+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(FLEXBISON_VERSION 2.5.5)
-set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.tar.gz)
+set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison//win_flex_bison-2.5.5.zip)
-set(OSL_HASH 44ad511e424965a10fce051a053b0605)
+set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce)
-set(PYTHON_VERSION 3.7.0)
+set(OSL_VERSION 1.7.5)
-set(PYTHON_SHORT_VERSION 3.7)
+set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.zip)
-set(PYTHON_SHORT_VERSION_NO_DOTS 37)
+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_VERSION 44_20160128)
-set(TBB_URI https://github.com/01org/tbb/archive/${TBB_VERSION}.tar.gz)
+set(TBB_URI https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${TBB_VERSION}oss_src_0.tgz)
-set(TBB_HASH ff3ae09f8c23892fbc3008c39f78288f)
+set(TBB_HASH 9d8a4cdf43496f1b3f7c473a5248e5cc)
-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(IDNA_VERSION 2.6)
-set(CHARDET_VERSION 3.0.4)
+set(CHARDET_VERSION 3.0.2)
-set(URLLIB3_VERSION 1.23)
+set(URLLIB3_VERSION 1.22)
-set(CERTIFI_VERSION 2018.8.13)
+set(CERTIFI_VERSION 2017.7.27.1)
-set(REQUESTS_VERSION 2.19.1)
+set(REQUESTS_VERSION 2.18.4)
-set(NUMPY_VERSION v1.15.0)
+set(NUMPY_VERSION v1.13.1)
-set(NUMPY_SHORT_VERSION 1.15)
+set(NUMPY_SHORT_VERSION 1.13)
-set(NUMPY_URI https://files.pythonhosted.org/packages/3a/20/c81632328b1a4e1db65f45c0a1350a9c5341fd4bbb8ea66cdd98da56fe2e/numpy-1.15.0.zip)
+set(NUMPY_URI https://pypi.python.org/packages/c0/3a/40967d9f5675fbb097ffec170f59c2ba19fc96373e73ad47c2cae9a30aed/numpy-1.13.1.zip)
-set(NUMPY_HASH 20e13185089011116a98e11c9bf8aa07)
+set(NUMPY_HASH 2c3c0f4edf720c3a7b525dacc825b9ae)
-set(LAME_VERSION 3.100)
+set(LAME_VERSION 3.99.5)
-set(LAME_URI http://downloads.sourceforge.net/project/lame/lame/3.100/lame-${LAME_VERSION}.tar.gz)
+set(LAME_URI http://downloads.sourceforge.net/project/lame/lame/3.99/lame-${LAME_VERSION}.tar.gz)
-set(LAME_HASH 83e260acbe4389b54fe08e0bdbf7cddb)
+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_VERSION 1.5.0)
-set(VPX_URI https://github.com/webmproject/libvpx/archive/v${VPX_VERSION}/libvpx-v${VPX_VERSION}.tar.gz)
+set(VPX_URI http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-${VPX_VERSION}.tar.bz2)
-set(VPX_HASH 1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238)
+set(VPX_HASH 306d67908625675f8e188d37a81fbfafdf5068b09d9aa52702b6fbe601c76797)
-set(X264_URI http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20180811-2245-stable.tar.bz2)
+set(ORC_VERSION 0.4.25)
-set(X264_HASH ae8a868a0e236a348b35d79f3ee80294b169d1195408b689f9851383661ed7aa)
+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_VERSION 1.5.2)
-set(OPENJPEG_SHORT_VERSION 2.3)
+set(OPENJPEG_SHORT_VERSION 1.5)
-# Use slightly newer commit after release which includes a cmake fix
+set(OPENJPEG_URI https://github.com/uclouvain/openjpeg/archive/version.${OPENJPEG_VERSION}.tar.gz)
-set(OPENJPEG_URI https://github.com/uclouvain/openjpeg/archive/66297f07a43.zip)
+set(OPENJPEG_HASH 3734e95edd0bef6e056815591755efd822228dc3cd866894e00a2c929026b16d)
 set(OPENJPEG_HASH 8242b18d908c7c42174e4231a741cfa7ce7c26b6ed5c9644feb9df7b3054310b)
-set(FAAD_VERSION 2-2.8.8)
+set(FAAD_VERSION 2-2.7)
-set(FAAD_URI http://downloads.sourceforge.net/faac/faad${FAAD_VERSION}.tar.gz)
+set(FAAD_URI http://downloads.sourceforge.net/faac/faad${FAAD_VERSION}.tar.bz2)
-set(FAAD_HASH 28f6116efdbe9378269f8a6221767d1f)
+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 +233,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)
@@ -251,54 +246,5 @@ set(JEMALLOC_URI https://github.com/jemalloc/jemalloc/releases/download/${JEMALL
 set(JEMALLOC_HASH 507f7b6b882d868730d644510491d18f)
 set(XML2_VERSION 2.9.4)
-set(XML2_URI http://xmlsoft.org/sources/libxml2-${XML2_VERSION}.tar.gz)
+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 https://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)
 set(EMBREE_VERSION 3.2.4)
 set(EMBREE_URI https://github.com/embree/embree/archive/v${EMBREE_VERSION}.zip)
 set(EMBREE_HASH 3d4a1147002ff43939d45140aa9d6fb8)
--- a/build_files/build_environment/cmake/vorbis.cmake
+++ b/build_files/build_environment/cmake/vorbis.cmake
@@ -17,25 +17,22 @@
 # ***** END GPL LICENSE BLOCK *****
 ExternalProject_Add(external_vorbis
-  URL ${VORBIS_URI}
+	URL ${VORBIS_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH SHA256=${VORBIS_HASH}
+	URL_HASH SHA256=${VORBIS_HASH}
-  PREFIX ${BUILD_DIR}/vorbis
+	PREFIX ${BUILD_DIR}/vorbis
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vorbis/src/external_vorbis/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/vorbis
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vorbis/src/external_vorbis/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/vorbis
-    --disable-shared
+		--disable-shared
-    --enable-static
+		--enable-static
-    --with-pic
+		--with-pic
-    --with-ogg=${LIBDIR}/ogg
+		--with-ogg=${LIBDIR}/ogg
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vorbis/src/external_vorbis/ && make -j${MAKE_THREADS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vorbis/src/external_vorbis/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vorbis/src/external_vorbis/ && make install
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vorbis/src/external_vorbis/ && make install
-  INSTALL_DIR ${LIBDIR}/vorbis
+	INSTALL_DIR ${LIBDIR}/vorbis
 )
-add_dependencies(
+add_dependencies(external_vorbis external_ogg)
  external_vorbis
  external_ogg
 )
 if(MSVC)
-  set_target_properties(external_vorbis PROPERTIES FOLDER Mingw)
+	set_target_properties(external_vorbis PROPERTIES FOLDER Mingw)
 endif()
--- a/build_files/build_environment/cmake/vpx.cmake
+++ b/build_files/build_environment/cmake/vpx.cmake
@@ -17,44 +17,44 @@
 # ***** END GPL LICENSE BLOCK *****
 if(WIN32)
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+	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()
+	else()
-    set(VPX_EXTRA_FLAGS --target=x86-win32-gcc --disable-multithread)
+		set(VPX_EXTRA_FLAGS --target=x86-win32-gcc)
-  endif()
+	endif()
 else()
-  if(APPLE)
+	if(APPLE)
-    set(VPX_EXTRA_FLAGS --target=x86_64-darwin13-gcc)
+		set(VPX_EXTRA_FLAGS --target=x86_64-darwin13-gcc)
-  else()
+	else()
-    set(VPX_EXTRA_FLAGS --target=generic-gnu)
+		set(VPX_EXTRA_FLAGS --target=generic-gnu)
-  endif()
+	endif()
 endif()
 ExternalProject_Add(external_vpx
-  URL ${VPX_URI}
+	URL ${VPX_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH SHA256=${VPX_HASH}
+	URL_HASH SHA256=${VPX_HASH}
-  PREFIX ${BUILD_DIR}/vpx
+	PREFIX ${BUILD_DIR}/vpx
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/vpx/src/external_vpx/ &&
+		cd ${BUILD_DIR}/vpx/src/external_vpx/ &&
-    ${CONFIGURE_COMMAND_NO_TARGET} --prefix=${LIBDIR}/vpx
+		${CONFIGURE_COMMAND_NO_TARGET} --prefix=${LIBDIR}/vpx
-      --disable-shared
+			--disable-shared
-      --enable-static
+			--enable-static
-      --disable-install-bins
+			--disable-install-bins
-      --disable-install-srcs
+			--disable-install-srcs
-      --disable-sse4_1
+			--disable-sse4_1
-      --disable-sse3
+			--disable-sse3
-      --disable-ssse3
+			--disable-ssse3
-      --disable-avx
+			--disable-avx
-      --disable-avx2
+			--disable-avx2
-      --disable-unit-tests
+			--disable-unit-tests
-      --disable-examples
+			--disable-examples
-      ${VPX_EXTRA_FLAGS}
+			${VPX_EXTRA_FLAGS}
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && make -j${MAKE_THREADS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && make install
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && make install
-  INSTALL_DIR ${LIBDIR}/vpx
+	INSTALL_DIR ${LIBDIR}/vpx
 )
 if(MSVC)
-  set_target_properties(external_vpx PROPERTIES FOLDER Mingw)
+	set_target_properties(external_vpx PROPERTIES FOLDER Mingw)
 endif()
--- a/build_files/build_environment/cmake/webp.cmake
+++ b/build_files/build_environment/cmake/webp.cmake
@@ -20,22 +20,31 @@
 # library itself does not depend on them, so should give no problems.
 set(WEBP_EXTRA_ARGS
-  -DWEBP_HAVE_SSE2=ON
+	-DWEBP_HAVE_SSE2=ON
-  -DWEBP_HAVE_SSE41=OFF
+	-DWEBP_HAVE_SSE41=OFF
-  -DWEBP_HAVE_AVX2=OFF
+	-DWEBP_HAVE_AVX2=OFF
 )
 if(WIN32)
-  set(WEBP_BUILD_DIR ${BUILD_MODE}/)
+	set(WEBP_BUILD_DIR ${BUILD_MODE}/)
 else()
-  set(WEBP_BUILD_DIR)
+	set(WEBP_BUILD_DIR)
 endif()
 ExternalProject_Add(external_webp
-  URL ${WEBP_URI}
+	URL ${WEBP_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${WEBP_HASH}
+	URL_HASH MD5=${WEBP_HASH}
-  PREFIX ${BUILD_DIR}/webp
+	PREFIX ${BUILD_DIR}/webp
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/webp -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${WEBP_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/webp -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${WEBP_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/webp
+	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
@@ -17,29 +17,24 @@
 # ***** END GPL LICENSE BLOCK *****
 if(WIN32)
-  set(X264_EXTRA_ARGS --enable-win32thread --cross-prefix=${MINGW_HOST}- --host=${MINGW_HOST})
+	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}
+	URL ${X264_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH SHA256=${X264_HASH}
+	URL_HASH SHA256=${X264_HASH}
-  PREFIX ${BUILD_DIR}/x264
+	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-static
+		--enable-pic
-    --enable-pic
+		--disable-lavf
-    --disable-lavf
+		${X264_EXTRA_ARGS}
-    ${X264_EXTRA_ARGS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && make -j${MAKE_THREADS}
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && make -j${MAKE_THREADS}
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && make install
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && make install
+	INSTALL_DIR ${LIBDIR}/x264
  INSTALL_DIR ${LIBDIR}/x264
 )
 if(MSVC)
-  set_target_properties(external_x264 PROPERTIES FOLDER Mingw)
+	set_target_properties(external_x264 PROPERTIES FOLDER Mingw)
 endif()
--- a/build_files/build_environment/cmake/xml2.cmake
+++ b/build_files/build_environment/cmake/xml2.cmake
@@ -17,20 +17,20 @@
 # ***** END GPL LICENSE BLOCK *****
 ExternalProject_Add(external_xml2
-  URL ${XML2_URI}
+	URL ${XML2_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${XML2_HASH}
+	URL_HASH MD5=${XML2_HASH}
-  PREFIX ${BUILD_DIR}/xml2
+	PREFIX ${BUILD_DIR}/xml2
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && ${CONFIGURE_COMMAND}
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && ${CONFIGURE_COMMAND}
-    --prefix=${LIBDIR}/xml2
+		--prefix=${LIBDIR}/xml2
-    --disable-shared
+		--disable-shared
-    --enable-static
+		--enable-static
-    --with-pic
+		--with-pic
-    --with-python=no
+		--with-python=no
-    --with-lzma=no
+		--with-lzma=no
-    --with-zlib=no
+		--with-zlib=no
-    --with-iconv=no
+		--with-iconv=no
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && make -j${MAKE_THREADS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && make install
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xml2/src/external_xml2/ && make install
-  INSTALL_DIR ${LIBDIR}/xml2
+	INSTALL_DIR ${LIBDIR}/xml2
 )
--- a/build_files/build_environment/cmake/xvidcore.cmake
+++ b/build_files/build_environment/cmake/xvidcore.cmake
@@ -17,28 +17,28 @@
 # ***** END GPL LICENSE BLOCK *****
 if(WIN32)
-  set(XVIDCORE_EXTRA_ARGS --host=${MINGW_HOST})
+	set(XVIDCORE_EXTRA_ARGS --host=${MINGW_HOST})
 endif()
 ExternalProject_Add(external_xvidcore
-  URL ${XVIDCORE_URI}
+	URL ${XVIDCORE_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH SHA256=${XVIDCORE_HASH}
+	URL_HASH SHA256=${XVIDCORE_HASH}
-  PREFIX ${BUILD_DIR}/xvidcore
+	PREFIX ${BUILD_DIR}/xvidcore
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xvidcore/src/external_xvidcore/build/generic && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/xvidcore ${XVIDCORE_EXTRA_ARGS}
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xvidcore/src/external_xvidcore/build/generic && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/xvidcore ${XVIDCORE_EXTRA_ARGS}
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xvidcore/src/external_xvidcore/build/generic && make -j${MAKE_THREADS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/xvidcore/src/external_xvidcore/build/generic && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} &&
+	INSTALL_COMMAND ${CONFIGURE_ENV} &&
-  ${CMAKE_COMMAND} -E remove ${LIBDIR}/xvidcore/lib/* && # clean because re-installing fails otherwise
+	${CMAKE_COMMAND} -E remove ${LIBDIR}/xvidcore/lib/* && # clean because re-installing fails otherwise
-  cd ${BUILD_DIR}/xvidcore/src/external_xvidcore/build/generic && make install
+	cd ${BUILD_DIR}/xvidcore/src/external_xvidcore/build/generic && make install
-  INSTALL_DIR ${LIBDIR}/xvidcore
+	INSTALL_DIR ${LIBDIR}/xvidcore
 )
 ExternalProject_Add_Step(external_xvidcore after_install
-  COMMAND ${CMAKE_COMMAND} -E rename ${LIBDIR}/xvidcore/lib/xvidcore.a ${LIBDIR}/xvidcore/lib/libxvidcore.a || true
+	COMMAND ${CMAKE_COMMAND} -E rename ${LIBDIR}/xvidcore/lib/xvidcore.a ${LIBDIR}/xvidcore/lib/libxvidcore.a || true
-  COMMAND ${CMAKE_COMMAND} -E remove ${LIBDIR}/xvidcore/lib/xvidcore.dll.a
+	COMMAND ${CMAKE_COMMAND} -E remove ${LIBDIR}/xvidcore/lib/xvidcore.dll.a
-  DEPENDEES install
+	DEPENDEES install
 )
 if(MSVC)
-  set_target_properties(external_xvidcore PROPERTIES FOLDER Mingw)
+	set_target_properties(external_xvidcore PROPERTIES FOLDER Mingw)
 endif()
--- 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
@@ -17,31 +17,17 @@
 # ***** END GPL LICENSE BLOCK *****
 ExternalProject_Add(external_zlib
-  URL ${ZLIB_URI}
+	URL ${ZLIB_URI}
-  URL_HASH MD5=${ZLIB_HASH}
+	URL_HASH MD5=${ZLIB_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/zlib
+	PREFIX ${BUILD_DIR}/zlib
-  CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib ${DEFAULT_CMAKE_FLAGS}
+	CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib ${DEFAULT_CMAKE_FLAGS}
-  INSTALL_DIR ${LIBDIR}/zlib
+	INSTALL_DIR ${LIBDIR}/zlib
 )
-if(WIN32)
+if(BUILD_MODE STREQUAL Debug)
-  if(BUILD_MODE STREQUAL Release)
+	ExternalProject_Add_Step(external_zlib after_install
-    ExternalProject_Add_Step(external_zlib after_install
+		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstaticd${LIBEXT} ${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstatic${LIBEXT} ${HARVEST_TARGET}/zlib/lib/libz_st${LIBEXT}
+		DEPENDEES install
-      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}
    DEPENDEES install
    )
  endif()
 else()
  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()
--- a/build_files/build_environment/cmake/zlib_mingw.cmake
+++ b/build_files/build_environment/cmake/zlib_mingw.cmake
@@ -17,23 +17,24 @@
 # ***** END GPL LICENSE BLOCK *****
 ExternalProject_Add(external_zlib_mingw
-  URL ${ZLIB_URI}
+	URL ${ZLIB_URI}
-  URL_HASH MD5=${ZLIB_HASH}
+	URL_HASH MD5=${ZLIB_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/zlib_mingw
+	PREFIX ${BUILD_DIR}/zlib_mingw
-  CONFIGURE_COMMAND echo .
+	CONFIGURE_COMMAND echo .
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/zlib_mingw/src/external_zlib_mingw/ && make -f win32/makefile.gcc -j${MAKE_THREADS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/zlib_mingw/src/external_zlib_mingw/ && make -f win32/makefile.gcc -j${MAKE_THREADS}
-  INSTALL_COMMAND echo .
+	INSTALL_COMMAND echo .
-  INSTALL_DIR ${LIBDIR}/zlib_mingw
+	INSTALL_DIR ${LIBDIR}/zlib_mingw
 )
 if(BUILD_MODE STREQUAL Release)
-  ExternalProject_Add_Step(external_zlib_mingw after_install
+	ExternalProject_Add_Step(external_zlib_mingw after_install
-    COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/zlib_mingw/src/external_zlib_mingw/libz.a ${LIBDIR}/zlib/lib/z.lib
+		COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/zlib_mingw/src/external_zlib_mingw/libz.a ${LIBDIR}/zlib/lib/z.lib
-    DEPENDEES install
+		DEPENDEES install
-  )
+	)
 endif()
 if(MSVC)
-  set_target_properties(external_zlib_mingw PROPERTIES FOLDER Mingw)
+	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
@@ -26,17 +26,17 @@ ARGS=$( \
 getopt \
 -o s:i:t:h \
 --long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,\
-with-all,with-opencollada,with-jack,with-embree,\
+with-all,with-opencollada,with-jack,\
 ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,\
 force-all,force-python,force-numpy,force-boost,\
 force-ocio,force-openexr,force-oiio,force-llvm,force-osl,force-osd,force-openvdb,\
-force-ffmpeg,force-opencollada,force-alembic,force-embree,\
+force-ffmpeg,force-opencollada,force-alembic,\
 build-all,build-python,build-numpy,build-boost,\
 build-ocio,build-openexr,build-oiio,build-llvm,build-osl,build-osd,build-openvdb,\
-build-ffmpeg,build-opencollada,build-alembic,build-embree,\
+build-ffmpeg,build-opencollada,build-alembic,\
 skip-python,skip-numpy,skip-boost,\
 skip-ocio,skip-openexr,skip-oiio,skip-llvm,skip-osl,skip-osd,skip-openvdb,\
-skip-ffmpeg,skip-opencollada,skip-alembic,skip-embree \
+skip-ffmpeg,skip-opencollada,skip-alembic \
 -- "$@" \
 )
@@ -54,9 +54,8 @@ SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 # Do not install some optional, potentially conflicting libs by default...
 WITH_ALL=false
-# Do not yet enable opencollada or embree, use --with-opencollada/--with-embree (or --with-all) option to try it.
+# Do not yet enable opencollada, use --with-opencollada (or --with-all) option to try it.
 WITH_OPENCOLLADA=false
 WITH_EMBREE=false
 THREADS=$(nproc)
@@ -68,7 +67,6 @@ or use --source/--install options, if you want to use other paths!
 Number of threads for building: \$THREADS (automatically detected, use --threads=<nbr> to override it).
 Full install: \$WITH_ALL (use --with-all option to enable it).
 Building OpenCOLLADA: \$WITH_OPENCOLLADA (use --with-opencollada option to enable it).
 Building Embree: \$WITH_EMBREE (use --with-embree option to enable it).
 Example:
 Full install without OpenCOLLADA: --with-all --skip-opencollada
@@ -115,9 +113,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
    --with-opencollada
        Build and install the OpenCOLLADA libraries.
    --with-embree
        Build and install the Embree libraries.
    --with-jack
        Install the jack libraries.
@@ -182,9 +177,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
    --build-opencollada
        Force the build of OpenCOLLADA.
    --build-embree
        Force the build of Embree.
    --build-ffmpeg
        Force the build of FFMpeg.
@@ -237,9 +229,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
    --force-opencollada
        Force the rebuild of OpenCOLLADA.
    --force-embree
        Force the rebuild of Embree.
    --force-ffmpeg
        Force the rebuild of FFMpeg.
@@ -285,9 +274,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
    --skip-opencollada
        Unconditionally skip OpenCOLLADA installation/building.
    --skip-Embree
        Unconditionally skip Embree installation/building.
    --skip-ffmpeg
        Unconditionally skip FFMpeg installation/building.\""
@@ -299,98 +285,91 @@ SUDO="sudo"
 NO_BUILD=false
 NO_CONFIRM=false
-USE_CXX11=true
+USE_CXX11=true  # Mandatory in blender2.8
-CLANG_FORMAT_VERSION_MIN="6.0"
+PYTHON_VERSION="3.6.2"
-
+PYTHON_VERSION_MIN="3.6"
 PYTHON_VERSION="3.7.0"
 PYTHON_VERSION_MIN="3.7"
 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="2.2.0"
-ILMBASE_VERSION_MIN="2.3"
+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="1.7.15"
-OIIO_VERSION_MIN="1.8.13"
+OIIO_VERSION_MIN="1.7.15"
-OIIO_VERSION_MAX="99.99.0"  # UNKNOWN currently # Not supported by current OSL...
+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="3.4"
-LLVM_VERSION_MIN="6.0"
+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.68"
+OPENCOLLADA_VERSION="1.6.51"
 OPENCOLLADA_FORCE_BUILD=false
 OPENCOLLADA_FORCE_REBUILD=false
 OPENCOLLADA_SKIP=false
-EMBREE_VERSION="3.2.4"
+FFMPEG_VERSION="3.2.1"
 EMBREE_FORCE_BUILD=false
 EMBREE_FORCE_REBUILD=false
 EMBREE_SKIP=false
 FFMPEG_VERSION="4.0.2"
 FFMPEG_VERSION_MIN="2.8.4"
 FFMPEG_FORCE_BUILD=false
 FFMPEG_FORCE_REBUILD=false
@@ -523,9 +502,6 @@ while true; do
    --with-opencollada)
      WITH_OPENCOLLADA=true; shift; continue
    ;;
    --with-embree)
      WITH_EMBREE=true; shift; continue
    ;;
    --with-jack)
      WITH_JACK=true; shift; continue;
    ;;
@@ -571,7 +547,6 @@ while true; do
      OSD_FORCE_BUILD=true
      OPENVDB_FORCE_BUILD=true
      OPENCOLLADA_FORCE_BUILD=true
      EMBREE_FORCE_BUILD=true
      FFMPEG_FORCE_BUILD=true
      ALEMBIC_FORCE_BUILD=true
      shift; continue
@@ -613,9 +588,6 @@ while true; do
    --build-opencollada)
      OPENCOLLADA_FORCE_BUILD=true; shift; continue
    ;;
    --build-embree)
      EMBREE_FORCE_BUILD=true; shift; continue
    ;;
    --build-ffmpeg)
      FFMPEG_FORCE_BUILD=true; shift; continue
    ;;
@@ -634,7 +606,6 @@ while true; do
      OSD_FORCE_REBUILD=true
      OPENVDB_FORCE_REBUILD=true
      OPENCOLLADA_FORCE_REBUILD=true
      EMBREE_FORCE_REBUILD=true
      FFMPEG_FORCE_REBUILD=true
      ALEMBIC_FORCE_REBUILD=true
      shift; continue
@@ -674,9 +645,6 @@ while true; do
    --force-opencollada)
      OPENCOLLADA_FORCE_REBUILD=true; shift; continue
    ;;
    --force-embree)
      EMBREE_FORCE_REBUILD=true; shift; continue
    ;;
    --force-ffmpeg)
      FFMPEG_FORCE_REBUILD=true; shift; continue
    ;;
@@ -716,9 +684,6 @@ while true; do
    --skip-opencollada)
      OPENCOLLADA_SKIP=true; shift; continue
    ;;
    --skip-embree)
      EMBREE_SKIP=true; shift; continue
    ;;
    --skip-ffmpeg)
      FFMPEG_SKIP=true; shift; continue
    ;;
@@ -743,9 +708,6 @@ done
 if [ "$WITH_ALL" = true -a "$OPENCOLLADA_SKIP" = false ]; then
  WITH_OPENCOLLADA=true
 fi
 if [ "$WITH_ALL" = true -a "$EMBREE_SKIP" = false ]; then
  WITH_EMBREE=true
 fi
 if [ "$WITH_ALL" = true ]; then
  WITH_JACK=true
 fi
@@ -775,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_USE_REPO=true
-OCIO_SOURCE=( "https://github.com/imageworks/OpenColorIO/archive/v$OCIO_VERSION.tar.gz")
+OCIO_SOURCE=( "https://github.com/imageworks/OpenColorIO/tarball/v$OCIO_VERSION" )
-#~ OCIO_SOURCE_REPO=( "https://github.com/imageworks/OpenColorIO.git" )
+OCIO_SOURCE_REPO=( "https://github.com/imageworks/OpenColorIO.git" )
-#~ OCIO_SOURCE_REPO_UID="6de971097c7f552300f669ed69ca0b6cf5a70843"
+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=( "http://download.savannah.nongnu.org/releases/openexr/openexr-$OPENEXR_VERSION.tar.gz" )
-OPENEXR_SOURCE_REPO_UID="0ac2ea34c8f3134148a5df4052e40f155b76f6fb"
+OPENEXR_SOURCE_REPO=( "https://github.com/mont29/openexr.git" )
-OPENEXR_SOURCE=( "https://github.com/openexr/openexr/archive/$OPENEXR_SOURCE_REPO_UID.tar.gz" )
+OPENEXR_SOURCE_REPO_UID="2787aa1cf652d244ed45ae124eb1553f6cff11ee"
-#~ OPENEXR_SOURCE_REPO=( "https://github.com/mont29/openexr.git" )
+ILMBASE_SOURCE=( "http://download.savannah.nongnu.org/releases/openexr/ilmbase-$ILMBASE_VERSION.tar.gz" )
 ILMBASE_SOURCE=( "https://github.com/openexr/openexr/releases/download/v$ILMBASE_VERSION/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=( "https://github.com/OpenImageIO/oiio.git" )
-#~ OIIO_SOURCE_REPO_UID="c9e67275a0b248ead96152f6d2221cc0c0f278a4"
+OIIO_SOURCE_REPO_UID="c9e67275a0b248ead96152f6d2221cc0c0f278a4"
-LLVM_SOURCE=( "http://releases.llvm.org/$LLVM_VERSION/llvm-$LLVM_VERSION.src.tar.xz" )
+LLVM_SOURCE=( "http://llvm.org/releases/$LLVM_VERSION/llvm-$LLVM_VERSION.src.tar.gz" )
-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_CLANG_SOURCE=( "http://llvm.org/releases/$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_BRANCH="master"
-#~ OSL_SOURCE_REPO_UID="7d40ff5fe8e47b030042afb92d0e955f5aa96f48"
+OSL_SOURCE_REPO=( "https://github.com/Nazg-Gul/OpenShadingLanguage.git" )
-#~ OSL_SOURCE_REPO_BRANCH="blender-fixes"
+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=( "https://github.com/PixarAnimationStudios/OpenSubdiv.git" )
-#~ OSD_SOURCE_REPO_UID="404659fffa659da075d1c9416e4fc939139a84ee"
+OSD_SOURCE_REPO_UID="404659fffa659da075d1c9416e4fc939139a84ee"
-#~ OSD_SOURCE_REPO_BRANCH="dev"
+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" )
@@ -828,25 +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.git" )
-OPENCOLLADA_SOURCE=( "https://github.com/KhronosGroup/OpenCOLLADA/archive/v${OPENCOLLADA_VERSION}.tar.gz" )
+OPENCOLLADA_REPO_UID="0c2cdc17c22cf42050e4d42154bed2176363549c"
-#~ OPENCOLLADA_SOURCE_REPO=( "https://github.com/KhronosGroup/OpenCOLLADA.git" )
+OPENCOLLADA_REPO_BRANCH="master"
 #~ OPENCOLLADA_REPO_UID="e937c3897b86fc0da53cde97257f5156"
 #~ OPENCOLLADA_REPO_BRANCH="master"
 EMBREE_USE_REPO=false
 EMBREE_SOURCE=( "https://github.com/embree/embree/archive/v${EMBREE_VERSION}.tar.gz" )
 #~ EMBREE_SOURCE_REPO=( "https://github.com/embree/embree.git" )
 #~ EMBREE_REPO_UID="4a12bfed63c90e85b6eab98b8cdd8dd2a3ba5809"
 #~ EMBREE_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"
+if [ "$USE_CXX11" = true ]; then
-export CXXFLAGS
+  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 ####
@@ -856,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].\""
@@ -880,8 +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).
    * [Embree $EMBREE_VERSION] (from $EMBREE_SOURCE).
    * [Alembic $ALEMBIC_VERSION] (from $ALEMBIC_SOURCE).\""
 if [ "$DO_SHOW_DEPS" = true ]; then
@@ -1246,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
@@ -1294,11 +1254,7 @@ compile_Boost() {
 #### Build OCIO ####
 _init_ocio() {
  _src=$SRC/OpenColorIO-$OCIO_VERSION
-  if [ "$OCIO_USE_REPO" = true ]; then
+  _git=false
    _git=true
  else
    _git=false
  fi
  _inst=$INST/ocio-$OCIO_VERSION
  _inst_shortcut=$INST/ocio
 }
@@ -1365,14 +1321,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" ..
@@ -1439,7 +1393,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
@@ -1535,7 +1489,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
@@ -1649,7 +1603,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
@@ -1692,6 +1646,7 @@ compile_OIIO() {
    cmake_d="$cmake_d -D LINKSTATIC=OFF"
    cmake_d="$cmake_d -D USE_SIMD=sse2"
    cmake_d="$cmake_d -D ILMBASE_VERSION=$ILMBASE_VERSION"
    cmake_d="$cmake_d -D OPENEXR_VERSION=$OPENEXR_VERSION"
    if [ "$_with_built_openexr" = true ]; then
@@ -1707,11 +1662,9 @@ 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"
    cmake_d="$cmake_d -D TXT2MAN="
    #cmake_d="$cmake_d -D CMAKE_EXPORT_COMPILE_COMMANDS=ON"
    #cmake_d="$cmake_d -D CMAKE_VERBOSE_MAKEFILE=ON"
@@ -1725,7 +1678,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"
@@ -1791,7 +1746,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
@@ -1799,20 +1754,23 @@ compile_LLVM() {
    if [ ! -d $_src -o true ]; then
      mkdir -p $SRC
-      download LLVM_SOURCE[@] "$_src.tar.xz"
+      download LLVM_SOURCE[@] "$_src.tar.gz"
-      download LLVM_CLANG_SOURCE[@] "$_src_clang.tar.xz"
+      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
@@ -1915,6 +1873,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!
@@ -1932,7 +1893,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"
@@ -2117,7 +2080,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
@@ -2318,6 +2281,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"
@@ -2401,24 +2370,17 @@ compile_OpenCOLLADA() {
    if [ ! -d $_src ]; then
      mkdir -p $SRC
-      if [ "$OPENCOLLADA_USE_REPO" = true ]; then
+      git clone $OPENCOLLADA_SOURCE $_src
        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
    fi
    cd $_src
-    if [ "$OPENCOLLADA_USE_REPO" = true ]; then
+    # XXX For now, always update from latest repo...
-      git pull origin $OPENCOLLADA_REPO_BRANCH
+    git pull origin $OPENCOLLADA_REPO_BRANCH
-      # Stick to same rev as windows' libs...
+    # Stick to same rev as windows' libs...
-      git checkout $OPENCOLLADA_REPO_UID
+    git checkout $OPENCOLLADA_REPO_UID
-      git reset --hard
+    git reset --hard
    fi
    # Always refresh the whole build!
    if [ -d build ]; then
@@ -2457,101 +2419,6 @@ compile_OpenCOLLADA() {
  fi
 }
 #### Build Embree ####
 _init_embree() {
  _src=$SRC/embree-$EMBREE_VERSION
  _git=true
  _inst=$INST/embree-$EMBREE_VERSION
  _inst_shortcut=$INST/embree
 }
 clean_Embree() {
  _init_embree
  _clean
 }
 compile_Embree() {
  if [ "$NO_BUILD" = true ]; then
    WARNING "--no-build enabled, Embree will not be compiled!"
    return
  fi
  # To be changed each time we make edits that would modify the compiled results!
  embree_magic=9
  _init_embree
  # Clean install if needed!
  magic_compile_check embree-$EMBREE_VERSION $embree_magic
  if [ $? -eq 1 -o "$EMBREE_FORCE_REBUILD" = true ]; then
    clean_Embree
  fi
  if [ ! -d $_inst ]; then
    INFO "Building Embree-$EMBREE_VERSION"
    prepare_opt
    if [ ! -d $_src ]; then
      mkdir -p $SRC
      if [ "EMBREE_USE_REPO" = true ]; then
        git clone $EMBREE_SOURCE_REPO $_src
      else
        download EMBREE_SOURCE[@] "$_src.tar.gz"
        INFO "Unpacking Embree-$EMBREE_VERSION"
        tar -C $SRC -xf $_src.tar.gz
      fi
    fi
    cd $_src
    if [ "$EMBREE_USE_REPO" = true ]; then
      git pull origin $EMBREE_REPO_BRANCH
      # Stick to same rev as windows' libs...
      git checkout $EMBREE_REPO_UID
      git reset --hard
    fi
    # Always refresh the whole build!
    if [ -d build ]; then
      rm -rf build
    fi
    mkdir build
    cd build
    cmake_d="-D CMAKE_BUILD_TYPE=Release"
    cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst"
    cmake_d="$cmake_d -D EMBREE_ISPC_SUPPORT=OFF"
    cmake_d="$cmake_d -D EMBREE_TUTORIALS=OFF"
    cmake_d="$cmake_d -D EMBREE_STATIC_LIB=ON"
    cmake_d="$cmake_d -D EMBREE_RAY_MASK=ON"
    cmake_d="$cmake_d -D EMBREE_FILTER_FUNCTION=ON"
    cmake_d="$cmake_d -D EMBREE_BACKFACE_CULLING=OFF"
    cmake_d="$cmake_d -D EMBREE_TASKING_SYSTEM=INTERNAL"
    cmake_d="$cmake_d -D EMBREE_MAX_ISA=AVX2"
    cmake $cmake_d ../
    make -j$THREADS && make install
    make clean
    if [ -d $_inst ]; then
      _create_inst_shortcut
    else
      ERROR "Embree-$EMBREE_VERSION failed to compile, exiting"
      exit 1
    fi
    magic_compile_set embree-$EMBREE_VERSION $embree_magic
    cd $CWD
    INFO "Done compiling Embree-$EMBREE_VERSION!"
  else
    INFO "Own Embree-$EMBREE_VERSION is up to date, nothing to do!"
    INFO "If you want to force rebuild of this lib, use the --force-embree option."
  fi
 }
 #### Build FFMPEG ####
 _init_ffmpeg() {
  _src=$SRC/ffmpeg-$FFMPEG_VERSION
@@ -2629,7 +2496,7 @@ compile_FFmpeg() {
    ./configure --cc="gcc -Wl,--as-needed" \
        --extra-ldflags="-pthread -static-libgcc" \
        --prefix=$_inst --enable-static \
-        --disable-ffplay --disable-doc \
+        --disable-ffplay --disable-ffserver --disable-doc \
        --enable-gray \
        --enable-avfilter --disable-vdpau \
        --disable-bzlib --disable-libgsm --disable-libspeex \
@@ -2769,8 +2636,8 @@ install_DEB() {
  THEORA_USE=true
  PRINT ""
-  # We need openjp2, libopenjpeg is an old version
+  # New Ubuntu crap (17.04 and more) have no openjpeg lib!
-  OPENJPEG_DEV="libopenjp2-7-dev"
+  OPENJPEG_DEV="libopenjpeg-dev"
  check_package_DEB $OPENJPEG_DEV
  if [ $? -eq 0 ]; then
    _packages="$_packages $OPENJPEG_DEV"
@@ -2789,17 +2656,6 @@ install_DEB() {
    PRINT ""
  fi
  PRINT ""
  CLANG_FORMAT="clang-format"
  check_package_version_ge_DEB $CLANG_FORMAT $CLANG_FORMAT_VERSION_MIN
  if [ $? -eq 0 ]; then
    _packages="$_packages $CLANG_FORMAT"
  else
    PRINT ""
    WARNING "clang-format $CLANG_FORMAT_VERSION_MIN or higher not found, this is NOT needed to get Blender compiling..."
    PRINT ""
  fi
  if [ "$WITH_JACK" = true ]; then
    _packages="$_packages libspnav-dev"
    # Only install jack if jack2 is not already installed!
@@ -2926,7 +2782,6 @@ install_DEB() {
  fi
  if $_do_compile_python; then
    install_packages_DEB libffi-dev
    compile_Python
    PRINT ""
    if [ "$NUMPY_SKIP" = true ]; then
@@ -3023,11 +2878,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
@@ -3130,23 +2985,6 @@ install_DEB() {
    fi
  fi
  if [ "$WITH_EMBREE" = true ]; then
    _do_compile_embree=false
    PRINT ""
    if [ "$EMBREE_SKIP" = true ]; then
      WARNING "Skipping Embree installation, as requested..."
    elif [ "$EMBREE_FORCE_BUILD" = true ]; then
      INFO "Forced Embree building, as requested..."
      _do_compile_embree=true
    else
      # No package currently!
      _do_compile_embree=true
    fi
    if [ "$_do_compile_embree" = true ]; then
      compile_Embree
    fi
  fi
  PRINT ""
  if [ "$FFMPEG_SKIP" = true ]; then
@@ -3335,7 +3173,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"
@@ -3451,16 +3289,6 @@ install_RPM() {
    install_packages_RPM libspnav-devel
  fi
  PRINT ""
  CLANG_FORMAT="clang"  # Yeah, on fedora/suse clang-format is part of main clang package...
  check_package_version_ge_RPM $CLANG_FORMAT $CLANG_FORMAT_VERSION_MIN
  if [ $? -eq 0 ]; then
    install_packages_RPM $CLANG_FORMAT
  else
    PRINT ""
    WARNING "clang-format $CLANG_FORMAT_VERSION_MIN or higher not found, this is NOT needed to get Blender compiling..."
    PRINT ""
  fi
  PRINT ""
  _do_compile_python=false
@@ -3492,7 +3320,6 @@ install_RPM() {
  fi
  if [ "$_do_compile_python" = true ]; then
    install_packages_RPM libffi-devel
    compile_Python
    PRINT ""
    if [ "$NUMPY_SKIP" = true ]; then
@@ -3603,15 +3430,16 @@ install_RPM() {
    else
      CLANG_DEV="clang-devel"
    fi
-    check_package_version_match_RPM $CLANG_DEV $LLVM_VERSION
+    # XXX RHEL has 3.4 in repo but OSL complains about not finding MCJIT_LIBRARY, so compile for now...
-    if [ $? -eq 0 ]; then
+    #check_package_version_match_RPM $CLANG_DEV $LLVM_VERSION
-      install_packages_RPM llvm-devel $CLANG_DEV
+    #if [ $? -eq 0 ]; then
-      have_llvm=true
+    #  install_packages_RPM llvm-devel $CLANG_DEV
-      LLVM_VERSION_FOUND=$LLVM_VERSION
+    #  have_llvm=true
-      clean_LLVM
+    #  LLVM_VERSION_FOUND=$LLVM_VERSION
-    else
+    #  clean_LLVM
    #else
      _do_compile_llvm=true
-    fi
+    #fi
  fi
  if [ "$_do_compile_llvm" = true ]; then
@@ -3704,23 +3532,6 @@ install_RPM() {
    fi
  fi
  if [ "$WITH_EMBREE" = true ]; then
    PRINT ""
    _do_compile_embree=false
    if [ "$OPENCOLLADA_SKIP" = true ]; then
      WARNING "Skipping Embree installation, as requested..."
    elif [ "$EMBREE_FORCE_BUILD" = true ]; then
      INFO "Forced Embree building, as requested..."
      _do_compile_embree=true
    else
      # No package...
      _do_compile_embree=true
    fi
    if [ "$_do_compile_embree" = true ]; then
      compile_Embree
    fi
  fi
  PRINT ""
  if [ "$FFMPEG_SKIP" = true ]; then
@@ -3832,7 +3643,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"
@@ -3908,18 +3719,6 @@ install_ARCH() {
  fi
  PRINT ""
  CLANG_FORMAT="clang"  # Yeah, on arch clang-format is part of main clang package...
  check_package_version_ge_ARCH $CLANG_FORMAT $CLANG_FORMAT_VERSION_MIN
  if [ $? -eq 0 ]; then
    install_packages_ARCH $CLANG_FORMAT
  else
    PRINT ""
    WARNING "clang-format $CLANG_FORMAT_VERSION_MIN or higher not found, this is NOT needed to get Blender compiling..."
    PRINT ""
  fi
  PRINT ""
  _do_compile_python=false
  if [ "$PYTHON_SKIP" = true ]; then
@@ -3950,7 +3749,6 @@ install_ARCH() {
  fi
  if [ "$_do_compile_python" = true ]; then
    install_packages_ARCH libffi
    compile_Python
    PRINT ""
    if [ "$NUMPY_SKIP" = true ]; then
@@ -4041,11 +3839,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
@@ -4163,28 +3961,6 @@ install_ARCH() {
    fi
  fi
  if [ "$WITH_EMBREE" = true ]; then
    PRINT ""
    _do_compile_embree=false
    if [ "$EMBREE_SKIP" = true ]; then
      WARNING "Skipping Embree installation, as requested..."
    elif [ "$EMBREE_FORCE_BUILD" = true ]; then
      INFO "Forced Embree building, as requested..."
      _do_compile_embree=true
    else
      check_package_ARCH embree
      if [ $? -eq 0 ]; then
        install_packages_ARCH embree
        clean_Embree
      else
        _do_compile_embree=true
      fi
    fi
    if [ "$_do_compile_embree" = true ]; then
      compile_Embree
    fi
  fi
  PRINT ""
  if [ "$FFMPEG_SKIP" = true ]; then
@@ -4356,21 +4132,6 @@ install_OTHER() {
    fi
  fi
  if [ "$WITH_EMBREE" = true ]; then
    _do_compile_embree=false
    PRINT ""
    if [ "$EMBREE_SKIP" = true ]; then
      WARNING "Skipping Embree installation, as requested..."
    elif [ "$EMBREE_FORCE_BUILD" = true ]; then
      INFO "Forced Embree building, as requested..."
      _do_compile_embree=true
    fi
    if [ "$_do_compile_embree" = true ]; then
      PRINT ""
      compile_Embree
    fi
  fi
  PRINT ""
  if [ "$FFMPEG_SKIP" = true ]; then
@@ -4462,6 +4223,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"
@@ -4558,33 +4325,12 @@ print_info() {
      PRINT "  $_1"
      _buildargs="$_buildargs $_1"
    fi
    if [ -d $INST/blosc ]; then
      _1="-D BLOSC_ROOT_DIR=$INST/blosc"
      PRINT "  $_1"
      _buildargs="$_buildargs $_1"
    fi
  fi
  if [ "$WITH_OPENCOLLADA" = true ]; then
    _1="-D WITH_OPENCOLLADA=ON"
    PRINT "  $_1"
    _buildargs="$_buildargs $_1"
    if [ -d $INST/opencollada ]; then
      _1="-D OPENCOLLADA_ROOT_DIR=$INST/opencollada"
      PRINT "  $_1"
      _buildargs="$_buildargs $_1"
    fi
  fi
  if [ "$WITH_EMBREE" = true ]; then
    _1="-D WITH_CYCLES_EMBREE=ON"
    PRINT "  $_1"
    _buildargs="$_buildargs $_1"
    if [ -d $INST/embree ]; then
      _1="-D EMBREE_ROOT_DIR=$INST/embree"
      PRINT "  $_1"
      _buildargs="$_buildargs $_1"
    fi
  fi
  if [ "$WITH_JACK" = true ]; then
@@ -4628,10 +4374,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
+diff -Naur src/blosc/blosc.c external_blosc/blosc/blosc.c
--- external_blosc.orig/blosc/blosc.c   2018-07-30 04:56:38 -0600
+--- src/blosc/blosc.c	2016-02-03 10:26:28 -0700
-+++ external_blosc/blosc/blosc.c        2018-08-11 15:27:26 -0600
+++ external_blosc/blosc/blosc.c	2017-03-03 09:01:50 -0700
-@@ -56,14 +56,7 @@
+@@ -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) && !defined(__GNUC__)
 -#if defined(_WIN32)
 -  #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
-
+//#endif
 +#include <pthread.h>
- /* Some useful units */
+ /* If C11 is supported, use it's built-in aligned allocation. */
- #define KB 1024
+ #if __STDC_VERSION__ >= 201112L
--- 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/FindBlosc.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindBlosc.cmake
@@ -32,6 +32,7 @@ SET(_blosc_SEARCH_DIRS
  /usr/local
  /sw # Fink
  /opt/local # DarwinPorts
  /opt/csw # Blastwave
  /opt/lib/blosc
 )
--- a/build_files/build_environment/patches/cmake/modules/FindCppUnit.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindCppUnit.cmake
@@ -32,6 +32,7 @@ SET(_cppunit_SEARCH_DIRS
  /usr/local
  /sw # Fink
  /opt/local # DarwinPorts
  /opt/csw # Blastwave
  /opt/lib/cppunit
 )
--- a/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
@@ -21,9 +21,9 @@
 # ILMBASE_FOUND       - True if IlmBase was found.
 # Other standarnd issue macros
-include(FindPackageHandleStandardArgs)
+include (FindPackageHandleStandardArgs)
-include(FindPackageMessage)
+include (FindPackageMessage)
-include(SelectLibraryConfigurations)
+include (SelectLibraryConfigurations)
 if( ILMBASE_USE_STATIC_LIBS )
@@ -36,42 +36,42 @@ if( ILMBASE_USE_STATIC_LIBS )
 endif()
 # Macro to assemble a helper state variable
-macro(SET_STATE_VAR varname)
+macro (SET_STATE_VAR varname)
-  set(tmp_ilmbaselibs ${ILMBASE_CUSTOM_LIBRARIES})
+  set (tmp_ilmbaselibs ${ILMBASE_CUSTOM_LIBRARIES})
-  separate_arguments(tmp_ilmbaselibs)
+  separate_arguments (tmp_ilmbaselibs)
-  set(tmp_lst
+  set (tmp_lst
    ${ILMBASE_CUSTOM} | ${tmp_ilmbaselibs} |
    ${ILMBASE_HOME} | ${ILMBASE_VERSION} | ${ILMBASE_LIB_AREA}
  )
-  set(${varname} "${tmp_lst}")
+  set (${varname} "${tmp_lst}")
-  unset(tmp_ilmbaselibs)
+  unset (tmp_ilmbaselibs)
-  unset(tmp_lst)
+  unset (tmp_lst)
-endmacro()
+endmacro ()
 # To enforce that find_* functions do not use inadvertently existing versions
-if(ILMBASE_CUSTOM)
+if (ILMBASE_CUSTOM)
-  set(ILMBASE_FIND_OPTIONS "NO_DEFAULT_PATH")
+  set (ILMBASE_FIND_OPTIONS "NO_DEFAULT_PATH")
-endif()
+endif ()
 # Macro to search for an include directory
-macro(PREFIX_FIND_INCLUDE_DIR prefix includefile libpath_var)
+macro (PREFIX_FIND_INCLUDE_DIR prefix includefile libpath_var)
-  string(TOUPPER ${prefix}_INCLUDE_DIR tmp_varname)
+  string (TOUPPER ${prefix}_INCLUDE_DIR tmp_varname)
  find_path(${tmp_varname} ${includefile}
    HINTS ${${libpath_var}}
    PATH_SUFFIXES include
    ${ILMBASE_FIND_OPTIONS}
  )
-  if(${tmp_varname})
+  if (${tmp_varname})
-    mark_as_advanced(${tmp_varname})
+    mark_as_advanced (${tmp_varname})
-  endif()
+  endif ()
-  unset(tmp_varname)
+  unset (tmp_varname)
-endmacro()
+endmacro ()
 # Macro to search for the given library and adds the cached
 # variable names to the specified list
-macro(PREFIX_FIND_LIB prefix libname libpath_var liblist_var cachelist_var)
+macro (PREFIX_FIND_LIB prefix libname libpath_var liblist_var cachelist_var)
-  string(TOUPPER ${prefix}_${libname} tmp_prefix)
+  string (TOUPPER ${prefix}_${libname} tmp_prefix)
  # 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 )
@@ -89,90 +89,86 @@ macro(PREFIX_FIND_LIB prefix libname libpath_var liblist_var cachelist_var)
    ${ILMBASE_FIND_OPTIONS}
  )
  # Properly define ${tmp_prefix}_LIBRARY (cached) and ${tmp_prefix}_LIBRARIES
-  select_library_configurations(${tmp_prefix})
+  select_library_configurations (${tmp_prefix})
-  list(APPEND ${liblist_var} ${tmp_prefix}_LIBRARIES)
+  list (APPEND ${liblist_var} ${tmp_prefix}_LIBRARIES)
  # Add to the list of variables which should be reset
-  list(APPEND ${cachelist_var}
+  list (APPEND ${cachelist_var}
    ${tmp_prefix}_LIBRARY
    ${tmp_prefix}_LIBRARY_RELEASE
    ${tmp_prefix}_LIBRARY_DEBUG)
-  mark_as_advanced(
+  mark_as_advanced (
    ${tmp_prefix}_LIBRARY
    ${tmp_prefix}_LIBRARY_RELEASE
    ${tmp_prefix}_LIBRARY_DEBUG)
-  unset(tmp_prefix)
+  unset (tmp_prefix)
-endmacro()
+endmacro ()
 # Encode the current state of the external variables into a string
-SET_STATE_VAR(ILMBASE_CURRENT_STATE)
+SET_STATE_VAR (ILMBASE_CURRENT_STATE)
 # If the state has changed, clear the cached variables
-if(ILMBASE_CACHED_STATE AND
+if (ILMBASE_CACHED_STATE AND
    NOT ILMBASE_CACHED_STATE STREQUAL ILMBASE_CURRENT_STATE)
-  foreach(libvar ${ILMBASE_CACHED_VARS})
+  foreach (libvar ${ILMBASE_CACHED_VARS})
-    unset(${libvar} CACHE)
+    unset (${libvar} CACHE)
-  endforeach()
+  endforeach ()
-endif()
+endif ()
 # Generic search paths
-set(IlmBase_generic_include_paths
+set (IlmBase_generic_include_paths
  ${ILMBASE_CUSTOM_INCLUDE_DIR}
  /usr/include
  /usr/include/${CMAKE_LIBRARY_ARCHITECTURE}
  /usr/local/include
  /sw/include
-  /opt/local/include
+  /opt/local/include)
-)
+set (IlmBase_generic_library_paths
 set(IlmBase_generic_library_paths
  ${ILMBASE_CUSTOM_LIB_DIR}
  /usr/lib
  /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
  /usr/local/lib
  /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
  /sw/lib
-  /opt/local/lib
+  /opt/local/lib)
 )
 # Search paths for the IlmBase files
-if(ILMBASE_HOME)
+if (ILMBASE_HOME)
-  if(ILMBASE_VERSION)
+  if (ILMBASE_VERSION)
-    set(IlmBase_include_paths
+    set (IlmBase_include_paths
      ${ILMBASE_HOME}/ilmbase-${ILMBASE_VERSION}/include
-      ${ILMBASE_HOME}/include/ilmbase-${ILMBASE_VERSION}
+      ${ILMBASE_HOME}/include/ilmbase-${ILMBASE_VERSION})
-    )
+    set (IlmBase_library_paths
    set(IlmBase_library_paths
      ${ILMBASE_HOME}/ilmbase-${ILMBASE_VERSION}/lib
-      ${ILMBASE_HOME}/lib/ilmbase-${ILMBASE_VERSION}
+      ${ILMBASE_HOME}/lib/ilmbase-${ILMBASE_VERSION})
    )
  endif()
-  list(APPEND IlmBase_include_paths ${ILMBASE_HOME}/include)
+  list (APPEND IlmBase_include_paths ${ILMBASE_HOME}/include)
-  set(IlmBase_library_paths
+  set (IlmBase_library_paths
    ${ILMBASE_HOME}/lib
    ${ILMBASE_HOME}/lib64
    ${ILMBASE_LIB_AREA}
    ${IlmBase_library_paths})
-endif()
+endif ()
-list(APPEND IlmBase_include_paths ${IlmBase_generic_include_paths})
+list (APPEND IlmBase_include_paths ${IlmBase_generic_include_paths})
-list(APPEND IlmBase_library_paths ${IlmBase_generic_library_paths})
+list (APPEND IlmBase_library_paths ${IlmBase_generic_library_paths})
 # Locate the header files
-PREFIX_FIND_INCLUDE_DIR(IlmBase
+PREFIX_FIND_INCLUDE_DIR (IlmBase
  OpenEXR/IlmBaseConfig.h IlmBase_include_paths)
-if(ILMBASE_INCLUDE_DIR)
+if (ILMBASE_INCLUDE_DIR)
  # Get the version from config file, if not already set.
-  if(NOT ILMBASE_VERSION)
+  if (NOT ILMBASE_VERSION)
    FILE(STRINGS "${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h" ILMBASE_BUILD_SPECIFICATION
         REGEX "^[ \t]*#define[ \t]+ILMBASE_VERSION_STRING[ \t]+\"[.0-9]+\".*$")
    if(ILMBASE_BUILD_SPECIFICATION)
-      if(NOT IlmBase_FIND_QUIETLY)
+      if (NOT IlmBase_FIND_QUIETLY)
        message(STATUS "${ILMBASE_BUILD_SPECIFICATION}")
-      endif()
+      endif ()
      string(REGEX REPLACE ".*#define[ \t]+ILMBASE_VERSION_STRING[ \t]+\"([.0-9]+)\".*"
             "\\1" XYZ ${ILMBASE_BUILD_SPECIFICATION})
      set("ILMBASE_VERSION" ${XYZ} CACHE STRING "Version of ILMBase lib")
@@ -182,71 +178,71 @@ if(ILMBASE_INCLUDE_DIR)
      set("ILMBASE_VERSION" "2.0" CACHE STRING "Version of ILMBase lib")
    endif()
  endif()
-endif()
+endif ()
-if(ILMBASE_CUSTOM)
+if (ILMBASE_CUSTOM)
-  if(NOT ILMBASE_CUSTOM_LIBRARIES)
+  if (NOT ILMBASE_CUSTOM_LIBRARIES)
-    message(FATAL_ERROR "Custom IlmBase libraries requested but ILMBASE_CUSTOM_LIBRARIES is not set.")
+    message (FATAL_ERROR "Custom IlmBase libraries requested but ILMBASE_CUSTOM_LIBRARIES is not set.")
  endif()
-  set(IlmBase_Libraries ${ILMBASE_CUSTOM_LIBRARIES})
+  set (IlmBase_Libraries ${ILMBASE_CUSTOM_LIBRARIES})
  separate_arguments(IlmBase_Libraries)
-else()
+else ()
-#elseif(${ILMBASE_VERSION} VERSION_LESS "2.1")
+#elseif (${ILMBASE_VERSION} VERSION_LESS "2.1")
-  set(IlmBase_Libraries Half Iex Imath IlmThread)
+  set (IlmBase_Libraries Half Iex Imath IlmThread)
-#else()
+#else ()
 #  string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _ilmbase_libs_ver ${ILMBASE_VERSION})
-#  set(IlmBase_Libraries Half Iex-${_ilmbase_libs_ver} Imath-${_ilmbase_libs_ver} IlmThread-${_ilmbase_libs_ver})
+#  set (IlmBase_Libraries Half Iex-${_ilmbase_libs_ver} Imath-${_ilmbase_libs_ver} IlmThread-${_ilmbase_libs_ver})
-endif()
+endif ()
 # Locate the IlmBase libraries
-set(IlmBase_libvars "")
+set (IlmBase_libvars "")
-set(IlmBase_cachevars "")
+set (IlmBase_cachevars "")
-foreach(ilmbase_lib ${IlmBase_Libraries})
+foreach (ilmbase_lib ${IlmBase_Libraries})
-  PREFIX_FIND_LIB(IlmBase ${ilmbase_lib}
+  PREFIX_FIND_LIB (IlmBase ${ilmbase_lib}
    IlmBase_library_paths IlmBase_libvars IlmBase_cachevars)
-endforeach()
+endforeach ()
 # Create the list of variables that might need to be cleared
-set(ILMBASE_CACHED_VARS
+set (ILMBASE_CACHED_VARS
  ILMBASE_INCLUDE_DIR ${IlmBase_cachevars}
  CACHE INTERNAL "Variables set by FindIlmBase.cmake" FORCE)
 # Store the current state so that variables might be cleared if required
-set(ILMBASE_CACHED_STATE ${ILMBASE_CURRENT_STATE}
+set (ILMBASE_CACHED_STATE ${ILMBASE_CURRENT_STATE}
  CACHE INTERNAL "State last seen by FindIlmBase.cmake" FORCE)
 # Link with pthreads if required
-if(NOT WIN32 AND EXISTS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h)
+if (NOT WIN32 AND EXISTS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h)
-  file(STRINGS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h
+  file (STRINGS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h
    ILMBASE_HAVE_PTHREAD
    REGEX "^[ \\t]*#define[ \\t]+HAVE_PTHREAD[ \\t]1[ \\t]*\$"
  )
-  if(ILMBASE_HAVE_PTHREAD)
+  if (ILMBASE_HAVE_PTHREAD)
-    find_package(Threads)
+    find_package (Threads)
-    if(CMAKE_USE_PTHREADS_INIT)
+    if (CMAKE_USE_PTHREADS_INIT)
-      set(ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
+      set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT})
-    endif()
+    endif ()
-  endif()
+  endif ()
-endif()
+endif ()
 # Use the standard function to handle ILMBASE_FOUND
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(IlmBase DEFAULT_MSG
+FIND_PACKAGE_HANDLE_STANDARD_ARGS (IlmBase DEFAULT_MSG
  ILMBASE_INCLUDE_DIR ${IlmBase_libvars})
-if(ILMBASE_FOUND)
+if (ILMBASE_FOUND)
-  set(ILMBASE_LIBRARIES "")
+  set (ILMBASE_LIBRARIES "")
-  foreach(tmplib ${IlmBase_libvars})
+  foreach (tmplib ${IlmBase_libvars})
-    list(APPEND ILMBASE_LIBRARIES ${${tmplib}})
+    list (APPEND ILMBASE_LIBRARIES ${${tmplib}})
-  endforeach()
+  endforeach ()
-  list(APPEND ILMBASE_LIBRARIES ${ILMBASE_PTHREADS})
+  list (APPEND ILMBASE_LIBRARIES ${ILMBASE_PTHREADS})
-  if(NOT IlmBase_FIND_QUIETLY)
+  if (NOT IlmBase_FIND_QUIETLY)
-    FIND_PACKAGE_MESSAGE(ILMBASE
+    FIND_PACKAGE_MESSAGE (ILMBASE
      "Found IlmBase: ${ILMBASE_LIBRARIES}"
      "[${ILMBASE_INCLUDE_DIR}][${ILMBASE_LIBRARIES}][${ILMBASE_CURRENT_STATE}]"
      )
-  endif()
+  endif ()
-endif()
+endif ()
 # Restore the original find library ordering
 if( ILMBASE_USE_STATIC_LIBS )
@@ -254,11 +250,11 @@ if( ILMBASE_USE_STATIC_LIBS )
 endif()
 # Unset the helper variables to avoid pollution
-unset(ILMBASE_CURRENT_STATE)
+unset (ILMBASE_CURRENT_STATE)
-unset(IlmBase_include_paths)
+unset (IlmBase_include_paths)
-unset(IlmBase_library_paths)
+unset (IlmBase_library_paths)
-unset(IlmBase_generic_include_paths)
+unset (IlmBase_generic_include_paths)
-unset(IlmBase_generic_library_paths)
+unset (IlmBase_generic_library_paths)
-unset(IlmBase_libvars)
+unset (IlmBase_libvars)
-unset(IlmBase_cachevars)
+unset (IlmBase_cachevars)
-unset(ILMBASE_PTHREADS)
+unset (ILMBASE_PTHREADS)
--- a/build_files/build_environment/patches/cmake/modules/FindLogC4Plus.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindLogC4Plus.cmake
@@ -32,6 +32,7 @@ SET(_logc4plus_SEARCH_DIRS
  /usr/local
  /sw # Fink
  /opt/local # DarwinPorts
  /opt/csw # Blastwave
  /opt/lib/logc4plus
 )
--- a/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
@@ -23,12 +23,12 @@
 # OPENEXR_FOUND       - True if OpenEXR was found.
 # Other standarnd issue macros
-include(SelectLibraryConfigurations)
+include (SelectLibraryConfigurations)
-include(FindPackageHandleStandardArgs)
+include (FindPackageHandleStandardArgs)
-include(FindPackageMessage)
+include (FindPackageMessage)
-if(OPENEXR_USE_STATIC_LIBS)
+if( OPENEXR_USE_STATIC_LIBS )
-  set(_openexr_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+  set( _openexr_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
  if(WIN32)
    set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
  else()
@@ -37,39 +37,39 @@ if(OPENEXR_USE_STATIC_LIBS)
 endif()
 # Macro to assemble a helper state variable
-macro(SET_STATE_VAR varname)
+macro (SET_STATE_VAR varname)
-  set(tmp_lst
+  set (tmp_lst
    ${OPENEXR_CUSTOM} | ${OPENEXR_CUSTOM_LIBRARY} |
    ${OPENEXR_HOME} | ${OPENEXR_VERSION} | ${OPENEXR_LIB_AREA}
  )
-  set(${varname} "${tmp_lst}")
+  set (${varname} "${tmp_lst}")
-  unset(tmp_lst)
+  unset (tmp_lst)
-endmacro()
+endmacro ()
 # To enforce that find_* functions do not use inadvertently existing versions
-if(OPENEXR_CUSTOM)
+if (OPENEXR_CUSTOM)
-  set(OPENEXR_FIND_OPTIONS "NO_DEFAULT_PATH")
+  set (OPENEXR_FIND_OPTIONS "NO_DEFAULT_PATH")
-endif()
+endif ()
 # Macro to search for an include directory
-macro(PREFIX_FIND_INCLUDE_DIR prefix includefile libpath_var)
+macro (PREFIX_FIND_INCLUDE_DIR prefix includefile libpath_var)
-  string(TOUPPER ${prefix}_INCLUDE_DIR tmp_varname)
+  string (TOUPPER ${prefix}_INCLUDE_DIR tmp_varname)
  find_path(${tmp_varname} ${includefile}
    HINTS ${${libpath_var}}
    PATH_SUFFIXES include
    ${OPENEXR_FIND_OPTIONS}
  )
-  if(${tmp_varname})
+  if (${tmp_varname})
-    mark_as_advanced(${tmp_varname})
+    mark_as_advanced (${tmp_varname})
-  endif()
+  endif ()
-  unset(tmp_varname)
+  unset (tmp_varname)
-endmacro()
+endmacro ()
 # Macro to search for the given library and adds the cached
 # variable names to the specified list
-macro(PREFIX_FIND_LIB prefix libname libpath_var liblist_var cachelist_var)
+macro (PREFIX_FIND_LIB prefix libname libpath_var liblist_var cachelist_var)
-  string(TOUPPER ${prefix}_${libname} tmp_prefix)
+  string (TOUPPER ${prefix}_${libname} tmp_prefix)
  # 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 )
@@ -86,91 +86,89 @@ macro(PREFIX_FIND_LIB prefix libname libpath_var liblist_var cachelist_var)
    ${OPENEXR_FIND_OPTIONS}
  )
  # Properly define ${tmp_prefix}_LIBRARY (cached) and ${tmp_prefix}_LIBRARIES
-  select_library_configurations(${tmp_prefix})
+  select_library_configurations (${tmp_prefix})
-  list(APPEND ${liblist_var} ${tmp_prefix}_LIBRARIES)
+  list (APPEND ${liblist_var} ${tmp_prefix}_LIBRARIES)
  # Add to the list of variables which should be reset
-  list(APPEND ${cachelist_var}
+  list (APPEND ${cachelist_var}
    ${tmp_prefix}_LIBRARY
    ${tmp_prefix}_LIBRARY_RELEASE
    ${tmp_prefix}_LIBRARY_DEBUG)
-  mark_as_advanced(
+  mark_as_advanced (
    ${tmp_prefix}_LIBRARY
    ${tmp_prefix}_LIBRARY_RELEASE
    ${tmp_prefix}_LIBRARY_DEBUG)
-  unset(tmp_prefix)
+  unset (tmp_prefix)
-endmacro()
+endmacro ()
 # Encode the current state of the external variables into a string
-SET_STATE_VAR(OPENEXR_CURRENT_STATE)
+SET_STATE_VAR (OPENEXR_CURRENT_STATE)
 # If the state has changed, clear the cached variables
-if(OPENEXR_CACHED_STATE AND
+if (OPENEXR_CACHED_STATE AND
    NOT OPENEXR_CACHED_STATE STREQUAL OPENEXR_CURRENT_STATE)
-  foreach(libvar ${OPENEXR_CACHED_VARS})
+  foreach (libvar ${OPENEXR_CACHED_VARS})
-    unset(${libvar} CACHE)
+    unset (${libvar} CACHE)
-  endforeach()
+  endforeach ()
-endif()
+endif ()
 # Generic search paths
-set(OpenEXR_generic_include_paths
+set (OpenEXR_generic_include_paths
  ${OPENEXR_CUSTOM_INCLUDE_DIR}
  /usr/include
  /usr/include/${CMAKE_LIBRARY_ARCHITECTURE}
  /usr/local/include
  /sw/include
-  /opt/local/include
+  /opt/local/include)
-)
+set (OpenEXR_generic_library_paths
 set(OpenEXR_generic_library_paths
  ${OPENEXR_CUSTOM_LIB_DIR}
  /usr/lib
  /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
  /usr/local/lib
  /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE}
  /sw/lib
-  /opt/local/lib
+  /opt/local/lib)
 )
 # Search paths for the OpenEXR files
-if(OPENEXR_HOME)
+if (OPENEXR_HOME)
-  set(OpenEXR_library_paths
+  set (OpenEXR_library_paths
    ${OPENEXR_HOME}/lib
    ${OPENEXR_HOME}/lib64)
-  if(OPENEXR_VERSION)
+  if (OPENEXR_VERSION)
-    set(OpenEXR_include_paths
+    set (OpenEXR_include_paths
      ${OPENEXR_HOME}/openexr-${OPENEXR_VERSION}/include
      ${OPENEXR_HOME}/include/openexr-${OPENEXR_VERSION})
-    list(APPEND OpenEXR_library_paths
+    list (APPEND OpenEXR_library_paths
      ${OPENEXR_HOME}/openexr-${OPENEXR_VERSION}/lib
      ${OPENEXR_HOME}/lib/openexr-${OPENEXR_VERSION})
  endif()
-  list(APPEND OpenEXR_include_paths ${OPENEXR_HOME}/include)
+  list (APPEND OpenEXR_include_paths ${OPENEXR_HOME}/include)
-  if(OPENEXR_LIB_AREA)
+  if (OPENEXR_LIB_AREA)
-    list(INSERT OpenEXR_library_paths 2 ${OPENEXR_LIB_AREA})
+    list (INSERT OpenEXR_library_paths 2 ${OPENEXR_LIB_AREA})
-  endif()
+  endif ()
-endif()
+endif ()
-if(ILMBASE_HOME AND OPENEXR_VERSION)
+if (ILMBASE_HOME AND OPENEXR_VERSION)
-  list(APPEND OpenEXR_include_paths
+  list (APPEND OpenEXR_include_paths
    ${ILMBASE_HOME}/include/openexr-${OPENEXR_VERSION})
 endif()
-list(APPEND OpenEXR_include_paths ${OpenEXR_generic_include_paths})
+list (APPEND OpenEXR_include_paths ${OpenEXR_generic_include_paths})
-list(APPEND OpenEXR_library_paths ${OpenEXR_generic_library_paths})
+list (APPEND OpenEXR_library_paths ${OpenEXR_generic_library_paths})
 # Locate the header files
-PREFIX_FIND_INCLUDE_DIR(OpenEXR
+PREFIX_FIND_INCLUDE_DIR (OpenEXR
  OpenEXR/ImfArray.h OpenEXR_include_paths)
-if(OPENEXR_INCLUDE_DIR)
+if (OPENEXR_INCLUDE_DIR)
  # Get the version from config file, if not already set.
-  if(NOT OPENEXR_VERSION)
+  if (NOT OPENEXR_VERSION)
    FILE(STRINGS "${OPENEXR_INCLUDE_DIR}/OpenEXR/OpenEXRConfig.h" OPENEXR_BUILD_SPECIFICATION
         REGEX "^[ \t]*#define[ \t]+OPENEXR_VERSION_STRING[ \t]+\"[.0-9]+\".*$")
    if(OPENEXR_BUILD_SPECIFICATION)
-      if(NOT OpenEXR_FIND_QUIETLY)
+      if (NOT OpenEXR_FIND_QUIETLY)
        message(STATUS "${OPENEXR_BUILD_SPECIFICATION}")
-      endif()
+      endif ()
      string(REGEX REPLACE ".*#define[ \t]+OPENEXR_VERSION_STRING[ \t]+\"([.0-9]+)\".*"
             "\\1" XYZ ${OPENEXR_BUILD_SPECIFICATION})
      set("OPENEXR_VERSION" ${XYZ} CACHE STRING "Version of OpenEXR lib")
@@ -180,56 +178,56 @@ if(OPENEXR_INCLUDE_DIR)
      set("OPENEXR_VERSION" "2.0" CACHE STRING "Version of OpenEXR lib")
    endif()
  endif()
-endif()
+endif ()
-if(OPENEXR_CUSTOM)
+if (OPENEXR_CUSTOM)
-  if(NOT OPENEXR_CUSTOM_LIBRARY)
+  if (NOT OPENEXR_CUSTOM_LIBRARY)
-    message(FATAL_ERROR "Custom OpenEXR library requested but OPENEXR_CUSTOM_LIBRARY is not set.")
+    message (FATAL_ERROR "Custom OpenEXR library requested but OPENEXR_CUSTOM_LIBRARY is not set.")
  endif()
-  set(OpenEXR_Library ${OPENEXR_CUSTOM_LIBRARY})
+  set (OpenEXR_Library ${OPENEXR_CUSTOM_LIBRARY})
-else()
+else ()
-#elseif(${OPENEXR_VERSION} VERSION_LESS "2.1")
+#elseif (${OPENEXR_VERSION} VERSION_LESS "2.1")
-  set(OpenEXR_Library IlmImf)
+  set (OpenEXR_Library IlmImf)
-#else()
+#else ()
 #  string(REGEX REPLACE "([0-9]+)[.]([0-9]+).*" "\\1_\\2" _openexr_libs_ver ${OPENEXR_VERSION})
-#  set(OpenEXR_Library IlmImf-${_openexr_libs_ver})
+#  set (OpenEXR_Library IlmImf-${_openexr_libs_ver})
-endif()
+endif ()
 # Locate the OpenEXR library
-set(OpenEXR_libvars "")
+set (OpenEXR_libvars "")
-set(OpenEXR_cachevars "")
+set (OpenEXR_cachevars "")
-PREFIX_FIND_LIB(OpenEXR ${OpenEXR_Library}
+PREFIX_FIND_LIB (OpenEXR ${OpenEXR_Library}
  OpenEXR_library_paths OpenEXR_libvars OpenEXR_cachevars)
 # Create the list of variables that might need to be cleared
-set(OPENEXR_CACHED_VARS
+set (OPENEXR_CACHED_VARS
  OPENEXR_INCLUDE_DIR ${OpenEXR_cachevars}
  CACHE INTERNAL "Variables set by FindOpenEXR.cmake" FORCE)
 # Store the current state so that variables might be cleared if required
-set(OPENEXR_CACHED_STATE ${OPENEXR_CURRENT_STATE}
+set (OPENEXR_CACHED_STATE ${OPENEXR_CURRENT_STATE}
  CACHE INTERNAL "State last seen by FindOpenEXR.cmake" FORCE)
 # Always link explicitly with zlib
-set(OPENEXR_ZLIB ${ZLIB_LIBRARIES})
+set (OPENEXR_ZLIB ${ZLIB_LIBRARIES})
 # Use the standard function to handle OPENEXR_FOUND
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR DEFAULT_MSG
+FIND_PACKAGE_HANDLE_STANDARD_ARGS (OpenEXR DEFAULT_MSG
  OPENEXR_INCLUDE_DIR ${OpenEXR_libvars})
-if(OPENEXR_FOUND)
+if (OPENEXR_FOUND)
-  set(OPENEXR_LIBRARIES "")
+  set (OPENEXR_LIBRARIES "")
-  foreach(tmplib ${OpenEXR_libvars})
+  foreach (tmplib ${OpenEXR_libvars})
-    list(APPEND OPENEXR_LIBRARIES ${${tmplib}})
+    list (APPEND OPENEXR_LIBRARIES ${${tmplib}})
-  endforeach()
+  endforeach ()
-  list(APPEND OPENEXR_LIBRARIES ${ZLIB_LIBRARIES})
+  list (APPEND OPENEXR_LIBRARIES ${ZLIB_LIBRARIES})
-  if(NOT OpenEXR_FIND_QUIETLY)
+  if (NOT OpenEXR_FIND_QUIETLY)
-    FIND_PACKAGE_MESSAGE(OPENEXR
+    FIND_PACKAGE_MESSAGE (OPENEXR
      "Found OpenEXR: ${OPENEXR_LIBRARIES}"
      "[${OPENEXR_INCLUDE_DIR}][${OPENEXR_LIBRARIES}][${OPENEXR_CURRENT_STATE}]"
      )
-  endif()
+  endif ()
-endif()
+endif ()
 # Restore the original find library ordering
 if( OPENEXR_USE_STATIC_LIBS )
@@ -237,10 +235,10 @@ if( OPENEXR_USE_STATIC_LIBS )
 endif()
 # Unset the helper variables to avoid pollution
-unset(OPENEXR_CURRENT_STATE)
+unset (OPENEXR_CURRENT_STATE)
-unset(OpenEXR_include_paths)
+unset (OpenEXR_include_paths)
-unset(OpenEXR_library_paths)
+unset (OpenEXR_library_paths)
-unset(OpenEXR_generic_include_paths)
+unset (OpenEXR_generic_include_paths)
-unset(OpenEXR_generic_library_paths)
+unset (OpenEXR_generic_library_paths)
-unset(OpenEXR_libvars)
+unset (OpenEXR_libvars)
-unset(OpenEXR_cachevars)
+unset (OpenEXR_cachevars)
--- a/build_files/build_environment/patches/cmake/modules/FindTBB.cmake
+++ b/build_files/build_environment/patches/cmake/modules/FindTBB.cmake
@@ -32,6 +32,7 @@ SET(_tbb_SEARCH_DIRS
  /usr/local
  /sw # Fink
  /opt/local # DarwinPorts
  /opt/csw # Blastwave
  /opt/lib/tbb
 )
--- a/build_files/build_environment/patches/cmake/modules/SelectLibraryConfigurations.cmake
+++ b/build_files/build_environment/patches/cmake/modules/SelectLibraryConfigurations.cmake
@@ -49,7 +49,7 @@ macro( select_library_configurations basename )
    # if only the debug version was found, set the release value to be the
    # debug value.
    _set_library_name( ${basename} DEBUG RELEASE )
-    if( ${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE )
+    if (${basename}_LIBRARY_DEBUG AND ${basename}_LIBRARY_RELEASE )
        # 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 )
@@ -79,3 +79,4 @@ macro( select_library_configurations basename )
        ${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/cmakelists_tbb.txt
+++ b/build_files/build_environment/patches/cmakelists_tbb.txt
@@ -88,14 +88,6 @@ elseif(WIN32)
  set(DISABLE_RTTI "/EHs- /GR- ")
 endif()
 if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
  include(CheckCXXCompilerFlag)
  check_cxx_compiler_flag("-flifetime-dse=1" SUPPORTS_FLIFETIME)
  if (SUPPORTS_FLIFETIME)
    add_definitions(-flifetime-dse=1)
  endif()
 endif()
 # Linker export definitions
 if (WIN32)
  add_custom_command(OUTPUT tbb.def
--- 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
+--- libavutil/common.h	2016-02-14 19:29:42 -0700
-+++ b/configure	2018-08-27 13:46:28.162765762 +0200
+++ libavutil/common.h	2016-03-30 09:50:29 -0600
-@@ -6013,7 +6013,7 @@
+@@ -99,6 +99,11 @@
-                                require_pkg_config libopencv opencv opencv/cxcore.h cvCreateImageHeader; }
+ #define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
- enabled libopenh264       && require_pkg_config libopenh264 openh264 wels/codec_api.h WelsGetCodecVersion
+ #define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
- 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; } }
+//msvc helper
-+                               { 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"; } }
+#ifdef _MSC_VER
- enabled libopenmpt        && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create -lstdc++ && append libopenmpt_extralibs "-lstdc++"
+#define inline __inline
- enabled libopus           && {
+#endif
-     enabled libopus_decoder && {
+
 /* 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/Show More
+++ b/Show More