cleanup: removed outdated/outcommented code

Merge remote-tracking branch 'origin/blender2.8' into collada2.8
refactor: Simplify the Collada module. moved Blender context information into its own class.
2018-11-23 00:37:56 +01:00 · 2018-11-23 00:29:24 +01:00 · 2018-11-23 00:28:45 +01:00 · 2018-11-22 22:03:35 +01:00 · 2018-11-15 22:10:20 +01:00 · 2018-11-15 22:09:35 +01:00
7090 changed files with 1445814 additions and 1386960 deletions
--- a/.arcconfig
+++ b/.arcconfig
@@ -1,7 +1,7 @@
 {
 	"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.onto.default" : "master"
+	"arc.land.onto.default" : "blender2.8"
 }
--- 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
@@ -3,18 +3,18 @@
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-indent_style = space
+indent_style = tab
-indent_size = 2
+indent_size = 4
-max_line_length = 99
+max_line_length = 120
 # CMake & Text
 [*.{cmake,txt}]
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-indent_style = space
+indent_style = tab
-indent_size = 2
+indent_size = 4
-max_line_length = 99
+max_line_length = 120
 # Python
 [*.py]
@@ -30,9 +30,9 @@ max_line_length = 120
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-indent_style = space
+indent_style = tab
-indent_size = 2
+indent_size = 4
-max_line_length = 99
+max_line_length = 120
 # reStructuredText
 [*.rst]
--- 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,12 +1,12 @@
 [submodule "release/scripts/addons"]
 	path = release/scripts/addons
 	url = ../blender-addons.git
-	branch = master
+	branch = blender2.8
 	ignore = all
 [submodule "release/scripts/addons_contrib"]
 	path = release/scripts/addons_contrib
 	url = ../blender-addons-contrib.git
-	branch = master
+	branch = blender2.8
 	ignore = all
 [submodule "release/datafiles/locale"]
 	path = release/datafiles/locale
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/237
+++ b/237
@@ -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
@@ -182,7 +55,7 @@ ifndef DEPS_INSTALL_DIR
 	ifneq ($(OS_NCASE),darwin)
 		# Add processor type to directory name
-		DEPS_INSTALL_DIR:=$(DEPS_INSTALL_DIR)_$(CPU)
+		DEPS_INSTALL_DIR:=$(DEPS_INSTALL_DIR)_$(shell uname -p)
 	endif
 endif
@@ -225,12 +98,10 @@ 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"
+	BLENDER_BIN="$(BUILD_DIR)/bin/blender.app/Contents/MacOS/blender"
 else
-	BLENDER_BIN?="$(BUILD_DIR)/bin/blender"
+	BLENDER_BIN="$(BUILD_DIR)/bin/blender"
 endif
@@ -325,9 +196,87 @@ 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 "                         https://wiki.blender.org/wiki/Source/Code_Style"
 	@echo "  * test_style_c_qtc   - same as test_style but outputs QtCreator tasks format"
 	@echo "  * test_style_osl     - checks OpenShadingLanguage conforms with blenders style guide:"
 	@echo "                         https://wiki.blender.org/wiki/Source/Code_Style"
 	@echo "  * test_style_osl_qtc - checks OpenShadingLanguage conforms with blenders style guide:"
 	@echo "                         https://wiki.blender.org/wiki/Source/Code_Style"
 	@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 "               Set environment variables 'BLENDER_BIN' and 'INKSCAPE_BIN'"
 	@echo "               to define your own commands."
 	@echo "  * icons_geom - Updates Geometry icons from BLEND file."
 	@echo "                 Set environment variable 'BLENDER_BIN'"
 	@echo "                 to define your own command."
 	@echo "  * 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 +357,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)"
@@ -491,12 +440,9 @@ 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) \
@@ -512,12 +458,9 @@ update: .FORCE
 	fi
 	git pull --rebase
 	git submodule update --init --recursive
-	git submodule foreach git checkout master
+	# Use blender2.8 branch for submodules that have it.
-	git submodule foreach git pull --rebase origin master
+	git submodule foreach "git checkout blender2.8 || git checkout master"
-
+	git submodule foreach git pull --rebase origin
 format: .FORCE
 	PATH="../lib/${OS_NCASE}/llvm/bin/:$(PATH)" \
 		python3 source/tools/utils_maintenance/clang_format_paths.py $(PATHS)
 # -----------------------------------------------------------------------------
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -25,16 +25,16 @@
 # Windows and macOS, and install_deps.sh on Linux.
 #
 # 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 nasm
 #   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
 #
 ####################################################################################################
@@ -47,13 +47,13 @@ include(cmake/options.cmake)
 include(cmake/versions.cmake)
 if(ENABLE_MINGW64)
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    include(cmake/setup_mingw64.cmake)
+		include(cmake/setup_mingw64.cmake)
-  else()
+	else()
-    include(cmake/setup_mingw32.cmake)
+		include(cmake/setup_mingw32.cmake)
-  endif()
+	endif()
 else()
-  set(mingw_LIBDIR ${LIBDIR})
+	set(mingw_LIBDIR ${LIBDIR})
 endif()
 include(cmake/zlib.cmake)
@@ -91,68 +91,64 @@ include(cmake/openvdb.cmake)
 include(cmake/python.cmake)
 include(cmake/python_site_packages.cmake)
 include(cmake/numpy.cmake)
-if(UNIX AND NOT APPLE)
+include(cmake/pugixml.cmake)
  # Rely on PugiXML compiled with OpenImageIO
 else()
  include(cmake/pugixml.cmake)
 endif()
 if(WITH_WEBP)
-  include(cmake/webp.cmake)
+	include(cmake/webp.cmake)
 endif()
 if(WITH_EMBREE)
-  include(cmake/embree.cmake)
+	include(cmake/embree.cmake)
 endif()
 if(WIN32)
-  # HMD branch deps
+	# HMD branch deps
-  include(cmake/hidapi.cmake)
+	include(cmake/hidapi.cmake)
-  # OCIO deps
+	# OCIO deps
-  include(cmake/tinyxml.cmake)
+	include(cmake/tinyxml.cmake)
-  include(cmake/yamlcpp.cmake)
+	include(cmake/yamlcpp.cmake)
-  # LCMS is an OCIO dep, but only if you build the apps, leaving it here for convenience
+	# LCMS is an OCIO dep, but only if you build the apps, leaving it here for convenience
-  #include(cmake/lcms.cmake)
+	#include(cmake/lcms.cmake)
 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/x264.cmake)
-    include(cmake/xvidcore.cmake)
+		include(cmake/xvidcore.cmake)
-    include(cmake/faad.cmake)
+		include(cmake/faad.cmake)
-    include(cmake/ffmpeg.cmake)
+		include(cmake/ffmpeg.cmake)
-    include(cmake/fftw.cmake)
+		include(cmake/fftw.cmake)
-    include(cmake/sndfile.cmake)
+		include(cmake/sndfile.cmake)
-    if(WIN32)
+		if(WIN32)
-      include(cmake/iconv.cmake)
+			include(cmake/iconv.cmake)
-    endif()
+		endif()
-    if(UNIX)
+		if(UNIX)
-      include(cmake/flac.cmake)
+			include(cmake/flac.cmake)
-      include(cmake/xml2.cmake)
+			include(cmake/xml2.cmake)
-      if(NOT APPLE)
+			if(NOT APPLE)
-        include(cmake/spnav.cmake)
+				include(cmake/spnav.cmake)
-        include(cmake/jemalloc.cmake)
+				include(cmake/jemalloc.cmake)
-      endif()
+			endif()
-    endif()
+		endif()
-  endif()
+	endif()
 endif()
 if(UNIX)
-  include(cmake/bzip2.cmake)
+	include(cmake/bzip2.cmake)
-  include(cmake/ffi.cmake)
+	include(cmake/ffi.cmake)
-  include(cmake/lzma.cmake)
+	include(cmake/lzma.cmake)
-  include(cmake/ssl.cmake)
+	include(cmake/ssl.cmake)
-  include(cmake/sqlite.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,89 @@
 # ***** 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)
+	set(ALEMBIC_ILMBASE ${LIBDIR}/openexr)
 else()
-  set(ALEMBIC_ILMBASE ${LIBDIR}/ilmbase)
+	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=${ALEMBIC_ILMBASE}
-  -DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${ALEMBIC_ILMBASE}/include/OpenEXR
+	-DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${ALEMBIC_ILMBASE}/include/OpenEXR
-  -DALEMBIC_ILMBASE_HALF_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DALEMBIC_ILMBASE_HALF_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-  -DALEMBIC_ILMBASE_IMATH_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DALEMBIC_ILMBASE_IMATH_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-  -DALEMBIC_ILMBASE_ILMTHREAD_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DALEMBIC_ILMBASE_ILMTHREAD_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-  -DALEMBIC_ILMBASE_IEX_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DALEMBIC_ILMBASE_IEX_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-  -DALEMBIC_ILMBASE_IEXMATH_LIB=${ALEMBIC_ILMBASE}/lib/${LIBPREFIX}IexMath${ILMBASE_VERSION_POSTFIX}${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)
-  if(BUILD_MODE STREQUAL Release)
+	if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_alembic after_install
+		ExternalProject_Add_Step(external_alembic after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/alembic ${HARVEST_TARGET}/alembic
+			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/alembic ${HARVEST_TARGET}/alembic
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
-  if(BUILD_MODE STREQUAL Debug)
+	if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_alembic after_install
+		ExternalProject_Add_Step(external_alembic after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/alembic/lib/alembic.lib ${HARVEST_TARGET}/alembic/lib/alembic_d.lib
+			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/alembic/lib/alembic.lib ${HARVEST_TARGET}/alembic/lib/alembic_d.lib
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
 endif()
 add_dependencies(
-  external_alembic
+	external_alembic
-  external_boost
+	external_boost
-  external_zlib
+	external_zlib
-  external_ilmbase
+	external_ilmbase
-  external_openexr
+	external_openexr
 )
--- a/build_files/build_environment/cmake/blendthumb.cmake
+++ b/build_files/build_environment/cmake/blendthumb.cmake
@@ -17,51 +17,51 @@
 # ***** 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_blendthumb_32
-      external_zlib_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_blendthumb_64
-      external_zlib_64
+			external_zlib_64
-    )
+		)
-  endif()
+	endif()
 endif()
--- a/build_files/build_environment/cmake/blosc.cmake
+++ b/build_files/build_environment/cmake/blosc.cmake
@@ -17,59 +17,59 @@
 # ***** 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
+	-DDEACTIVATE_SNAPPY=ON
-  -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+	-DCMAKE_POSITION_INDEPENDENT_CODE=ON
 )
 if(WIN32)
-  #prevent blosc from including it's own local copy of zlib in the object file
+	#prevent blosc from including it's own local copy of zlib in the object file
-  #and cause linker errors with everybody else
+	#and cause linker errors with everybody else
-  set(BLOSC_EXTRA_ARGS ${BLOSC_EXTRA_ARGS}
+	set(BLOSC_EXTRA_ARGS ${BLOSC_EXTRA_ARGS}
-    -DPREFER_EXTERNAL_ZLIB=ON
+		-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(
-  external_blosc
+	external_blosc
-  external_zlib
+	external_zlib
 )
 if(WIN32)
-  add_dependencies(
+	add_dependencies(
-    external_blosc
+		external_blosc
-    external_pthreads
+		external_pthreads
-  )
+	)
 endif()
-if(WIN32)
+if (WIN32)
-  if(BUILD_MODE STREQUAL Release)
+	if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_blosc after_install
+		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 ${LIBDIR}/blosc/lib/libblosc.lib ${HARVEST_TARGET}/blosc/lib/libblosc.lib
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/blosc/include/ ${HARVEST_TARGET}/blosc/include/
+			COMMAND	${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/blosc/include/ ${HARVEST_TARGET}/blosc/include/
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
-  if(BUILD_MODE STREQUAL Debug)
+	if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_blosc after_install
+		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
+			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc_d.lib ${HARVEST_TARGET}/blosc/lib/libblosc_d.lib
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
 endif()
--- a/build_files/build_environment/cmake/boost.cmake
+++ b/build_files/build_environment/cmake/boost.cmake
@@ -19,91 +19,91 @@
 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)
+		set(BOOST_ADDRESS_MODEL 32)
-  endif()
+	endif()
-  if(MSVC14)
+	if(MSVC14)
-    set(BOOST_TOOLSET toolset=msvc-14.0)
+		set(BOOST_TOOLSET toolset=msvc-14.0)
-    set(BOOST_COMPILER_STRING -vc140)
+		set(BOOST_COMPILER_STRING -vc140)
-  endif()
+	endif()
-  set(JAM_FILE ${BUILD_DIR}/boost/src/external_boost/user-config.jam)
+	set(JAM_FILE ${BUILD_DIR}/boost/src/external_boost/user-config.jam)
-  set(semi_path "${PATCH_DIR}/semi.txt")
+	set(semi_path "${PATCH_DIR}/semi.txt")
-  FILE(TO_NATIVE_PATH ${semi_path} semi_path)
+	FILE(TO_NATIVE_PATH ${semi_path} semi_path)
-  set(BOOST_CONFIGURE_COMMAND bootstrap.bat &&
+	set(BOOST_CONFIGURE_COMMAND bootstrap.bat &&
-                echo using python : ${PYTHON_OUTPUTDIR}\\python.exe > "${JAM_FILE}" &&
+								echo using python : ${PYTHON_OUTPUTDIR}\\python.exe > "${JAM_FILE}" &&
-                echo.   : ${BUILD_DIR}/python/src/external_python/include ${BUILD_DIR}/python/src/external_python/pc >> "${JAM_FILE}" &&
+								echo.   : ${BUILD_DIR}/python/src/external_python/include ${BUILD_DIR}/python/src/external_python/pc >> "${JAM_FILE}" &&
-                echo.   : ${BUILD_DIR}/python/src/external_python/pcbuild >> "${JAM_FILE}" &&
+								echo.   : ${BUILD_DIR}/python/src/external_python/pcbuild >> "${JAM_FILE}" &&
-                type ${semi_path} >> "${JAM_FILE}"
+								type ${semi_path} >> "${JAM_FILE}"
-  )
+	)
-  set(BOOST_BUILD_COMMAND bjam)
+	set(BOOST_BUILD_COMMAND bjam)
-  #--user-config=user-config.jam
+	#--user-config=user-config.jam
-  set(BOOST_BUILD_OPTIONS runtime-link=static )
+	set(BOOST_BUILD_OPTIONS runtime-link=static )
-  #set(BOOST_WITH_PYTHON --with-python)
+	#set(BOOST_WITH_PYTHON --with-python)
-  set(BOOST_HARVEST_CMD   ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ )
+	set(BOOST_HARVEST_CMD 	${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ )
-  if(BUILD_MODE STREQUAL Release)
+	if(BUILD_MODE STREQUAL Release)
-    set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-1_68/ ${HARVEST_TARGET}/boost/include/)
+		set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-1_68/ ${HARVEST_TARGET}/boost/include/)
-  endif()
+	endif()
 elseif(APPLE)
-  set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
+	set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
-  set(BOOST_BUILD_COMMAND ./b2)
+	set(BOOST_BUILD_COMMAND ./b2)
-  set(BOOST_BUILD_OPTIONS toolset=darwin cxxflags=${PLATFORM_CXXFLAGS} linkflags=${PLATFORM_LDFLAGS} --disable-icu boost.locale.icu=off)
+	set(BOOST_BUILD_OPTIONS toolset=darwin 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 .)
+	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 ./b2)
-  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 .)
+	set(BOOST_PATCH_COMMAND echo .)
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    set(BOOST_ADDRESS_MODEL 64)
+		set(BOOST_ADDRESS_MODEL 64)
-  else()
+	else()
-    set(BOOST_ADDRESS_MODEL 32)
+		set(BOOST_ADDRESS_MODEL 32)
-  endif()
+	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}
 )
 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_HASH}
-  PREFIX ${BUILD_DIR}/boost
+	PREFIX ${BUILD_DIR}/boost
-  UPDATE_COMMAND  ""
+	UPDATE_COMMAND	""
-  PATCH_COMMAND ${BOOST_PATCH_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} 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
+		external_boost
-    Make_Python_Environment
+		Make_Python_Environment
-  )
+	)
 endif()
--- a/build_files/build_environment/cmake/bzip2.cmake
+++ b/build_files/build_environment/cmake/bzip2.cmake
@@ -21,19 +21,19 @@ set(BZIP2_CONFIGURE_ENV echo .)
 set(BZIP2_CONFIGURATION_ARGS)
 if(UNIX AND NOT APPLE)
-  set(BZIP2_LDFLAGS "-Wl,--as-needed")
+	set(BZIP2_LDFLAGS "-Wl,--as-needed")
-  set(BZIP2_CFLAGS "-fPIC -Wall -Winline -O2 -g -D_FILE_OFFSET_BITS=64")
+	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}
+	set(BZIP2_CONFIGURE_ENV ${BZIP2_CONFIGURE_ENV} && export LDFLAGS=${BZIP2_LDFLAGS} && export CFLAGS=${BZIP2_CFLAGS}
-    && export PREFIX=${BZIP2_PREFIX})
+		&& export PREFIX=${BZIP2_PREFIX})
 endif()
 ExternalProject_Add(external_bzip2
-  URL ${BZIP2_URI}
+	URL ${BZIP2_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH SHA256=${BZIP2_HASH}
+	URL_HASH SHA256=${BZIP2_HASH}
-  PREFIX ${BUILD_DIR}/bzip2
+	PREFIX ${BUILD_DIR}/bzip2
-  CONFIGURE_COMMAND echo .
+	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}
+	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_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
+	INSTALL_DIR ${LIBDIR}/bzip2
 )
--- a/build_files/build_environment/cmake/clang.cmake
+++ b/build_files/build_environment/cmake/clang.cmake
@@ -17,47 +17,47 @@
 # ***** 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
+	-DLLVM_CONFIG=${LIBDIR}/llvm/bin/llvm-config
 )
 if(WIN32)
-  set(CLANG_GENERATOR "Ninja")
+	set(CLANG_GENERATOR "Ninja")
 else()
-  set(CLANG_GENERATOR "Unix Makefiles")
+	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
+	PREFIX ${BUILD_DIR}/clang
-  CMAKE_GENERATOR ${CLANG_GENERATOR}
+	CMAKE_GENERATOR ${CLANG_GENERATOR}
-  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(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(
-  external_clang
+	external_clang
-  ll
+	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
@@ -20,50 +20,50 @@
 # library itself does not depend on them, so should give no problems.
 set(EMBREE_EXTRA_ARGS
-  -DEMBREE_ISPC_SUPPORT=OFF
+	-DEMBREE_ISPC_SUPPORT=OFF
-  -DEMBREE_TUTORIALS=OFF
+	-DEMBREE_TUTORIALS=OFF
-  -DEMBREE_STATIC_LIB=ON
+	-DEMBREE_STATIC_LIB=ON
-  -DEMBREE_RAY_MASK=ON
+	-DEMBREE_RAY_MASK=ON
-  -DEMBREE_FILTER_FUNCTION=ON
+	-DEMBREE_FILTER_FUNCTION=ON
-  -DEMBREE_BACKFACE_CULLING=OFF
+	-DEMBREE_BACKFACE_CULLING=OFF
-  -DEMBREE_TASKING_SYSTEM=INTERNAL
+	-DEMBREE_TASKING_SYSTEM=INTERNAL
-  -DEMBREE_MAX_ISA=AVX2
+	-DEMBREE_MAX_ISA=AVX2
 )
 if(WIN32)
-  set(EMBREE_BUILD_DIR ${BUILD_MODE}/)
+	set(EMBREE_BUILD_DIR ${BUILD_MODE}/)
 else()
-  set(EMBREE_BUILD_DIR)
+	set(EMBREE_BUILD_DIR)
 endif()
 ExternalProject_Add(external_embree
-  URL ${EMBREE_URI}
+	URL ${EMBREE_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${EMBREE_HASH}
+	URL_HASH MD5=${EMBREE_HASH}
-  PREFIX ${BUILD_DIR}/embree
+	PREFIX ${BUILD_DIR}/embree
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/embree
+	INSTALL_DIR ${LIBDIR}/embree
 )
 if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
+	if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_embree after_install
+		ExternalProject_Add_Step(external_embree after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/embree ${HARVEST_TARGET}/embree
+			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/embree ${HARVEST_TARGET}/embree
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  else()
+	else()
-  ExternalProject_Add_Step(external_embree after_install
+	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/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_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_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/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/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/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/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/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
+			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/tasking.lib ${HARVEST_TARGET}/embree/lib/tasking_d.lib
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
 endif()
--- a/build_files/build_environment/cmake/faad.cmake
+++ b/build_files/build_environment/cmake/faad.cmake
@@ -18,23 +18,23 @@
 set(FAAD_EXTRA_ARGS)
-if(WIN32)
+if (WIN32)
-  set(FAAD_EXTRA_CONFIGURE "utils\\win32\\ac2ver.exe" "faad2" "configure.ac" > libfaad\\win32_ver.h)
+	set(FAAD_EXTRA_CONFIGURE "utils\\win32\\ac2ver.exe" "faad2" "configure.ac" > libfaad\\win32_ver.h)
 else()
-  set(FAAD_EXTRA_CONFIGURE echo .)
+	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
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && ${FAAD_EXTRA_CONFIGURE} && ${CONFIGURE_COMMAND} --disable-shared --enable-static --prefix=${LIBDIR}/faad
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make -j${MAKE_THREADS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make install
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make install
-  INSTALL_DIR ${LIBDIR}/faad
+	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
@@ -17,24 +17,24 @@
 # ***** END GPL LICENSE BLOCK *****
 ExternalProject_Add(external_ffi
-  URL ${FFI_URI}
+	URL ${FFI_URI}
-  URL_HASH SHA256=${FFI_HASH}
+	URL_HASH SHA256=${FFI_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/ffi
+	PREFIX ${BUILD_DIR}/ffi
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ffi/src/external_ffi/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ffi
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ffi/src/external_ffi/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ffi
-    --enable-shared=no
+		--enable-shared=no
-    --enable-static=yes
+		--enable-static=yes
-    --with-pic
+		--with-pic
-    --libdir=${LIBDIR}/ffi/lib/
+		--libdir=${LIBDIR}/ffi/lib/
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ffi/src/external_ffi/ && make -j${MAKE_THREADS}
+	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
+	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
+	PATCH_COMMAND ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/ffi/src/external_ffi < ${PATCH_DIR}/ffi.diff
-  INSTALL_DIR ${LIBDIR}/ffi
+	INSTALL_DIR ${LIBDIR}/ffi
 )
-if(UNIX AND NOT APPLE)
+if (UNIX AND NOT APPLE)
-  ExternalProject_Add_Step(external_ffi after_install
+	ExternalProject_Add_Step(external_ffi after_install
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/ffi/lib/libffi.a ${LIBDIR}/ffi/lib/libffi_pic.a
+		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/ffi/lib/libffi.a ${LIBDIR}/ffi/lib/libffi_pic.a
-    DEPENDEES install
+		DEPENDEES install
-  )
+	)
 endif()
--- a/build_files/build_environment/cmake/ffmpeg.cmake
+++ b/build_files/build_environment/cmake/ffmpeg.cmake
@@ -22,131 +22,131 @@ set(FFMPEG_EXTRA_FLAGS --pkg-config-flags=--static --extra-cflags=${FFMPEG_CFLAG
 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})
 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")
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
-    set(FFMPEG_EXTRA_FLAGS
+		set(FFMPEG_EXTRA_FLAGS
-      ${FFMPEG_EXTRA_FLAGS}
+			${FFMPEG_EXTRA_FLAGS}
-      --x86asmexe=yasm
+			--x86asmexe=yasm
-    )
+		)
-  endif()
+	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
+	# OpenJpeg is compiled with pthread support on Linux, which is all fine and is what we
-  # want for maximum runtime performance, but due to static nature of that library we
+	# want for maximum runtime performance, but due to static nature of that library we
-  # need to force ffmpeg to link against pthread, otherwise test program used by autoconf
+	# need to force ffmpeg to link against pthread, otherwise test program used by autoconf
-  # will fail. This patch does that in a way that is compatible with multiple distributions.
+	# will fail. This patch does that in a way that is compatible with multiple distributions.
-  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/ffmpeg/src/external_ffmpeg < ${PATCH_DIR}/ffmpeg.diff
+	PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/ffmpeg/src/external_ffmpeg < ${PATCH_DIR}/ffmpeg.diff
-  PREFIX ${BUILD_DIR}/ffmpeg
+	PREFIX ${BUILD_DIR}/ffmpeg
-  CONFIGURE_COMMAND ${CONFIGURE_ENV_NO_PERL} &&
+	CONFIGURE_COMMAND ${CONFIGURE_ENV_NO_PERL} &&
-    cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ &&
+		cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ &&
-    ${FFMPEG_ENV} ${CONFIGURE_COMMAND_NO_TARGET} ${FFMPEG_EXTRA_FLAGS}
+		${FFMPEG_ENV} ${CONFIGURE_COMMAND_NO_TARGET} ${FFMPEG_EXTRA_FLAGS}
-    --disable-lzma
+		--disable-lzma
-    --disable-avfilter
+		--disable-avfilter
-    --disable-vdpau
+		--disable-vdpau
-    --disable-bzlib
+		--disable-bzlib
-    --disable-libgsm
+		--disable-libgsm
-    --disable-libspeex
+		--disable-libspeex
-    --enable-libvpx
+		--enable-libvpx
-    --prefix=${LIBDIR}/ffmpeg
+		--prefix=${LIBDIR}/ffmpeg
-    --enable-libtheora
+		--enable-libtheora
-    --enable-libvorbis
+		--enable-libvorbis
-    --enable-zlib
+		--enable-zlib
-    --enable-stripping
+		--enable-stripping
-    --enable-runtime-cpudetect
+		--enable-runtime-cpudetect
-    --disable-vaapi
+		--disable-vaapi
-    --disable-nonfree
+		--disable-nonfree
-    --enable-gpl
+		--enable-gpl
-    --disable-postproc
+		--disable-postproc
-    --enable-libmp3lame
+		--enable-libmp3lame
-    --disable-librtmp
+		--disable-librtmp
-    --enable-libx264
+		--enable-libx264
-    --enable-libxvid
+		--enable-libxvid
-    --disable-libopencore-amrnb
+		--disable-libopencore-amrnb
-    --disable-libopencore-amrwb
+		--disable-libopencore-amrwb
-    --disable-libdc1394
+		--disable-libdc1394
-    --disable-version3
+		--disable-version3
-    --disable-debug
+		--disable-debug
-    --enable-optimizations
+		--enable-optimizations
-    --disable-sse
+		--disable-sse
-    --disable-ssse3
+		--disable-ssse3
-    --enable-ffplay
+		--enable-ffplay
-    --disable-openssl
+		--disable-openssl
-    --disable-securetransport
+		--disable-securetransport
-    --disable-indev=avfoundation
+		--disable-indev=avfoundation
-    --disable-indev=qtkit
+		--disable-indev=qtkit
-    --disable-sdl2
+		--disable-sdl2
-    --disable-gnutls
+		--disable-gnutls
-    --disable-videotoolbox
+		--disable-videotoolbox
-    --disable-libxcb
+		--disable-libxcb
-    --disable-xlib
+		--disable-xlib
-    --disable-audiotoolbox
+		--disable-audiotoolbox
-    --disable-cuvid
+		--disable-cuvid
-    --disable-nvenc
+		--disable-nvenc
-    --disable-indev=jack
+		--disable-indev=jack
-    --disable-indev=alsa
+		--disable-indev=alsa
-    --disable-outdev=alsa
+		--disable-outdev=alsa
-    --disable-crystalhd
+		--disable-crystalhd
-    --disable-sndio
+		--disable-sndio
-  BUILD_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make -j${MAKE_THREADS}
+	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
+	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}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ffmpeg ${DEFAULT_CMAKE_FLAGS}
-  INSTALL_DIR ${LIBDIR}/ffmpeg
+	INSTALL_DIR ${LIBDIR}/ffmpeg
 )
 if(MSVC)
-  set_target_properties(external_ffmpeg PROPERTIES FOLDER Mingw)
+	set_target_properties(external_ffmpeg PROPERTIES FOLDER Mingw)
 endif()
 add_dependencies(
-  external_ffmpeg
+	external_ffmpeg
-  external_zlib
+	external_zlib
-  external_faad
+	external_faad
-  external_openjpeg
+	external_openjpeg
-  external_xvidcore
+	external_xvidcore
-  external_x264
+	external_x264
-  external_vpx
+	external_vpx
-  external_theora
+	external_theora
-  external_vorbis
+	external_vorbis
-  external_ogg
+	external_ogg
-  external_lame
+	external_lame
 )
 if(WIN32)
-  add_dependencies(
+	add_dependencies(
-    external_ffmpeg
+		external_ffmpeg
-    external_zlib_mingw
+		external_zlib_mingw
-  )
+	)
 endif()
 if(BUILD_MODE STREQUAL Release AND WIN32)
-  ExternalProject_Add_Step(external_ffmpeg after_install
+	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/include ${HARVEST_TARGET}/ffmpeg/include
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/bin ${HARVEST_TARGET}/ffmpeg/lib
+		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/bin ${HARVEST_TARGET}/ffmpeg/lib
-    DEPENDEES install
+		DEPENDEES install
-  )
+	)
 endif()
--- a/build_files/build_environment/cmake/fftw.cmake
+++ b/build_files/build_environment/cmake/fftw.cmake
@@ -19,29 +19,29 @@
 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)
+	if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_fftw3 after_install
+		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/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
+			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/include/fftw3.h ${HARVEST_TARGET}/fftw3/include/fftw3.h
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	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()
--- 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
@@ -17,28 +17,28 @@
 # ***** END GPL LICENSE BLOCK *****
 set(FREETYPE_EXTRA_ARGS
-  -DCMAKE_RELEASE_POSTFIX:STRING=2ST
+	-DCMAKE_RELEASE_POSTFIX:STRING=2ST
-  -DCMAKE_DEBUG_POSTFIX:STRING=2ST_d
+	-DCMAKE_DEBUG_POSTFIX:STRING=2ST_d
-  -DWITH_BZip2=OFF
+	-DWITH_BZip2=OFF
-  -DWITH_HarfBuzz=OFF
+	-DWITH_HarfBuzz=OFF
-  -DFT_WITH_HARFBUZZ=OFF
+	-DFT_WITH_HARFBUZZ=OFF
-  -DFT_WITH_BZIP2=OFF
+	-DFT_WITH_BZIP2=OFF
-  -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE
+	-DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE
-  -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=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
+	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
+	ExternalProject_Add_Step(external_freetype after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype ${HARVEST_TARGET}/freetype
+		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype ${HARVEST_TARGET}/freetype
-    DEPENDEES install
+		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,90 +21,91 @@
 ########################################################################
 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
+		COMMAND # jpeg rename libfile + copy include
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
-        # OpenImageIO
+				# OpenImageIO
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib &&
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/idiff.exe ${HARVEST_TARGET}/OpenImageIO/bin/idiff.exe &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/idiff.exe ${HARVEST_TARGET}/OpenImageIO/bin/idiff.exe &&
-        # png
+				# png
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib ${HARVEST_TARGET}/png/lib/libpng.lib &&
+				${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/ &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/ &&
-        # freeglut-> opengl
+				# freeglut-> opengl
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/freeglut/lib/freeglut_static.lib ${HARVEST_TARGET}/opengl/lib/freeglut_static.lib &&
+				${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/ &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freeglut/include/ ${HARVEST_TARGET}/opengl/include/ &&
-        # glew-> opengl
+				# glew-> opengl
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/glew/lib/libglew32.lib ${HARVEST_TARGET}/opengl/lib/glew.lib &&
+				${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/ &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/glew/include/ ${HARVEST_TARGET}/opengl/include/ &&
-        # sndfile
+				# sndfile
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/lib/libsndfile.dll.a ${HARVEST_TARGET}/sndfile/lib/libsndfile-1.lib &&
+				${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/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 &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/include/sndfile.h ${HARVEST_TARGET}/sndfile/include/sndfile.h &&
-        # tiff
+				# tiff
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiff.lib ${HARVEST_TARGET}/tiff/lib/libtiff.lib &&
+				${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/ &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tiff/include/ ${HARVEST_TARGET}/tiff/include/ &&
-        # BlendThumb
+				# BlendThumb
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/BlendThumb64/bin/blendthumb.dll ${HARVEST_TARGET}/ThumbHandler/lib/BlendThumb64.dll &&
+				${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 &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/BlendThumb32/bin/blendthumb.dll ${HARVEST_TARGET}/ThumbHandler/lib/BlendThumb.dll &&
-        # hidapi
+				# hidapi
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hidapi/ ${HARVEST_TARGET}/hidapi/ &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hidapi/ ${HARVEST_TARGET}/hidapi/ &&
-        # webp, straight up copy
+				# webp, straight up copy
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/webp ${HARVEST_TARGET}/webp &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/webp ${HARVEST_TARGET}/webp &&
-    DEPENDS
+		DEPENDS
-  )
+	)
 endif()
 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
+				# python
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/python/ ${HARVEST_TARGET}/python/ &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/python/ ${HARVEST_TARGET}/python/ &&
-        # hdf5
+				# hdf5
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hdf5/lib ${HARVEST_TARGET}/hdf5/lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hdf5/lib ${HARVEST_TARGET}/hdf5/lib &&
-        # numpy
+				# 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 &&
+				${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
+				# 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
+				${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
+		DEPENDS Package_Python
-  )
+	)
 endif()
 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")
@@ -128,31 +129,24 @@ 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/include blosc/include "*.h")
-  harvest(blosc/lib blosc/lib "*.a")
+	harvest(blosc/lib blosc/lib "*.a")
-  harvest(zlib/include zlib/include "*.h")
+	harvest(zlib/include zlib/include "*.h")
-  harvest(zlib/lib zlib/lib "*.a")
+	harvest(zlib/lib zlib/lib "*.a")
-  harvest(xml2/include xml2/include "*.h")
+	harvest(xml2/include xml2/include "*.h")
-  harvest(xml2/lib xml2/lib "*.a")
+	harvest(xml2/lib xml2/lib "*.a")
 else()
-  harvest(blosc/lib openvdb/lib "*.a")
+	harvest(blosc/lib openvdb/lib "*.a")
-  harvest(xml2/lib opencollada/lib "*.a")
+	harvest(xml2/lib opencollada/lib "*.a")
 endif()
 harvest(opencollada/include/opencollada opencollada/include "*.h")
 harvest(opencollada/lib/opencollada opencollada/lib "*.a")
--- a/build_files/build_environment/cmake/hdf5.cmake
+++ b/build_files/build_environment/cmake/hdf5.cmake
@@ -17,26 +17,26 @@
 # ***** 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
-  URL ${HDF5_URI}
+	URL ${HDF5_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${HDF5_HASH}
+	URL_HASH MD5=${HDF5_HASH}
-  PREFIX ${BUILD_DIR}/hdf5
+	PREFIX ${BUILD_DIR}/hdf5
-  PATCH_COMMAND ${HDF5_PATCH}
+	PATCH_COMMAND ${HDF5_PATCH}
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/hdf5 ${HDF5_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/hdf5 ${HDF5_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/hdf5
+	INSTALL_DIR ${LIBDIR}/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,23 @@
 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)
+	if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_iconv after_install
+		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/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
+			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/iconv/include/iconv.h ${HARVEST_TARGET}/iconv/include/iconv.h
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
 endif()
--- a/build_files/build_environment/cmake/ilmbase.cmake
+++ b/build_files/build_environment/cmake/ilmbase.cmake
@@ -17,42 +17,42 @@
 # ***** 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
+	set(ILMBASE_EXTRA_ARGS
-    -DBUILD_SHARED_LIBS=OFF
+		-DBUILD_SHARED_LIBS=OFF
-    -DCMAKE_CXX_STANDARD_LIBRARIES=${ILMBASE_CMAKE_CXX_STANDARD_LIBRARIES}
+		-DCMAKE_CXX_STANDARD_LIBRARIES=${ILMBASE_CMAKE_CXX_STANDARD_LIBRARIES}
-  )
+	)
-  ExternalProject_Add(external_ilmbase
+	ExternalProject_Add(external_ilmbase
-    URL ${ILMBASE_URI}
+		URL ${ILMBASE_URI}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH MD5=${ILMBASE_HASH}
+		URL_HASH MD5=${ILMBASE_HASH}
-    PREFIX ${BUILD_DIR}/ilmbase
+		PREFIX ${BUILD_DIR}/ilmbase
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ilmbase ${DEFAULT_CMAKE_FLAGS} ${ILMBASE_EXTRA_ARGS}
+		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ilmbase ${DEFAULT_CMAKE_FLAGS} ${ILMBASE_EXTRA_ARGS}
-    INSTALL_DIR ${LIBDIR}/openexr
+		INSTALL_DIR ${LIBDIR}/openexr
-  )
+	)
-  if(BUILD_MODE STREQUAL Release)
+	if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_ilmbase after_install
+		ExternalProject_Add_Step(external_ilmbase after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ilmbase ${HARVEST_TARGET}/openexr
+			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ilmbase ${HARVEST_TARGET}/openexr
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
 else()
-  set(ILMBASE_EXTRA_ARGS
+	set(ILMBASE_EXTRA_ARGS
-    --enable-static
+		--enable-static
-    --disable-shared
+		--disable-shared
-    --enable-cxxstd=11
+		--enable-cxxstd=11
-  )
+	)
-  ExternalProject_Add(external_ilmbase
+	ExternalProject_Add(external_ilmbase
-    URL ${ILMBASE_URI}
+		URL ${ILMBASE_URI}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH MD5=${ILMBASE_HASH}
+		URL_HASH MD5=${ILMBASE_HASH}
-    PREFIX ${BUILD_DIR}/ilmbase
+		PREFIX ${BUILD_DIR}/ilmbase
-    CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ilmbase/src/external_ilmbase/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/ilmbase ${ILMBASE_EXTRA_ARGS}
+		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}
+		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_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ilmbase/src/external_ilmbase/ && make install
-    INSTALL_DIR ${LIBDIR}/openexr
+		INSTALL_DIR ${LIBDIR}/openexr
-  )
+	)
 endif()
--- 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 -DNASM=${NASM_PATH} -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
+		--disable-frontend
-  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/lcms.cmake
+++ b/build_files/build_environment/cmake/lcms.cmake
@@ -20,12 +20,12 @@ set(LCMS_EXTRA_ARGS
 )
 ExternalProject_Add(external_lcms
-  URL ${LCMS_URI}
+	URL ${LCMS_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${LCMS_HASH}
+	URL_HASH MD5=${LCMS_HASH}
-  PREFIX ${BUILD_DIR}/lcms
+	PREFIX ${BUILD_DIR}/lcms
-  #patch taken from ocio
+	#patch taken from ocio
-  PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_lcms.txt ${BUILD_DIR}/lcms/src/external_lcms/CMakeLists.txt
+	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}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/lcms ${DEFAULT_CMAKE_FLAGS} ${LCMS_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/lcms
+	INSTALL_DIR ${LIBDIR}/lcms
 )
--- a/build_files/build_environment/cmake/llvm.cmake
+++ b/build_files/build_environment/cmake/llvm.cmake
@@ -17,42 +17,41 @@
 # ***** 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 "Ninja")
 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}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/llvm ${DEFAULT_CMAKE_FLAGS} ${LLVM_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/llvm
+	INSTALL_DIR ${LIBDIR}/llvm
 )
 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/
+		)
-    )
+	endif()
-  endif()
+	ExternalProject_Add_Step(ll after_install
-  ExternalProject_Add_Step(ll after_install
+		COMMAND ${LLVM_HARVEST_COMMAND}
-    COMMAND ${LLVM_HARVEST_COMMAND}
+		DEPENDEES mkdir update patch download configure build install
-    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
@@ -19,14 +19,14 @@
 set(LZMA_PATCH_CMD echo .)
 ExternalProject_Add(external_lzma
-  URL ${LZMA_URI}
+	URL ${LZMA_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH SHA256=${LZMA_HASH}
+	URL_HASH SHA256=${LZMA_HASH}
-  PREFIX ${BUILD_DIR}/lzma
+	PREFIX ${BUILD_DIR}/lzma
-  PATCH_COMMAND ${LZMA_PATCH_CMD}
+	PATCH_COMMAND ${LZMA_PATCH_CMD}
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/lzma
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/lzma
-    --disable-shared
+		--disable-shared
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && make -j${MAKE_THREADS}
+	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_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && make install
-  INSTALL_DIR ${LIBDIR}/lzma
+	INSTALL_DIR ${LIBDIR}/lzma
 )
--- a/build_files/build_environment/cmake/numpy.cmake
+++ b/build_files/build_environment/cmake/numpy.cmake
@@ -17,50 +17,50 @@
 # ***** 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()
 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" "."
-  )
+	)
 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)
-  ExternalProject_Add_Step(external_numpy after_install
+	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
+			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
+			DEPENDEES install
-    )
+		)
 endif()
 add_dependencies(
-  external_numpy
+	external_numpy
-  Make_Python_Environment
+	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,38 @@
 # ***** 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
+		-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)
+	ExternalProject_Add(external_openal
-    # Ensure we have backends for playback.
+		URL ${OPENAL_URI}
-    set(OPENAL_EXTRA_ARGS
+		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-      ${OPENAL_EXTRA_ARGS}
+		URL_HASH MD5=${OPENAL_HASH}
-      -DALSOFT_REQUIRE_ALSA=ON
+		PREFIX ${BUILD_DIR}/openal
-      -DALSOFT_REQUIRE_OSS=ON
+		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openal ${DEFAULT_CMAKE_FLAGS} ${OPENAL_EXTRA_ARGS}
-      -DALSOFT_REQUIRE_PULSEAUDIO=ON
+		INSTALL_DIR ${LIBDIR}/openal
-    )
+		PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openal/src/external_openal < ${PATCH_DIR}/openal.diff
-  endif()
+	)
-  ExternalProject_Add(external_openal
+	if(WIN32)
-    URL ${OPENAL_URI}
+		ExternalProject_Add_Step(external_openal after_install
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/lib/openal32.lib ${HARVEST_TARGET}/openal/lib/openal32.lib
-    URL_HASH MD5=${OPENAL_HASH}
+			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/bin/openal32.dll ${HARVEST_TARGET}/openal/lib/openal32.dll
-    PREFIX ${BUILD_DIR}/openal
+			COMMAND	${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openal/include/ ${HARVEST_TARGET}/openal/include/
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openal ${DEFAULT_CMAKE_FLAGS} ${OPENAL_EXTRA_ARGS}
+			DEPENDEES install
-    INSTALL_DIR ${LIBDIR}/openal
+		)
-    PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openal/src/external_openal < ${PATCH_DIR}/openal.diff
+	endif()
  )
  if(WIN32)
    ExternalProject_Add_Step(external_openal after_install
      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/lib/openal32.lib ${HARVEST_TARGET}/openal/lib/openal32.lib
      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/bin/openal32.dll ${HARVEST_TARGET}/openal/lib/openal32.dll
      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openal/include/ ${HARVEST_TARGET}/openal/include/
      DEPENDEES install
    )
  endif()
 endif()
--- a/build_files/build_environment/cmake/opencollada.cmake
+++ b/build_files/build_environment/cmake/opencollada.cmake
@@ -17,49 +17,49 @@
 # ***** END GPL LICENSE BLOCK *****
 if(UNIX)
-  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)
-  add_dependencies(
+	add_dependencies(
-    external_opencollada
+		external_opencollada
-    external_xml2
+		external_xml2
-  )
+	)
 endif()
 if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
+	if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_opencollada after_install
+		ExternalProject_Add_Step(external_opencollada after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencollada/ ${HARVEST_TARGET}/opencollada/
+			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencollada/ ${HARVEST_TARGET}/opencollada/
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
-  if(BUILD_MODE STREQUAL Debug)
+	if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_opencollada after_install
+		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/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/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/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/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/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/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/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/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/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/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
+			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/xml.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/xml_d.lib
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
 endif()
--- a/build_files/build_environment/cmake/opencolorio.cmake
+++ b/build_files/build_environment/cmake/opencolorio.cmake
@@ -17,96 +17,96 @@
 # ***** END GPL LICENSE BLOCK *****
 set(OPENCOLORIO_EXTRA_ARGS
-  -DOCIO_BUILD_APPS=OFF
+	-DOCIO_BUILD_APPS=OFF
-  -DOCIO_BUILD_PYGLUE=OFF
+	-DOCIO_BUILD_PYGLUE=OFF
-  -DOCIO_BUILD_NUKE=OFF
+	-DOCIO_BUILD_NUKE=OFF
-  -DOCIO_USE_BOOST_PTR=OFF
+	-DOCIO_USE_BOOST_PTR=OFF
-  -DOCIO_BUILD_STATIC=ON
+	-DOCIO_BUILD_STATIC=ON
-  -DOCIO_BUILD_SHARED=OFF
+	-DOCIO_BUILD_SHARED=OFF
-  -DOCIO_BUILD_TRUELIGHT=OFF
+	-DOCIO_BUILD_TRUELIGHT=OFF
-  -DOCIO_BUILD_DOCS=OFF
+	-DOCIO_BUILD_DOCS=OFF
-  -DOCIO_BUILD_PYGLUE=OFF
+	-DOCIO_BUILD_PYGLUE=OFF
-  -DOCIO_BUILD_JNIGLUE=OFF
+	-DOCIO_BUILD_JNIGLUE=OFF
-  -DOCIO_STATIC_JNIGLUE=OFF
+	-DOCIO_STATIC_JNIGLUE=OFF
 )
 if(WIN32)
-  set(OCIO_PATCH opencolorio_win.diff)
+	set(OCIO_PATCH opencolorio_win.diff)
-  set(OPENCOLORIO_EXTRA_ARGS
+	set(OPENCOLORIO_EXTRA_ARGS
-    ${OPENCOLORIO_EXTRA_ARGS}
+		${OPENCOLORIO_EXTRA_ARGS}
-    -DOCIO_BUILD_TESTS=OFF
+		-DOCIO_BUILD_TESTS=OFF
-    -DOCIO_USE_SSE=ON
+		-DOCIO_USE_SSE=ON
-    -DOCIO_INLINES_HIDDEN=OFF
+		-DOCIO_INLINES_HIDDEN=OFF
-    -DOCIO_PYGLUE_LINK=OFF
+		-DOCIO_PYGLUE_LINK=OFF
-    -DOCIO_PYGLUE_RESPECT_ABI=OFF
+		-DOCIO_PYGLUE_RESPECT_ABI=OFF
-    -DOCIO_PYGLUE_SONAME=OFF
+		-DOCIO_PYGLUE_SONAME=OFF
-    -DOCIO_PYGLUE_LIB_PREFIX=OFF
+		-DOCIO_PYGLUE_LIB_PREFIX=OFF
-    -DUSE_EXTERNAL_TINYXML=ON
+		-DUSE_EXTERNAL_TINYXML=ON
-    -DTINYXML_INCLUDE_DIR=${LIBDIR}/tinyxml/include
+		-DTINYXML_INCLUDE_DIR=${LIBDIR}/tinyxml/include
-    -DTINYXML_LIBRARY=${LIBDIR}/tinyxml/lib/tinyxml${libext}
+		-DTINYXML_LIBRARY=${LIBDIR}/tinyxml/lib/tinyxml${libext}
-    -DUSE_EXTERNAL_YAML=ON
+		-DUSE_EXTERNAL_YAML=ON
-    -DYAML_CPP_FOUND=ON
+		-DYAML_CPP_FOUND=ON
-    -DYAML_CPP_VERSION=${YAMLCPP_VERSION}
+		-DYAML_CPP_VERSION=${YAMLCPP_VERSION}
-    -DUSE_EXTERNAL_LCMS=ON
+		-DUSE_EXTERNAL_LCMS=ON
-    -DINC_1=${LIBDIR}/tinyxml/include
+		-DINC_1=${LIBDIR}/tinyxml/include
-    -DINC_2=${LIBDIR}/yamlcpp/include
+		-DINC_2=${LIBDIR}/yamlcpp/include
-    #lie because ocio cmake is demanding boost even though it is not needed
+		#lie because ocio cmake is demanding boost even though it is not needed
-    -DYAML_CPP_VERSION=0.5.0
+		-DYAML_CPP_VERSION=0.5.0
-  )
+	)
 else()
-  set(OCIO_PATCH opencolorio.diff)
+	set(OCIO_PATCH opencolorio.diff)
-  set(OPENCOLORIO_EXTRA_ARGS
+	set(OPENCOLORIO_EXTRA_ARGS
-    ${OPENCOLORIO_EXTRA_ARGS}
+		${OPENCOLORIO_EXTRA_ARGS}
-  )
+	)
 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 1 -N -d ${BUILD_DIR}/opencolorio/src/external_opencolorio < ${PATCH_DIR}/${OCIO_PATCH}
-  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(
-  external_opencolorio
+	external_opencolorio
-  external_boost
+	external_boost
 )
 if(WIN32)
-  add_dependencies(
+	add_dependencies(
-    external_opencolorio
+		external_opencolorio
-    external_tinyxml
+		external_tinyxml
-    external_yamlcpp
+		external_yamlcpp
-  )
+	)
-  if(BUILD_MODE STREQUAL Release)
+	if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_opencolorio after_install
+		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/include ${HARVEST_TARGET}/opencolorio/include
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/lib/static ${HARVEST_TARGET}/opencolorio/lib
+			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}/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
+			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tinyxml/lib/tinyxml.lib ${HARVEST_TARGET}/opencolorio/lib/tinyxml.lib
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
-  if(BUILD_MODE STREQUAL Debug)
+	if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_opencolorio after_install
+		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}/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}/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
+			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tinyxml/lib/tinyxml.lib ${HARVEST_TARGET}/opencolorio/lib/tinyxml_d.lib
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
 endif()
--- a/build_files/build_environment/cmake/openexr.cmake
+++ b/build_files/build_environment/cmake/openexr.cmake
@@ -17,62 +17,62 @@
 # ***** 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
+	set(OPENEXR_EXTRA_ARGS
-    -DCMAKE_CXX_STANDARD_LIBRARIES=${OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES}
+		-DCMAKE_CXX_STANDARD_LIBRARIES=${OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES}
-    -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/
-    -DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase
+		-DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase
-    -DOPENEXR_BUILD_ILMBASE=On
+		-DOPENEXR_BUILD_ILMBASE=On
-    -DOPENEXR_BUILD_OPENEXR=On
+		-DOPENEXR_BUILD_OPENEXR=On
-    -DOPENEXR_BUILD_PYTHON_LIBS=Off
+		-DOPENEXR_BUILD_PYTHON_LIBS=Off
-    -DOPENEXR_BUILD_STATIC=On
+		-DOPENEXR_BUILD_STATIC=On
-    -DOPENEXR_BUILD_SHARED=Off
+		-DOPENEXR_BUILD_SHARED=Off
-    -DOPENEXR_BUILD_TESTS=Off
+		-DOPENEXR_BUILD_TESTS=Off
-    -DOPENEXR_BUILD_VIEWERS=Off
+		-DOPENEXR_BUILD_VIEWERS=Off
-    -DOPENEXR_BUILD_UTILS=Off
+		-DOPENEXR_BUILD_UTILS=Off
-    -DOPENEXR_NAMESPACE_VERSIONING=Off
+		-DOPENEXR_NAMESPACE_VERSIONING=Off
-  )
+	)
-  ExternalProject_Add(external_openexr
+	ExternalProject_Add(external_openexr
-    URL ${OPENEXR_URI}
+		URL ${OPENEXR_URI}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH MD5=${OPENEXR_HASH}
+		URL_HASH MD5=${OPENEXR_HASH}
-    PREFIX ${BUILD_DIR}/openexr
+		PREFIX ${BUILD_DIR}/openexr
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openexr ${DEFAULT_CMAKE_FLAGS} ${OPENEXR_EXTRA_ARGS}
+		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openexr ${DEFAULT_CMAKE_FLAGS} ${OPENEXR_EXTRA_ARGS}
-    INSTALL_DIR ${LIBDIR}/openexr
+		INSTALL_DIR ${LIBDIR}/openexr
-  )
+	)
-  ExternalProject_Add_Step(external_openexr after_install
+	ExternalProject_Add_Step(external_openexr after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${HARVEST_TARGET}/openexr/lib
+		COMMAND	${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${HARVEST_TARGET}/openexr/lib
-    #libs have moved between versions, just duplicate it for now.
+		#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/lib ${LIBDIR}/ilmbase/lib
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/include ${HARVEST_TARGET}/openexr/include
+		COMMAND	${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/include ${HARVEST_TARGET}/openexr/include
-    DEPENDEES install
+		DEPENDEES install
-  )
+	)
 else()
-  set(OPENEXR_PKG_CONFIG_PATH ${LIBDIR}/zlib/share/pkgconfig)
+	set(OPENEXR_PKG_CONFIG_PATH ${LIBDIR}/zlib/share/pkgconfig)
-  set(OPENEXR_EXTRA_ARGS
+	set(OPENEXR_EXTRA_ARGS
-    --enable-static
+	  --enable-static
-    --disable-shared
+	  --disable-shared
-    --enable-cxxstd=11
+	  --enable-cxxstd=11
-    --with-ilmbase-prefix=${LIBDIR}/ilmbase
+	  --with-ilmbase-prefix=${LIBDIR}/ilmbase
-    )
+	  )
-  ExternalProject_Add(external_openexr
+	ExternalProject_Add(external_openexr
-    URL ${OPENEXR_URI}
+		URL ${OPENEXR_URI}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH MD5=${OPENEXR_HASH}
+		URL_HASH MD5=${OPENEXR_HASH}
-    PREFIX ${BUILD_DIR}/openexr
+		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}
+		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}
+		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_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/openexr/src/external_openexr/ && make install
-    INSTALL_DIR ${LIBDIR}/openexr
+		INSTALL_DIR ${LIBDIR}/openexr
-  )
+	)
 endif()
 add_dependencies(
-  external_openexr
+	external_openexr
-  external_zlib
+	external_zlib
-  external_ilmbase
+	external_ilmbase
 )
--- a/build_files/build_environment/cmake/openimageio.cmake
+++ b/build_files/build_environment/cmake/openimageio.cmake
@@ -17,136 +17,136 @@
 # ***** 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)
-  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)
-  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/openjp2${LIBEXT}
+		-DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg_msvc/lib/openjp2${LIBEXT}
-    -DOPENJPEG_LIBRARY_DEBUG=${LIBDIR}/openjpeg_msvc/lib/openjp2${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${OPENEXR_VERSION_POSTFIX}${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}
+	-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${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-  -DOPENEXR_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-  -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-  -DOPENEXR_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_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${OPENEXR_VERSION_POSTFIX}${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 1 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio_static_libs.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(
-  external_openimageio
+	external_openimageio
-  external_png external_zlib
+	external_png external_zlib
-  external_ilmbase
+	external_ilmbase
-  external_openexr
+	external_openexr
-  external_jpeg
+	external_jpeg
-  external_boost
+	external_boost
-  external_tiff
+	external_tiff
-  external_opencolorio
+	external_opencolorio
-  external_openjpeg${OPENJPEG_POSTFIX}
+	external_openjpeg${OPENJPEG_POSTFIX}
-  ${WEBP_DEP}
+	${WEBP_DEP}
 )
 if(NOT WIN32)
-  add_dependencies(
+	add_dependencies(
-    external_openimageio
+		external_openimageio
-    external_opencolorio_extra
+		external_opencolorio_extra
-  )
+	)
 endif()
--- a/build_files/build_environment/cmake/openjpeg.cmake
+++ b/build_files/build_environment/cmake/openjpeg.cmake
@@ -22,43 +22,43 @@
 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" -DBUILD_PKGCONFIG_FILES=On)
 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)
-  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)
+	if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_openjpeg_msvc after_install
+		ExternalProject_Add_Step(external_openjpeg_msvc after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openjpeg_msvc/lib ${HARVEST_TARGET}/openjpeg/lib &&
+			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
+					${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openjpeg_msvc/include ${HARVEST_TARGET}/openjpeg/include
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
 endif()
 set(OPENJPEG_LIBRARY libopenjp2${LIBEXT})
 if(MSVC)
-  set_target_properties(external_openjpeg PROPERTIES FOLDER Mingw)
+	set_target_properties(external_openjpeg PROPERTIES FOLDER Mingw)
 endif()
--- a/build_files/build_environment/cmake/openmp.cmake
+++ b/build_files/build_environment/cmake/openmp.cmake
@@ -18,16 +18,15 @@
 ExternalProject_Add(external_openmp
-  URL ${OPENMP_URI}
+	URL ${OPENMP_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${OPENMP_HASH}
+	URL_HASH MD5=${OPENMP_HASH}
-  PREFIX ${BUILD_DIR}/openmp
+	PREFIX ${BUILD_DIR}/openmp
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openmp ${DEFAULT_CMAKE_FLAGS}
+	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}/clang
  INSTALL_DIR ${LIBDIR}/openmp
 )
 add_dependencies(
-  external_openmp
+	external_openmp
-  external_clang
+	external_clang
 )
--- a/build_files/build_environment/cmake/opensubdiv.cmake
+++ b/build_files/build_environment/cmake/opensubdiv.cmake
@@ -17,86 +17,86 @@
 # ***** 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
+	set(OPENSUBDIV_EXTRA_ARGS
-    ${OPENSUBDIV_EXTRA_ARGS}
+		${OPENSUBDIV_EXTRA_ARGS}
-    -DTBB_INCLUDE_DIR=${LIBDIR}/tbb/include
+		-DTBB_INCLUDE_DIR=${LIBDIR}/tbb/include
-    -DTBB_LIBRARIES=${LIBDIR}/tbb/lib/tbb_static.lib
+		-DTBB_LIBRARIES=${LIBDIR}/tbb/lib/tbb_static.lib
-    -DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL
+		-DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL
-    -DCLEW_LIBRARY=${LIBDIR}/clew/lib/clew${LIBEXT}
+		-DCLEW_LIBRARY=${LIBDIR}/clew/lib/clew${LIBEXT}
-    -DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include
+		-DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include
-    -DCUEW_LIBRARY=${LIBDIR}/cuew/lib/cuew${LIBEXT}
+		-DCUEW_LIBRARY=${LIBDIR}/cuew/lib/cuew${LIBEXT}
-    -DCMAKE_EXE_LINKER_FLAGS_RELEASE=libcmt.lib
+		-DCMAKE_EXE_LINKER_FLAGS_RELEASE=libcmt.lib
-  )
+	)
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    set(OPENSUBDIV_EXTRA_ARGS
+		set(OPENSUBDIV_EXTRA_ARGS
-      ${OPENSUBDIV_EXTRA_ARGS}
+			${OPENSUBDIV_EXTRA_ARGS}
-      -DNO_CUDA=OFF
+			-DNO_CUDA=OFF
-    )
+		)
-  else()
+	else()
-    set(OPENSUBDIV_EXTRA_ARGS
+		set(OPENSUBDIV_EXTRA_ARGS
-      ${OPENSUBDIV_EXTRA_ARGS}
+			${OPENSUBDIV_EXTRA_ARGS}
-      -DNO_CUDA=ON
+			-DNO_CUDA=ON
-    )
+		)
-  endif()
+	endif()
 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_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)
-  if(BUILD_MODE STREQUAL Release)
+	if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_opensubdiv after_install
+		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/lib ${HARVEST_TARGET}/opensubdiv/lib
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opensubdiv/include ${HARVEST_TARGET}/opensubdiv/include
+			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opensubdiv/include ${HARVEST_TARGET}/opensubdiv/include
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
-  if(BUILD_MODE STREQUAL Debug)
+	if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_opensubdiv after_install
+		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/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
+			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opensubdiv/lib/osdGPU.lib ${HARVEST_TARGET}/opensubdiv/lib/osdGPU_d.lib
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
 endif()
 add_dependencies(
-  external_opensubdiv
+	external_opensubdiv
-  external_glew
+	external_glew
-  external_glfw
+	external_glfw
-  external_clew
+	external_clew
-  external_cuew
+	external_cuew
-  external_tbb
+	external_tbb
 )
--- a/build_files/build_environment/cmake/openvdb.cmake
+++ b/build_files/build_environment/cmake/openvdb.cmake
@@ -17,86 +17,86 @@
 # ***** 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}
+	-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_NO_SYSTEM_PATHS=ON
+	-DBoost_NO_SYSTEM_PATHS=ON
-  -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/
-  -DBLOSC_INCLUDE_DIR=${LIBDIR}/blosc/include/
+	-DBLOSC_INCLUDE_DIR=${LIBDIR}/blosc/include/
-  -DBLOSC_blosc_LIBRARY=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
+	-DBLOSC_blosc_LIBRARY=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
-  -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF
+	-DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF
-  -DOPENVDB_BUILD_UNITTESTS=Off
+	-DOPENVDB_BUILD_UNITTESTS=Off
-  -DOPENVDB_BUILD_PYTHON_MODULE=Off
+	-DOPENVDB_BUILD_PYTHON_MODULE=Off
-  -DGLEW_LOCATION=${LIBDIR}/glew/
+	-DGLEW_LOCATION=${LIBDIR}/glew/
-  -DBLOSC_LOCATION=${LIBDIR}/blosc/
+	-DBLOSC_LOCATION=${LIBDIR}/blosc/
-  -DTBB_LOCATION=${LIBDIR}/tbb/
+	-DTBB_LOCATION=${LIBDIR}/tbb/
-  -DTBB_ROOT=${LIBDIR}/tbb/
+	-DTBB_ROOT=${LIBDIR}/tbb/
-  -DOPENEXR_LOCATION=${LIBDIR}/openexr
+	-DOPENEXR_LOCATION=${LIBDIR}/openexr
-  -DILMBASE_LOCATION=${LIBDIR}/ilmbase
+	-DILMBASE_LOCATION=${LIBDIR}/ilmbase
-  -DIlmbase_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DIlmbase_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-  -DIlmbase_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DIlmbase_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-  -DIlmbase_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DIlmbase_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-  -DOpenexr_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+	-DOpenexr_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-  -DTBB_LIBRARYDIR=${LIBDIR}/tbb/lib
+	-DTBB_LIBRARYDIR=${LIBDIR}/tbb/lib
-  -DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
+	-DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
-  -DTBB_LIBRARY_PATH=${LIBDIR}/tbb/lib
+	-DTBB_LIBRARY_PATH=${LIBDIR}/tbb/lib
 )
 if(WIN32)
-  # Namespaces seem to be buggy and cause linker errors due to things not
+	# Namespaces seem to be buggy and cause linker errors due to things not
-  # being in the correct namespace
+	# being in the correct namespace
-  # needs to link pthreads due to it being a blosc dependency
+	# needs to link pthreads due to it being a blosc dependency
-  set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
+	set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
-    -DOPENEXR_NAMESPACE_VERSIONING=OFF
+		-DOPENEXR_NAMESPACE_VERSIONING=OFF
-    -DEXTRA_LIBS:FILEPATH=${LIBDIR}/pthreads/lib/pthreadVC3.lib
+		-DEXTRA_LIBS:FILEPATH=${LIBDIR}/pthreads/lib/pthreadVC2.lib
-  )
+	)
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
-    set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
+		set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
-      -DCMAKE_SHARED_LINKER_FLAGS="/safeseh:no"
+			-DCMAKE_SHARED_LINKER_FLAGS="/safeseh:no"
-      -DCMAKE_EXE_LINKER_FLAGS="/safeseh:no"
+			-DCMAKE_EXE_LINKER_FLAGS="/safeseh:no"
-    )
+		)
-  endif()
+	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 ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openvdb ${DEFAULT_CMAKE_FLAGS} ${OPENVDB_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openvdb ${DEFAULT_CMAKE_FLAGS} ${OPENVDB_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/openvdb
+	INSTALL_DIR ${LIBDIR}/openvdb
 )
 add_dependencies(
-  openvdb
+	openvdb
-  external_tbb
+	external_tbb
-  external_boost
+	external_boost
-  external_ilmbase
+	external_ilmbase
-  external_openexr
+	external_openexr
-  external_zlib
+	external_zlib
-  external_blosc
+	external_blosc
 )
 if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
+	if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(openvdb after_install
+		ExternalProject_Add_Step(openvdb after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openvdb/include ${HARVEST_TARGET}/openvdb/include
+			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
+			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/libopenvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb.lib
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
-  if(BUILD_MODE STREQUAL Debug)
+	if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(openvdb after_install
+		ExternalProject_Add_Step(openvdb after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/libopenvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb_d.lib
+			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/libopenvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb_d.lib
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
 endif()
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -17,22 +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}")
 if(BUILD_MODE STREQUAL "Debug")
-  set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Debug)
+	set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Debug)
 else(BUILD_MODE STREQUAL "Debug")
-  set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Release)
+	set(LIBDIR ${CMAKE_CURRENT_BINARY_DIR}/Release)
 endif()
 option(DOWNLOAD_DIR "Path for downloaded files" ${CMAKE_CURRENT_SOURCE_DIR}/downloads)
@@ -46,173 +46,174 @@ 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)
+	if(MSVC_VERSION GREATER 1909)
-    set(COMMON_MSVC_FLAGS "/Wv:18") #some deps with warnings as error aren't quite ready for dealing with the new 2017 warnings.
+		set(COMMON_MSVC_FLAGS "/Wv:18") #some deps with warnings as error aren't quite ready for dealing with the new 2017 warnings.
-  endif()
+	endif()
-  set(COMMON_MSVC_FLAGS "${COMMON_MSVC_FLAGS} /bigobj")
+	set(COMMON_MSVC_FLAGS "${COMMON_MSVC_FLAGS} /bigobj")
-  if(WITH_OPTIMIZED_DEBUG)
+	if(WITH_OPTIMIZED_DEBUG)
-    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+		set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  else()
+	else()
-    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /D_DEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+		set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MTd ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /D_DEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  endif()
+	endif()
-  set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "/MT ${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+	set(BLENDER_CMAKE_C_FLAGS_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_RELEASE "/MT ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "/MT ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+	set(BLENDER_CMAKE_C_FLAGS_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 ${COMMON_MSVC_FLAGS} /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  ${COMMON_MSVC_FLAGS} /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 /${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG  /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "/MT ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+	set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "/MT ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MT ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+	set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MT ${COMMON_MSVC_FLAGS} /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.11)
+		set(OSX_DEPLOYMENT_TARGET 10.9)
-    set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
+		set(OSX_SDK_VERSION 10.13)
 		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 -DCMAKE_INSTALL_LIBDIR=lib)
-  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 ${PLATFORM_CFLAGS}")
-  else()
+	else()
-    set(BLENDER_CMAKE_C_FLAGS_DEBUG "-g ${PLATFORM_CFLAGS}")
+		set(BLENDER_CMAKE_C_FLAGS_DEBUG "-g ${PLATFORM_CFLAGS}")
-  endif()
+	endif()
-  set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG ${PLATFORM_CFLAGS}")
+	set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG ${PLATFORM_CFLAGS}")
-  set(BLENDER_CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${PLATFORM_CFLAGS}")
+	set(BLENDER_CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${PLATFORM_CFLAGS}")
-  set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${PLATFORM_CFLAGS}")
+	set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${PLATFORM_CFLAGS}")
-  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)
+	if(BUILD_MODE STREQUAL Debug)
-    set(ZLIB_LIBRARY zlibstaticd${LIBEXT})
+		set(ZLIB_LIBRARY zlibstaticd${LIBEXT})
-  else()
+	else()
-    set(ZLIB_LIBRARY zlibstatic${LIBEXT})
+		set(ZLIB_LIBRARY zlibstatic${LIBEXT})
-  endif()
+	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/osl.cmake
+++ b/build_files/build_environment/cmake/osl.cmake
@@ -17,124 +17,116 @@
 # ***** 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${OPENEXR_VERSION_POSTFIX}${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)
+	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${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
-  SET(OSL_PLATFORM_FLAGS)
+	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_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_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_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-  -DOPENEXR_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-  -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread${ILMBASE_VERSION_POSTFIX}${LIBEXT}
-  -DOPENEXR_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex${ILMBASE_VERSION_POSTFIX}${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${OPENEXR_VERSION_POSTFIX}${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
-  ${OSL_PLATFORM_FLAGS}
+	${OSL_PLATFORM_FLAGS}
-  -DOSL_BUILD_PLUGINS=Off
+	-DOSL_BUILD_PLUGINS=Off
-  -DSTOP_ON_WARNING=OFF
+	-DSTOP_ON_WARNING=OFF
-  -DUSE_LLVM_BITCODE=OFF
+	-DUSE_LLVM_BITCODE=OFF
-  -DUSE_PARTIO=OFF
+	-DUSE_PARTIO=OFF
-  ${OSL_SIMD_FLAGS}
+	${OSL_SIMD_FLAGS}
-  -DPARTIO_LIBRARIES=
+	-DPARTIO_LIBRARIES=
 )
 if(WIN32)
-  set(OSL_EXTRA_ARGS
+	set(OSL_EXTRA_ARGS
-    ${OSL_EXTRA_ARGS}
+		${OSL_EXTRA_ARGS}
-    -DPUGIXML_HOME=${LIBDIR}/pugixml
+		-DPUGIXML_HOME=${LIBDIR}/pugixml
-  )
+	)
 elseif(APPLE)
-  # Make symbol hiding consistent with OIIO which defaults to OFF,
+	# Make symbol hiding consistent with OIIO which defaults to OFF,
-  # avoids linker warnings on macOS
+	# avoids linker warnings on macOS
-  set(OSL_EXTRA_ARGS
+	set(OSL_EXTRA_ARGS
-    ${OSL_EXTRA_ARGS}
+		${OSL_EXTRA_ARGS}
-    -DHIDE_SYMBOLS=OFF
+		-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 1 -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}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/osl -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${DEFAULT_CMAKE_FLAGS} ${OSL_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/osl
+	INSTALL_DIR ${LIBDIR}/osl
 )
 add_dependencies(
-  external_osl
+	external_osl
-  external_boost
+	external_boost
-  ll
+	ll
-  external_clang
+	external_clang
-  external_ilmbase
+	external_ilmbase
-  external_openexr
+	external_openexr
-  external_zlib
+	external_zlib
-  external_flexbison
+	external_flexbison
-  external_openimageio
+	external_openimageio
 	external_pugixml
 )
 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)
+	if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_osl after_install
+		ExternalProject_Add_Step(external_osl after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/osl/ ${HARVEST_TARGET}/osl
+			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/osl/ ${HARVEST_TARGET}/osl
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
-  if(BUILD_MODE STREQUAL Debug)
+	if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_osl after_install
+		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/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/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
+			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslquery.lib ${HARVEST_TARGET}/osl/lib/oslquery_d.lib
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
 endif()
--- a/build_files/build_environment/cmake/png.cmake
+++ b/build_files/build_environment/cmake/png.cmake
@@ -17,28 +17,28 @@
 # ***** 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(
-  external_png
+	external_png
-  external_zlib
+	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,39 @@
 # ***** 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
+		ExternalProject_Add(external_pthreads
-      URL ${PTHREADS_URI}
+			URL ${PTHREADS_URI}
-      DOWNLOAD_DIR ${DOWNLOAD_DIR}
+			DOWNLOAD_DIR ${DOWNLOAD_DIR}
-      URL_HASH MD5=${PTHREADS_HASH}
+			URL_HASH SHA512=${PTHREADS_SHA512}
-      PREFIX ${BUILD_DIR}/pthreads
+			PREFIX ${BUILD_DIR}/pthreads
-      CONFIGURE_COMMAND echo .
+			CONFIGURE_COMMAND echo .
-      BUILD_COMMAND ${PTHREADS_BUILD}
+			PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/pthreads/src/external_pthreads < ${PATCH_DIR}/pthreads.diff
-      INSTALL_COMMAND COMMAND
+			BUILD_COMMAND ${PTHREADS_BUILD}
-        ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/libpthreadVC3${LIBEXT} ${LIBDIR}/pthreads/lib/pthreadVC3${LIBEXT} &&
+			INSTALL_COMMAND COMMAND
-        ${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/pthreadVC2.dll ${LIBDIR}/pthreads/lib/pthreadVC2.dll &&
-        ${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/pthreadVC2${LIBEXT} ${LIBDIR}/pthreads/lib/pthreadVC2${LIBEXT} &&
-        ${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/pthread.h ${LIBDIR}/pthreads/inc/pthread.h &&
-        ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/_ptw32.h ${LIBDIR}/pthreads/inc/_ptw32.h
+				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/sched.h ${LIBDIR}/pthreads/inc/sched.h &&
-      INSTALL_DIR ${LIBDIR}/pthreads
+				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/semaphore.h ${LIBDIR}/pthreads/inc/semaphore.h
-    )
+			INSTALL_DIR ${LIBDIR}/pthreads
 		)
-    if(BUILD_MODE STREQUAL Release)
+		if(BUILD_MODE STREQUAL Release)
-      ExternalProject_Add_Step(external_pthreads after_install
+			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/inc/ ${HARVEST_TARGET}/pthreads/include/
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/lib/ ${HARVEST_TARGET}/pthreads/lib
+				COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/lib/ ${HARVEST_TARGET}/pthreads/lib
-        DEPENDEES install
+				DEPENDEES install
-      )
+			)
-    endif()
+		endif()
 endif()
--- a/build_files/build_environment/cmake/pugixml.cmake
+++ b/build_files/build_environment/cmake/pugixml.cmake
@@ -20,24 +20,24 @@ set(PUGIXML_EXTRA_ARGS
 )
 ExternalProject_Add(external_pugixml
-  URL ${PUGIXML_URI}
+	URL ${PUGIXML_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${PUGIXML_HASH}
+	URL_HASH MD5=${PUGIXML_HASH}
-  PREFIX ${BUILD_DIR}/pugixml
+	PREFIX ${BUILD_DIR}/pugixml
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/pugixml ${DEFAULT_CMAKE_FLAGS} ${PUGIXML_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/pugixml ${DEFAULT_CMAKE_FLAGS} ${PUGIXML_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/pugixml
+	INSTALL_DIR ${LIBDIR}/pugixml
 )
 if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
+	if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_pugixml after_install
+		ExternalProject_Add_Step(external_pugixml after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib ${HARVEST_TARGET}/osl/lib/pugixml.lib
+			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib ${HARVEST_TARGET}/osl/lib/pugixml.lib
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
-  if(BUILD_MODE STREQUAL Debug)
+	if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_pugixml after_install
+		ExternalProject_Add_Step(external_pugixml after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib ${HARVEST_TARGET}/osl/lib/pugixml_d.lib
+			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib ${HARVEST_TARGET}/osl/lib/pugixml_d.lib
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif() 
+	endif()	
 endif()
--- a/build_files/build_environment/cmake/python.cmake
+++ b/build_files/build_environment/cmake/python.cmake
@@ -18,164 +18,163 @@
 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")
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    set(SSL_POSTFIX -x64)
+		set(SSL_POSTFIX -x64)
-  else()
+	else()
-    set(SSL_POSTFIX)
+		set(SSL_POSTFIX)
-  endif()
+	endif()
-  set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe)
+	set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe)
-  macro(cmake_to_dos_path MsysPath ResultingPath)
+	macro(cmake_to_dos_path MsysPath ResultingPath)
-    string(REPLACE "/" "\\" ${ResultingPath} "${MsysPath}")
+		string(REPLACE "/" "\\" ${ResultingPath} "${MsysPath}")
-  endmacro()
+	endmacro()
-  set(PYTHON_EXTERNALS_FOLDER ${BUILD_DIR}/python/src/external_python/externals)
+	set(PYTHON_EXTERNALS_FOLDER ${BUILD_DIR}/python/src/external_python/externals)
-  set(DOWNLOADS_EXTERNALS_FOLDER ${DOWNLOAD_DIR}/externals)
+	set(DOWNLOADS_EXTERNALS_FOLDER ${DOWNLOAD_DIR}/externals)
-  cmake_to_dos_path(${PYTHON_EXTERNALS_FOLDER} PYTHON_EXTERNALS_FOLDER_DOS)
+	cmake_to_dos_path(${PYTHON_EXTERNALS_FOLDER} PYTHON_EXTERNALS_FOLDER_DOS)
-  cmake_to_dos_path(${DOWNLOADS_EXTERNALS_FOLDER} DOWNLOADS_EXTERNALS_FOLDER_DOS)
+	cmake_to_dos_path(${DOWNLOADS_EXTERNALS_FOLDER} DOWNLOADS_EXTERNALS_FOLDER_DOS)
-  message("Python externals = ${PYTHON_EXTERNALS_FOLDER}")
+	message("Python externals = ${PYTHON_EXTERNALS_FOLDER}")
-  message("Python externals_dos = ${PYTHON_EXTERNALS_FOLDER_DOS}")
+	message("Python externals_dos = ${PYTHON_EXTERNALS_FOLDER_DOS}")
-  message("Python DOWNLOADS_EXTERNALS_FOLDER = ${DOWNLOADS_EXTERNALS_FOLDER}")
+	message("Python DOWNLOADS_EXTERNALS_FOLDER = ${DOWNLOADS_EXTERNALS_FOLDER}")
-  message("Python DOWNLOADS_EXTERNALS_FOLDER_DOS = ${DOWNLOADS_EXTERNALS_FOLDER_DOS}")
+	message("Python DOWNLOADS_EXTERNALS_FOLDER_DOS = ${DOWNLOADS_EXTERNALS_FOLDER_DOS}")
-  ExternalProject_Add(external_python
+	ExternalProject_Add(external_python
-    URL ${PYTHON_URI}
+		URL ${PYTHON_URI}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH MD5=${PYTHON_HASH}
+		URL_HASH MD5=${PYTHON_HASH}
-    PREFIX ${BUILD_DIR}/python
+		PREFIX ${BUILD_DIR}/python
-    PATCH_COMMAND
+		PATCH_COMMAND
-      echo mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}" &&
+			echo mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}" &&
-      mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}"
+			mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}"
-    CONFIGURE_COMMAND ""
+		CONFIGURE_COMMAND ""
-    BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p ${PYTHON_ARCH} -c ${BUILD_MODE}
+		BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p ${PYTHON_ARCH} -c ${BUILD_MODE}
-    INSTALL_COMMAND COMMAND
+		INSTALL_COMMAND COMMAND
-      ${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll &&
+			${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll &&
-      ${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb &&
+			${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb &&
-      ${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib &&
+			${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib &&
-      ${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.exp ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.exp &&
+			${CMAKE_COMMAND} -E copy ${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_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
+			${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("PythinRedist = ${BUILD_DIR}/python/src/external_python/redist")
-  message("POutput = ${PYTHON_OUTPUTDIR}")
+	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
+		# disable functions that can be in 10.13 sdk but aren't available on 10.9 target
-    set(PYTHON_FUNC_CONFIGS
+		set(PYTHON_FUNC_CONFIGS
-      export ac_cv_func_futimens=no &&
+		  export ac_cv_func_futimens=no &&
-      export ac_cv_func_utimensat=no &&
+		  export ac_cv_func_utimensat=no &&
-      export ac_cv_func_basename_r=no &&
+		  export ac_cv_func_basename_r=no &&
-      export ac_cv_func_clock_getres=no &&
+		  export ac_cv_func_clock_getres=no &&
-      export ac_cv_func_clock_gettime=no &&
+		  export ac_cv_func_clock_gettime=no &&
-      export ac_cv_func_clock_settime=no &&
+		  export ac_cv_func_clock_settime=no &&
-      export ac_cv_func_dirname_r=no &&
+		  export ac_cv_func_dirname_r=no &&
-      export ac_cv_func_getentropy=no &&
+		  export ac_cv_func_getentropy=no &&
-      export ac_cv_func_mkostemp=no &&
+		  export ac_cv_func_mkostemp=no &&
-      export ac_cv_func_mkostemps=no &&
+		  export ac_cv_func_mkostemps=no &&
-      export ac_cv_func_timingsafe_bcmp=no)
+		  export ac_cv_func_timingsafe_bcmp=no)
-    set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV} && ${PYTHON_FUNC_CONFIGS})
+		set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV} && ${PYTHON_FUNC_CONFIGS})
-    set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python.exe)
+		set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python.exe)
-  else()
+	else()
-    set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV})
+		set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV})
-    set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python)
+		set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python)
-  endif()
+	endif()
-  set(PYTHON_CONFIGURE_EXTRA_ARGS "--with-openssl=${LIBDIR}/ssl")
+	set(PYTHON_CONFIGURE_EXTRA_ARGS "--with-openssl=${LIBDIR}/ssl")
-  set(PYTHON_CFLAGS "-I${LIBDIR}/sqlite/include -I${LIBDIR}/bzip2/include -I${LIBDIR}/lzma/include -I${LIBDIR}/zlib/include")
+	set(PYTHON_CFLAGS "-I${LIBDIR}/sqlite/include -I${LIBDIR}/bzip2/include -I${LIBDIR}/lzma/include -I${LIBDIR}/zlib/include")
-  set(PYTHON_LDFLAGS "-L${LIBDIR}/ffi/lib -L${LIBDIR}/sqlite/lib -L${LIBDIR}/bzip2/lib -L${LIBDIR}/lzma/lib -L${LIBDIR}/zlib/lib")
+	set(PYTHON_LDFLAGS "-L${LIBDIR}/ffi/lib -L${LIBDIR}/sqlite/lib -L${LIBDIR}/bzip2/lib -L${LIBDIR}/lzma/lib -L${LIBDIR}/zlib/lib")
-  set(PYTHON_CONFIGURE_EXTRA_ENV
+	set(PYTHON_CONFIGURE_EXTRA_ENV
-    export CFLAGS=${PYTHON_CFLAGS} &&
+		export CFLAGS=${PYTHON_CFLAGS} &&
-    export CPPFLAGS=${PYTHON_CFLAGS} &&
+		export CPPFLAGS=${PYTHON_CFLAGS} &&
-    export LDFLAGS=${PYTHON_LDFLAGS} &&
+		export LDFLAGS=${PYTHON_LDFLAGS} &&
-    export PKG_CONFIG_PATH=${LIBDIR}/ffi/lib/pkgconfig)
+		export PKG_CONFIG_PATH=${LIBDIR}/ffi/lib/pkgconfig)
-  set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_linux.diff)
+	set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_linux.diff)
-  ExternalProject_Add(external_python
+	ExternalProject_Add(external_python
-    URL ${PYTHON_URI}
+		URL ${PYTHON_URI}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH MD5=${PYTHON_HASH}
+		URL_HASH MD5=${PYTHON_HASH}
-    PREFIX ${BUILD_DIR}/python
+		PREFIX ${BUILD_DIR}/python
-    PATCH_COMMAND ${PYTHON_PATCH}
+		PATCH_COMMAND ${PYTHON_PATCH}
-    CONFIGURE_COMMAND ${PYTHON_CONFIGURE_ENV} && ${PYTHON_CONFIGURE_EXTRA_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/python ${PYTHON_CONFIGURE_EXTRA_ARGS}
+		CONFIGURE_COMMAND ${PYTHON_CONFIGURE_ENV} && ${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}
+		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_COMMAND ${PYTHON_CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && make install
-    INSTALL_DIR ${LIBDIR}/python)
+		INSTALL_DIR ${LIBDIR}/python)
-  add_custom_target(Make_Python_Environment ALL DEPENDS external_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}/_asyncio${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_asyncio${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}/_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}/_contextvars${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_contextvars${PYTHON_POSTFIX}.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ctypes${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ctypes${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ctypes${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ctypes${PYTHON_POSTFIX}.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ctypes_test${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ctypes_test${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ctypes_test${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ctypes_test${PYTHON_POSTFIX}.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_decimal${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_decimal${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_decimal${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_decimal${PYTHON_POSTFIX}.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_distutils_findvs${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_distutils_findvs${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_distutils_findvs${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_distutils_findvs${PYTHON_POSTFIX}.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_elementtree${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_elementtree${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_elementtree${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_elementtree${PYTHON_POSTFIX}.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_hashlib${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_hashlib${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_hashlib${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_hashlib${PYTHON_POSTFIX}.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_lzma${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_lzma${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_lzma${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_lzma${PYTHON_POSTFIX}.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_msi${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_msi${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_msi${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_msi${PYTHON_POSTFIX}.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_multiprocessing${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_multiprocessing${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_multiprocessing${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_multiprocessing${PYTHON_POSTFIX}.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_overlapped${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_overlapped${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_overlapped${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_overlapped${PYTHON_POSTFIX}.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_queue${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_queue${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_queue${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_queue${PYTHON_POSTFIX}.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_socket${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_socket${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_socket${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_socket${PYTHON_POSTFIX}.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_sqlite3${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_sqlite3${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_sqlite3${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_sqlite3${PYTHON_POSTFIX}.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ssl${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ssl${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ssl${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ssl${PYTHON_POSTFIX}.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testbuffer${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testbuffer${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testbuffer${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testbuffer${PYTHON_POSTFIX}.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testcapi${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testcapi${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testcapi${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testcapi${PYTHON_POSTFIX}.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testimportmultiple${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testimportmultiple${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testimportmultiple${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testimportmultiple${PYTHON_POSTFIX}.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testmultiphase${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testmultiphase${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testmultiphase${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testmultiphase${PYTHON_POSTFIX}.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/pyexpat${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/pyexpat${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/pyexpat${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/pyexpat${PYTHON_POSTFIX}.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_POSTFIX}.exe" ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_POSTFIX}.exe" ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/select${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/select${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/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}/unicodedata${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/unicodedata${PYTHON_POSTFIX}.pyd
-    COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/winsound${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/winsound${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/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
+		#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.
+		#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}/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}/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}/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 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_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
-    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
+	add_custom_command(OUTPUT ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/redist ${BUILD_DIR}/python/src/external_python/run
+		COMMAND	${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/redist ${BUILD_DIR}/python/src/external_python/run
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/include ${BUILD_DIR}/python/src/external_python/run/include
+		COMMAND	${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/include ${BUILD_DIR}/python/src/external_python/run/include
-    COMMAND ${CMAKE_COMMAND} -E copy "${BUILD_DIR}/python/src/external_python/PC/pyconfig.h" ${BUILD_DIR}/python/src/external_python/run/include/pyconfig.h
+		COMMAND	${CMAKE_COMMAND} -E copy "${BUILD_DIR}/python/src/external_python/PC/pyconfig.h" ${BUILD_DIR}/python/src/external_python/run/include/pyconfig.h
-    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
+		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
-    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}.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_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	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_POSTFIX}.exe" ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe
-    COMMAND ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe -m ensurepip --upgrade
+		COMMAND	${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)
+	add_custom_target(Make_Python_Environment ALL DEPENDS ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe Package_Python)
 endif()
 if(UNIX)
-  add_dependencies(
+	add_dependencies(
-    external_python
+		external_python
-    external_bzip2
+		external_bzip2
-    external_ffi
+		external_ffi
-    external_lzma
+		external_lzma
-    external_ssl
+		external_ssl
-    external_sqlite
+		external_sqlite
-    external_zlib
+		external_zlib
-  )
+	)
 endif()
--- a/build_files/build_environment/cmake/python_site_packages.cmake
+++ b/build_files/build_environment/cmake/python_site_packages.cmake
@@ -16,26 +16,26 @@
 #
 # ***** 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(
-  external_python_site_packages
+	external_python_site_packages
-  Make_Python_Environment
+	Make_Python_Environment
 )
--- a/build_files/build_environment/cmake/sdl.cmake
+++ b/build_files/build_environment/cmake/sdl.cmake
@@ -17,33 +17,33 @@
 # ***** 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
+		-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
+	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/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/lib ${HARVEST_TARGET}/sdl/lib
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/bin ${HARVEST_TARGET}/sdl/lib
+		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/bin ${HARVEST_TARGET}/sdl/lib
-    DEPENDEES install
+		DEPENDEES install
-  )
+	)
 endif()
--- a/build_files/build_environment/cmake/setup_mingw32.cmake
+++ b/build_files/build_environment/cmake/setup_mingw32.cmake
@@ -24,11 +24,11 @@
 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}")
@@ -36,192 +36,192 @@ 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")
-  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://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")
 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"))
-  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-4.9.4-release-win32-sjlj-rt_v5-rev0.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")
-  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.13.02/win32/nasm-2.13.02-win32.zip" "${DOWNLOAD_DIR}/nasm-2.13.02-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"))
-  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.13.02-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.13.02/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")
+	message("Installing mktemp")
-  execute_process(
+	execute_process(
-    COMMAND ${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get install msys msys-mktemp
+		COMMAND ${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get install msys msys-mktemp
-    WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw32/bin/
+		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,11 +24,11 @@
 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}")
@@ -36,192 +36,192 @@ 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")
-  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/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")
 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"))
-  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-4.9.4-release-win32-seh-rt_v5-rev0.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")
-  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.13.02/win64/nasm-2.13.02-win64.zip" "${DOWNLOAD_DIR}/nasm-2.13.02-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"))
-  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.13.02-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.13.02/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")
+	message("Installing mktemp")
-  execute_process(
+	execute_process(
-    COMMAND ${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get install msys msys-mktemp
+		COMMAND ${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get install msys msys-mktemp
-    WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw64/bin/
+		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,43 @@ 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)
-  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(
-  external_sndfile
+	external_sndfile
-  external_ogg
+	external_ogg
-  external_vorbis
+	external_vorbis
 )
 if(UNIX)
-  add_dependencies(
+	add_dependencies(
-    external_sndfile
+		external_sndfile
-    external_flac
+		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
@@ -20,38 +20,38 @@ set(SQLITE_CONFIGURE_ENV echo .)
 set(SQLITE_CONFIGURATION_ARGS)
 if(UNIX AND NOT APPLE)
-  set(SQLITE_LDFLAGS -Wl,--as-needed)
+	set(SQLITE_LDFLAGS -Wl,--as-needed)
-  set(SQLITE_CFLAGS
+	set(SQLITE_CFLAGS
-    "-DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_COLUMN_METADATA \
+		"-DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_COLUMN_METADATA \
-    -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
+		-DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
-    -DSQLITE_ENABLE_RTREE=1 -DSQLITE_SOUNDEX=1 \
+		-DSQLITE_ENABLE_RTREE=1 -DSQLITE_SOUNDEX=1 \
-    -DSQLITE_ENABLE_UNLOCK_NOTIFY \
+		-DSQLITE_ENABLE_UNLOCK_NOTIFY \
-    -DSQLITE_OMIT_LOOKASIDE=1 -DSQLITE_ENABLE_DBSTAT_VTAB \
+		-DSQLITE_OMIT_LOOKASIDE=1 -DSQLITE_ENABLE_DBSTAT_VTAB \
-    -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1 \
+		-DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1 \
-    -DSQLITE_ENABLE_LOAD_EXTENSION \
+		-DSQLITE_ENABLE_LOAD_EXTENSION \
-    -DSQLITE_ENABLE_JSON1 \
+		-DSQLITE_ENABLE_JSON1 \
-    -DSQLITE_LIKE_DOESNT_MATCH_BLOBS \
+		-DSQLITE_LIKE_DOESNT_MATCH_BLOBS \
-    -DSQLITE_THREADSAFE=1 \
+		-DSQLITE_THREADSAFE=1 \
-    -DSQLITE_ENABLE_FTS3_TOKENIZER=1 \
+		-DSQLITE_ENABLE_FTS3_TOKENIZER=1 \
-    -DSQLITE_MAX_SCHEMA_RETRY=25 \
+		-DSQLITE_MAX_SCHEMA_RETRY=25 \
-    -DSQLITE_ENABLE_PREUPDATE_HOOK \
+		-DSQLITE_ENABLE_PREUPDATE_HOOK \
-    -DSQLITE_ENABLE_SESSION \
+		-DSQLITE_ENABLE_SESSION \
-    -DSQLITE_ENABLE_STMTVTAB \
+		-DSQLITE_ENABLE_STMTVTAB \
-    -DSQLITE_MAX_VARIABLE_NUMBER=250000 \
+		-DSQLITE_MAX_VARIABLE_NUMBER=250000 \
-    -fPIC")
+		-fPIC")
-  set(SQLITE_CONFIGURE_ENV ${SQLITE_CONFIGURE_ENV} && export LDFLAGS=${SQLITE_LDFLAGS} && export CFLAGS=${SQLITE_CFLAGS})
+	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
+	set(SQLITE_CONFIGURATION_ARGS ${SQLITE_CONFIGURATION_ARGS} --enable-threadsafe --enable-load-extension --enable-json1 --enable-fts4 --enable-fts5
-      --enable-shared=no)
+	    --enable-shared=no)
 endif()
 ExternalProject_Add(external_sqlite
-  URL ${SQLITE_URI}
+	URL ${SQLITE_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH SHA1=${SQLITE_HASH}
+	URL_HASH SHA1=${SQLITE_HASH}
-  PREFIX ${BUILD_DIR}/sqlite
+	PREFIX ${BUILD_DIR}/sqlite
-  PATCH_COMMAND ${SQLITE_PATCH_CMD}
+	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}
+	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}
+	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_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && make install
-  INSTALL_DIR ${LIBDIR}/sqlite
+	INSTALL_DIR ${LIBDIR}/sqlite
 )
--- a/build_files/build_environment/cmake/ssl.cmake
+++ b/build_files/build_environment/cmake/ssl.cmake
@@ -19,30 +19,30 @@
 set(SSL_CONFIGURE_COMMAND ./Configure)
 set(SSL_PATCH_CMD echo .)
-if(APPLE)
+if (APPLE)
-  set(SSL_OS_COMPILER "blender-darwin-x86_64")
+	set(SSL_OS_COMPILER "blender-darwin-x86_64")
 else()
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)
+		set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)
-    set(SSL_OS_COMPILER "blender-linux-x86_64")
+		set(SSL_OS_COMPILER "blender-linux-x86_64")
-  else()
+	else()
-    set(SSL_OS_COMPILER "blender-linux-x86")
+		set(SSL_OS_COMPILER "blender-linux-x86")
-  endif()
+	endif()
 endif()
 ExternalProject_Add(external_ssl
-  URL ${SSL_URI}
+	URL ${SSL_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH SHA256=${SSL_HASH}
+	URL_HASH SHA256=${SSL_HASH}
-  PREFIX ${BUILD_DIR}/ssl
+	PREFIX ${BUILD_DIR}/ssl
-  PATCH_COMMAND ${SSL_PATCH_CMD}
+	PATCH_COMMAND ${SSL_PATCH_CMD}
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && ${SSL_CONFIGURE_COMMAND} --prefix=${LIBDIR}/ssl
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && ${SSL_CONFIGURE_COMMAND} --prefix=${LIBDIR}/ssl
-    --openssldir=${LIBDIR}/ssl
+		--openssldir=${LIBDIR}/ssl
-    no-shared
+		no-shared
-    no-idea no-mdc2 no-rc5 no-zlib no-ssl3 enable-unit-test no-ssl3-method enable-rfc3779 enable-cms
+		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
+		--config=${CMAKE_CURRENT_SOURCE_DIR}/cmake/ssl.conf
-    ${SSL_OS_COMPILER}
+		${SSL_OS_COMPILER}
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make -j${MAKE_THREADS}
+	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_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make install
-  INSTALL_DIR ${LIBDIR}/ssl
+	INSTALL_DIR ${LIBDIR}/ssl
 )
--- a/build_files/build_environment/cmake/tbb.cmake
+++ b/build_files/build_environment/cmake/tbb.cmake
@@ -17,36 +17,36 @@
 # ***** 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/vs2013/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 (WIN32)
-  if(BUILD_MODE STREQUAL Release)
+	if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_tbb after_install
+		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 ${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/
+			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tbb/include/ ${HARVEST_TARGET}/tbb/include/
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
-  if(BUILD_MODE STREQUAL Debug)
+	if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_tbb after_install
+		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
+			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb_debug.lib
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
 endif()
--- a/build_files/build_environment/cmake/theora.cmake
+++ b/build_files/build_environment/cmake/theora.cmake
@@ -17,28 +17,28 @@
 # ***** 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(
-  external_theora
+	external_theora
-  external_vorbis
+	external_vorbis
-  external_ogg
+	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,31 @@
 # ***** 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(
-  external_tiff
+	external_tiff
-  external_zlib
+	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
@@ -20,12 +20,12 @@ set(TINYXML_EXTRA_ARGS
 )
 ExternalProject_Add(external_tinyxml
-  URL ${TINYXML_URI}
+	URL ${TINYXML_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${TINYXML_HASH}
+	URL_HASH MD5=${TINYXML_HASH}
-  PREFIX ${BUILD_DIR}/tinyxml
+	PREFIX ${BUILD_DIR}/tinyxml
-  #patch taken from ocio
+	#patch taken from ocio
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/tinyxml/src/external_tinyxml < ${PATCH_DIR}/tinyxml.diff
+	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}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tinyxml ${DEFAULT_CMAKE_FLAGS} ${TINYXML_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/tinyxml
+	INSTALL_DIR ${LIBDIR}/tinyxml
 )
--- a/build_files/build_environment/cmake/versions.cmake
+++ b/build_files/build_environment/cmake/versions.cmake
@@ -41,37 +41,37 @@ set(BLOSC_VERSION 1.14.4)
 set(BLOSC_URI https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.tar.gz)
 set(BLOSC_HASH e80dfc71e4cba03b8d01ed0876547ffe)
-set(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)
-if(WIN32)
+if (WIN32)
-  if(BUILD_MODE STREQUAL Release)
+	if(BUILD_MODE STREQUAL Release)
-    set(ILMBASE_VERSION_POSTFIX _s)
+		set(ILMBASE_VERSION_POSTFIX _s)
-    set(OPENEXR_VERSION_POSTFIX _s)
+		set(OPENEXR_VERSION_POSTFIX _s)
-  else()
+	else()
-    set(ILMBASE_VERSION_POSTFIX _s_d)
+		set(ILMBASE_VERSION_POSTFIX _s_d)
-    set(OPENEXR_VERSION_POSTFIX _s_d)
+		set(OPENEXR_VERSION_POSTFIX _s_d)
-  endif()
+	endif()
 else()
-  set(ILMBASE_VERSION_POSTFIX)
+	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)
-if(WIN32) #release 2.3.0 tarball has broken cmake support
+if (WIN32) #release 2.3.0 tarball has broken cmake support
-  set(OPENEXR_URI https://github.com/openexr/openexr/archive/0ac2ea34c8f3134148a5df4052e40f155b76f6fb.tar.gz)
+	set(OPENEXR_URI https://github.com/openexr/openexr/archive/0ac2ea34c8f3134148a5df4052e40f155b76f6fb.tar.gz)
-  set(OPENEXR_HASH ed159435d508240712fbaaa21d94bafb)
+	set(OPENEXR_HASH ed159435d508240712fbaaa21d94bafb)
 else()
-  set(OPENEXR_VERSION_POSTFIX)
+	set(OPENEXR_VERSION_POSTFIX)
-  set(OPENEXR_URI https://github.com/openexr/openexr/releases/download/v${OPENEXR_VERSION}/openexr-${OPENEXR_VERSION}.tar.gz)
+	set(OPENEXR_URI https://github.com/openexr/openexr/releases/download/v${OPENEXR_VERSION}/openexr-${OPENEXR_VERSION}.tar.gz)
-  set(OPENEXR_HASH a157e8a46596bc185f2472a5a4682174)
+	set(OPENEXR_HASH a157e8a46596bc185f2472a5a4682174)
 endif()
 set(FREETYPE_VERSION 2.9.1)
-set(FREETYPE_URI http://prdownloads.sourceforge.net/freetype/freetype-${FREETYPE_VERSION}.tar.gz)
+set(FREETYPE_URI http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz)
 set(FREETYPE_HASH 3adb0e35d3c100c456357345ccfa8056)
 set(GLEW_VERSION 1.13.0)
@@ -113,9 +113,9 @@ set(SDL_VERSION 2.0.8)
 set(SDL_URI https://www.libsdl.org/release/SDL2-${SDL_VERSION}.tar.gz)
 set(SDL_HASH 3800d705cef742c6a634f202c37f263f)
-set(OPENCOLLADA_VERSION v1.6.68)
+set(OPENCOLLADA_VERSION v1.6.63)
 set(OPENCOLLADA_URI https://github.com/KhronosGroup/OpenCOLLADA/archive/${OPENCOLLADA_VERSION}.tar.gz)
-set(OPENCOLLADA_HASH ee7dae874019fea7be11613d07567493)
+set(OPENCOLLADA_HASH e937c3897b86fc0da53cde97257f5156)
 set(OPENCOLORIO_VERSION 1.1.0)
 set(OPENCOLORIO_URI https://github.com/imageworks/OpenColorIO/archive/v${OPENCOLORIO_VERSION}.tar.gz)
@@ -251,7 +251,7 @@ 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)
@@ -284,7 +284,7 @@ set(BZIP2_URI http://http.debian.net/debian/pool/main/b/bzip2/bzip2_${BZIP2_VERS
 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_URI ftp://sourceware.org/pub/libffi/libffi-${FFI_VERSION}.tar.gz)
 set(FFI_HASH d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37)
 set(LZMA_VERSION 5.2.4)
--- a/build_files/build_environment/cmake/vorbis.cmake
+++ b/build_files/build_environment/cmake/vorbis.cmake
@@ -17,25 +17,25 @@
 # ***** 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(
-  external_vorbis
+	external_vorbis
-  external_ogg
+	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 --disable-multithread)
-  else()
+	else()
-    set(VPX_EXTRA_FLAGS --target=x86-win32-gcc --disable-multithread)
+		set(VPX_EXTRA_FLAGS --target=x86-win32-gcc --disable-multithread)
-  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,22 @@
 # 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_DIR ${LIBDIR}/webp
 )
--- a/build_files/build_environment/cmake/x264.cmake
+++ b/build_files/build_environment/cmake/x264.cmake
@@ -17,29 +17,29 @@
 # ***** 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)
+	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 .)
+	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}
+	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
@@ -17,18 +17,18 @@
 # ***** END GPL LICENSE BLOCK *****
 set(YAMLCPP_EXTRA_ARGS
-  -DBUILD_GMOCK=OFF
+	-DBUILD_GMOCK=OFF
-  -DYAML_CPP_BUILD_TESTS=OFF
+	-DYAML_CPP_BUILD_TESTS=OFF
-  -DYAML_CPP_BUILD_TOOLS=OFF
+	-DYAML_CPP_BUILD_TOOLS=OFF
-  -DYAML_CPP_BUILD_CONTRIB=OFF
+	-DYAML_CPP_BUILD_CONTRIB=OFF
-  -DMSVC_SHARED_RT=OFF
+	-DMSVC_SHARED_RT=OFF
 )
 ExternalProject_Add(external_yamlcpp
-  URL ${YAMLCPP_URI}
+	URL ${YAMLCPP_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${YAMLCPP_HASH}
+	URL_HASH MD5=${YAMLCPP_HASH}
-  PREFIX ${BUILD_DIR}/yamlcpp
+	PREFIX ${BUILD_DIR}/yamlcpp
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/yamlcpp ${DEFAULT_CMAKE_FLAGS} ${YAMLCPP_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/yamlcpp ${DEFAULT_CMAKE_FLAGS} ${YAMLCPP_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/yamlcpp
+	INSTALL_DIR ${LIBDIR}/yamlcpp
 )
--- a/build_files/build_environment/cmake/zlib.cmake
+++ b/build_files/build_environment/cmake/zlib.cmake
@@ -17,31 +17,39 @@
 # ***** 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 (WIN32)
-  if(BUILD_MODE STREQUAL Release)
+	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/zlibstatic${LIBEXT} ${HARVEST_TARGET}/zlib/lib/libz_st${LIBEXT}
+			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstatic${LIBEXT} ${HARVEST_TARGET}/zlib/lib/libz_st${LIBEXT}
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zlib/include/ ${HARVEST_TARGET}/zlib/include/
+			COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zlib/include/ ${HARVEST_TARGET}/zlib/include/
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
-  if(BUILD_MODE STREQUAL Debug)
+	if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_zlib after_install
+		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}
+		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstaticd${LIBEXT} ${HARVEST_TARGET}/zlib/lib/libz_st_d${LIBEXT}
-    DEPENDEES install
+		DEPENDEES install
-    )
+		)
-  endif()
+	endif()
 else()
-  ExternalProject_Add_Step(external_zlib after_install
+	if(BUILD_MODE STREQUAL Debug)
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/libz.a ${LIBDIR}/zlib/lib/libz_pic.a
+		ExternalProject_Add_Step(external_zlib after_install
-    DEPENDEES install
+			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstaticd${LIBEXT} ${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-  )
+			DEPENDEES install
 		)
 	endif()
 	if (UNIX)
 		ExternalProject_Add_Step(external_zlib after_install
 			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/libz.a ${LIBDIR}/zlib/lib/libz_pic.a
 			DEPENDEES install
 		)
 	endif()
 endif()
--- a/build_files/build_environment/cmake/zlib_mingw.cmake
+++ b/build_files/build_environment/cmake/zlib_mingw.cmake
@@ -17,23 +17,23 @@
 # ***** 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
@@ -301,8 +301,6 @@ NO_BUILD=false
 NO_CONFIRM=false
 USE_CXX11=true
 CLANG_FORMAT_VERSION_MIN="6.0"
 PYTHON_VERSION="3.7.0"
 PYTHON_VERSION_MIN="3.7"
 PYTHON_FORCE_BUILD=false
@@ -380,11 +378,12 @@ ALEMBIC_FORCE_BUILD=false
 ALEMBIC_FORCE_REBUILD=false
 ALEMBIC_SKIP=false
-OPENCOLLADA_VERSION="1.6.68"
+OPENCOLLADA_VERSION="1.6.63"
 OPENCOLLADA_FORCE_BUILD=false
 OPENCOLLADA_FORCE_REBUILD=false
 OPENCOLLADA_SKIP=false
 EMBREE_VERSION="3.2.4"
 EMBREE_FORCE_BUILD=false
 EMBREE_FORCE_REBUILD=false
@@ -2629,7 +2628,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 \
@@ -2789,17 +2788,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!
@@ -3451,16 +3439,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
@@ -3908,18 +3886,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
@@ -4558,33 +4524,18 @@ 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
--- a/build_files/buildbot/config/blender_linux.cmake
+++ b/build_files/buildbot/config/blender_linux.cmake
@@ -2,22 +2,33 @@
 include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_release.cmake")
-# For libc-2.24 we are using chroot which runs on a 64bit system.
+# Detect which libc we'll be linking against.
-# There we can not use CPU bitness check since it is always 64bit. So instead
+# Some of the paths will depend on this
-# we check for a specific libraries.
+
 #
 # Other builders we are runnign in a bare virtual machine, and the libraries
 # are installed to /opt/.
 # We assume that only 64bit builders exists in such configuration.
 if(EXISTS "/lib/x86_64-linux-gnu/libc-2.24.so")
-  message(STATUS "Building in GLibc-2.24 environment")
+	message(STATUS "Building in GLibc-2.24 environment")
-  set(LIBDIR_NAME "linux_x86_64")
+	set(GLIBC "2.24")
 	set(MULTILIB "/x86_64-linux-gnu")
 	set(LIBDIR_NAME "linux_x86_64")
 elseif(EXISTS "/lib/i386-linux-gnu//libc-2.24.so")
-  message(STATUS "Building in GLibc-2.24 environment")
+	message(STATUS "Building in GLibc-2.24 environment")
-  set(LIBDIR_NAME "linux_i686")
+	set(GLIBC "2.24")
 	set(MULTILIB "/i386-linux-gnu")
 	set(LIBDIR_NAME "linux_i686")
 elseif(EXISTS "/lib/x86_64-linux-gnu/libc-2.19.so")
 	message(STATUS "Building in GLibc-2.19 environment")
 	set(GLIBC "2.19")
 	set(MULTILIB "/x86_64-linux-gnu")
 elseif(EXISTS "/lib/i386-linux-gnu//libc-2.19.so")
 	message(STATUS "Building in GLibc-2.19 environment")
 	set(GLIBC "2.19")
 	set(MULTILIB "/i386-linux-gnu")
 elseif(EXISTS "/lib/libc-2.11.3.so")
 	message(STATUS "Building in GLibc-2.11 environment")
 	set(GLIBC "2.11")
 	set(MULTILIB "")
 else()
-  message(STATUS "Building in generic 64bit environment")
+	message(FATAL_ERROR "Unknown build environment")
  set(LIBDIR_NAME "linux_x86_64")
 endif()
 # Default to only build Blender
@@ -40,8 +51,122 @@ set(WITH_PYTHON_INSTALL_REQUESTS ON CACHE BOOL "" FORCE)
 # ######## Release environment specific settings ########
 if (NOT ${GLIBC} STREQUAL "2.24")
 # All the hardcoded library paths and such
 # LLVM libraries
 set(LLVM_VERSION             "3.4"  CACHE STRING "" FORCE)
 set(LLVM_ROOT_DIR            "/opt/lib/llvm-${LLVM_VERSION}"  CACHE STRING "" FORCE)
 set(LLVM_STATIC              ON  CACHE BOOL "" FORCE)
 # BOOST libraries
 set(BOOST_ROOT               "/opt/lib/boost" CACHE STRING "" FORCE)
 set(Boost_USE_STATIC_LIBS    ON CACHE BOOL "" FORCE)
 # FFmpeg libraries
 set(FFMPEG                   "/opt/lib/ffmpeg" CACHE STRING "" FORCE)
 set(FFMPEG_LIBRARIES
 	avdevice avformat avcodec avutil avfilter swscale swresample
 	/usr/lib${MULTILIB}/libxvidcore.a
 	/usr/lib${MULTILIB}/libx264.a
 	/usr/lib${MULTILIB}/libmp3lame.a
 	/usr/lib${MULTILIB}/libvpx.a
 	/usr/lib${MULTILIB}/libvorbis.a
 	/usr/lib${MULTILIB}/libogg.a
 	/usr/lib${MULTILIB}/libvorbisenc.a
 	/usr/lib${MULTILIB}/libtheora.a
 	/usr/lib${MULTILIB}/libschroedinger-1.0.a
 	/usr/lib${MULTILIB}/liborc-0.4.a
 	CACHE STRING "" FORCE
 )
 # SndFile libraries
 set(SNDFILE_LIBRARY          "/usr/lib${MULTILIB}/libsndfile.a;/usr/lib${MULTILIB}/libFLAC.a" CACHE STRING "" FORCE)
 # OpenAL libraries
 set(OPENAL_ROOT_DIR           "/opt/lib/openal" CACHE STRING "" FORCE)
 set(OPENAL_INCLUDE_DIR        "${OPENAL_ROOT_DIR}/include/AL" CACHE STRING "" FORCE)
 set(OPENAL_LIBRARY
 	${OPENAL_ROOT_DIR}/lib/libopenal.a
 	${OPENAL_ROOT_DIR}/lib/libcommon.a
 	CACHE STRING "" FORCE
 )
 # OpenCollada libraries
 set(OPENCOLLADA_UTF_LIBRARY   ""                              CACHE STRING "" FORCE)
 set(PCRE_INCLUDE_DIR          "/usr/include"                  CACHE STRING "" FORCE)
 set(PCRE_LIBRARY              "/usr/lib${MULTILIB}/libpcre.a" CACHE STRING "" FORCE)
 set(XML2_INCLUDE_DIR          "/usr/include"                  CACHE STRING "" FORCE)
 set(XML2_LIBRARY              "/usr/lib${MULTILIB}/libxml2.a" CACHE STRING "" FORCE)
 # OpenColorIO libraries
 set(OPENCOLORIO_ROOT_DIR      "/opt/lib/ocio" CACHE STRING "" FORCE)
 set(OPENCOLORIO_OPENCOLORIO_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libOpenColorIO.a" CACHE STRING "" FORCE)
 set(OPENCOLORIO_TINYXML_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libtinyxml.a"         CACHE STRING "" FORCE)
 set(OPENCOLORIO_YAML-CPP_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libyaml-cpp.a"       CACHE STRING "" FORCE)
 # Freetype
 set(FREETYPE_INCLUDE_DIRS "/usr/include/freetype2"       CACHE STRING "" FORCE)
 set(FREETYPE_LIBRARY "/usr/lib${MULTILIB}/libfreetype.a" CACHE STRING "" FORCE)
 # OpenImageIO
 if(GLIBC EQUAL "2.19")
 	set(OPENIMAGEIO_LIBRARY
 		/opt/lib/oiio/lib/libOpenImageIO.a
 		/opt/lib/oiio/lib/libOpenImageIO_Util.a
 		/usr/lib${MULTILIB}/libwebp.a
 		/usr/lib${MULTILIB}/liblzma.a
 		/usr/lib${MULTILIB}/libjbig.a
 		${FREETYPE_LIBRARY}
 		CACHE STRING "" FORCE
 	)
 endif()
 # OpenSubdiv libraries
 set(OPENSUBDIV_ROOT_DIR "/opt/lib/opensubdiv" CACHE STRING "" FORCE)
 set(OPENSUBDIV_OSDCPU_LIBRARY "${OPENSUBDIV_ROOT_DIR}/lib/libosdCPU.a" CACHE STRING "" FORCE)
 set(OPENSUBDIV_OSDGPU_LIBRARY "${OPENSUBDIV_ROOT_DIR}/lib/libosdGPU.a" CACHE STRING "" FORCE)
 # OpenEXR libraries
 set(OPENEXR_ROOT_DIR          "/opt/lib/openexr"                    CACHE STRING "" FORCE)
 set(OPENEXR_HALF_LIBRARY      "/opt/lib/openexr/lib/libHalf.a"      CACHE STRING "" FORCE)
 set(OPENEXR_IEX_LIBRARY       "/opt/lib/openexr/lib/libIex.a"       CACHE STRING "" FORCE)
 set(OPENEXR_ILMIMF_LIBRARY    "/opt/lib/openexr/lib/libIlmImf.a"    CACHE STRING "" FORCE)
 set(OPENEXR_ILMTHREAD_LIBRARY "/opt/lib/openexr/lib/libIlmThread.a" CACHE STRING "" FORCE)
 set(OPENEXR_IMATH_LIBRARY     "/opt/lib/openexr/lib/libImath.a"     CACHE STRING "" FORCE)
 # JeMalloc library
 set(JEMALLOC_LIBRARY    "/opt/lib/jemalloc/lib/libjemalloc.a" CACHE STRING "" FORCE)
 # Space navigation
 set(SPACENAV_ROOT_DIR       "/opt/lib/libspnav" CACHE STRING "" FORCE)
 # Force some system libraries to be static
 set(FFTW3_LIBRARY       "/usr/lib${MULTILIB}/libfftw3.a" CACHE STRING "" FORCE)
 set(JPEG_LIBRARY        "/usr/lib${MULTILIB}/libjpeg.a"  CACHE STRING "" FORCE)
 set(PNG_LIBRARY         "/usr/lib${MULTILIB}/libpng.a"   CACHE STRING "" FORCE)
 set(TIFF_LIBRARY        "/usr/lib${MULTILIB}/libtiff.a"  CACHE STRING "" FORCE)
 set(ZLIB_LIBRARY        "/usr/lib${MULTILIB}/libz.a"     CACHE STRING "" FORCE)
 # OpenVDB
 set(OPENVDB_LIBRARY
 	/opt/lib/openvdb/lib/libopenvdb.a
 	CACHE BOOL "" FORCE
 )
 set(BLOSC_LIBRARY
 	/opt/lib/blosc/lib/libblosc.a
 	CACHE BOOL "" FORCE
 )
 else()
 set(LIBDIR "/opt/blender-deps/${LIBDIR_NAME}" CACHE BOOL "" FORCE)
 # TODO(sergey): Remove once Python is oficially bumped to 3.7.
 set(PYTHON_VERSION    3.7 CACHE BOOL "" FORCE)
 # Platform specific configuration, to ensure static linking against everything.
 set(Boost_USE_STATIC_LIBS    ON CACHE BOOL "" FORCE)
@@ -52,5 +177,7 @@ set(Boost_USE_STATIC_LIBS    ON CACHE BOOL "" FORCE)
 set(PCRE_INCLUDE_DIR          "/usr/include"                        CACHE STRING "" FORCE)
 set(PCRE_LIBRARY              "${LIBDIR}/opencollada/lib/libpcre.a" CACHE STRING "" FORCE)
 endif()
 # Additional linking libraries
 set(CMAKE_EXE_LINKER_FLAGS   "-lrt -static-libstdc++ -no-pie"  CACHE STRING "" FORCE)
--- a/build_files/buildbot/slave_compile.py
+++ b/build_files/buildbot/slave_compile.py
@@ -52,58 +52,102 @@ if 'cmake' in builder:
    build_dir = os.path.abspath(os.path.join('..', 'build', builder))
    install_dir = os.path.abspath(os.path.join('..', 'install', builder))
    targets = ['blender']
    command_prefix = []
    chroot_name = None  # If not None command will be delegated to that chroot
    cuda_chroot_name = None  # If not None cuda compilationcommand will be delegated to that chroot
    build_cubins = True  # Whether to build Cycles CUDA kernels
    bits = 64
    # Config file to be used (relative to blender's sources root)
    cmake_config_file = "build_files/cmake/config/blender_release.cmake"
    cmake_cuda_config_file = None
    # Set build options.
    cmake_options = []
    cmake_extra_options = ['-DCMAKE_BUILD_TYPE:STRING=Release']
    cuda_cmake_options = []
    if builder.startswith('mac'):
        # Set up OSX architecture
        if builder.endswith('x86_64_10_9_cmake'):
            cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64')
        cmake_extra_options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.9')
        # Used to trick CUDFA to see CLang as an older version.
        # cmake_extra_options.append('-DCUDA_HOST_COMPILER=/usr/local/cuda-hack/clang')
        # cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/nvcc')
    elif builder.startswith('win'):
-        if builder.startswith('win64'):
+        if builder.endswith('_vs2017'):
-            cmake_options.extend(['-G', 'Visual Studio 15 2017 Win64'])
+            if builder.startswith('win64'):
-        elif builder.startswith('win32'):
+                cmake_options.extend(['-G', 'Visual Studio 15 2017 Win64'])
-            bits = 32
+            elif builder.startswith('win32'):
-            cmake_options.extend(['-G', 'Visual Studio 15 2017'])
+                bits = 32
                cmake_options.extend(['-G', 'Visual Studio 15 2017'])
        elif builder.endswith('_vc2015'):
            if builder.startswith('win64'):
                cmake_options.extend(['-G', 'Visual Studio 14 2015 Win64'])
            elif builder.startswith('win32'):
                bits = 32
                cmake_options.extend(['-G', 'Visual Studio 14 2015'])
            cmake_extra_options.append('-DCUDA_NVCC_FLAGS=--cl-version;2013;' +
                '--compiler-bindir;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\bin')
        else:
            if builder.startswith('win64'):
                cmake_options.extend(['-G', 'Visual Studio 12 2013 Win64'])
            elif builder.startswith('win32'):
                bits = 32
                cmake_options.extend(['-G', 'Visual Studio 12 2013'])
    elif builder.startswith('linux'):
        cmake_config_file = "build_files/buildbot/config/blender_linux.cmake"
        tokens = builder.split("_")
        glibc = tokens[1]
        if glibc == 'glibc224':
            deb_name = "stretch"
-            if builder.endswith('x86_64_cmake'):
+        elif glibc == 'glibc219':
-                chroot_name = 'buildbot_' + deb_name + '_x86_64'
+            deb_name = "jessie"
-            elif builder.endswith('i686_cmake'):
+        elif glibc == 'glibc211':
-                bits = 32
+            deb_name = "squeeze"
-                chroot_name = 'buildbot_' + deb_name + '_i686'
+        cmake_config_file = "build_files/buildbot/config/blender_linux.cmake"
-            command_prefix = ['schroot', '-c', chroot_name, '--']
+        if builder.endswith('x86_64_cmake'):
-        elif glibc == 'glibc217':
+            chroot_name = 'buildbot_' + deb_name + '_x86_64'
-            command_prefix = ['scl', 'enable', 'devtoolset-6', '--']
+            targets = ['blender']
        elif builder.endswith('i686_cmake'):
            bits = 32
            chroot_name = 'buildbot_' + deb_name + '_i686'
            targets = ['blender']
        if deb_name != "stretch":
            cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-7",
                                        "-DCMAKE_CXX_COMPILER=/usr/bin/g++-7"])
    cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file))
    # Prepare CMake options needed to configure cuda binaries compilation, 64bit only.
    if bits == 64:
-        cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=ON")
+        cuda_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=%s" % ('ON' if build_cubins else 'OFF'))
-        cmake_options.append("-DCUDA_64_BIT_DEVICE_CODE=ON")
+        cuda_cmake_options.append("-DCYCLES_CUDA_BINARIES_ARCH=sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70")
        if build_cubins or 'cuda' in targets:
            cuda_cmake_options.append("-DCUDA_64_BIT_DEVICE_CODE=ON")
        # Only modify common cmake options if cuda doesn't require separate target.
        if 'cuda' not in targets:
            cmake_options += cuda_cmake_options
    else:
-        cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=OFF")
+        cuda_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=OFF")
    cmake_options.append("-DCMAKE_INSTALL_PREFIX=%s" % (install_dir))
    cmake_options += cmake_extra_options
    # Prepare chroot command prefix if needed
    if chroot_name:
        chroot_prefix = ['schroot', '-c', chroot_name, '--']
    else:
        chroot_prefix = []
    if cuda_chroot_name:
        cuda_chroot_prefix = ['schroot', '-c', cuda_chroot_name, '--']
    else:
        cuda_chroot_prefix = chroot_prefix[:]
    # Make sure no garbage remained from the previous run
    if os.path.isdir(install_dir):
        shutil.rmtree(install_dir)
@@ -112,19 +156,27 @@ if 'cmake' in builder:
        print("Building target %s" % (target))
        # Construct build directory name based on the target
        target_build_dir = build_dir
-        target_command_prefix = command_prefix[:]
+        target_chroot_prefix = chroot_prefix[:]
        if target != 'blender':
            target_build_dir += '_' + target
        target_name = 'install'
        # Tweaking CMake options to respect the target
        target_cmake_options = cmake_options[:]
        if target == 'cuda':
            target_cmake_options += cuda_cmake_options
            target_chroot_prefix = cuda_chroot_prefix[:]
            target_name = 'cycles_kernel_cuda'
        # If cuda binaries are compiled as a separate target, make sure
        # other targets don't compile cuda binaries.
        if 'cuda' in targets and target != 'cuda':
            target_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=OFF")
        # Do extra git fetch because not all platform/git/buildbot combinations
        # update the origin remote, causing buildinfo to detect local changes.
        os.chdir(blender_dir)
        print("Fetching remotes")
        command = ['git', 'fetch', '--all']
        print(command)
-        retcode = subprocess.call(target_command_prefix + command)
+        retcode = subprocess.call(target_chroot_prefix + command)
        if retcode != 0:
            sys.exit(retcode)
        # Make sure build directory exists and enter it
@@ -137,13 +189,7 @@ if 'cmake' in builder:
        if os.path.exists('CMakeCache.txt'):
            print("Removing CMake cache")
            os.remove('CMakeCache.txt')
-        # Remove buildinfo files to force buildbot to re-generate them.
+        retcode = subprocess.call(target_chroot_prefix + ['cmake', blender_dir] + target_cmake_options)
        for buildinfo in ('buildinfo.h', 'buildinfo.h.txt', ):
            full_path = os.path.join('source', 'creator', buildinfo)
            if os.path.exists(full_path):
                print("Removing {}" . format(buildinfo))
                os.remove(full_path)
        retcode = subprocess.call(target_command_prefix + ['cmake', blender_dir] + target_cmake_options)
        if retcode != 0:
            print('Configuration FAILED!')
            sys.exit(retcode)
@@ -155,11 +201,21 @@ if 'cmake' in builder:
        print("Executing command:")
        print(command)
-        retcode = subprocess.call(target_command_prefix + command)
+        retcode = subprocess.call(target_chroot_prefix + command)
        if retcode != 0:
            sys.exit(retcode)
        if builder.startswith('linux') and target == 'cuda':
            blender_h = os.path.join(blender_dir, "source", "blender", "blenkernel", "BKE_blender_version.h")
            blender_version = int(parse_header_file(blender_h, 'BLENDER_VERSION'))
            blender_version = "%d.%d" % (blender_version // 100, blender_version % 100)
            kernels = os.path.join(target_build_dir, 'intern', 'cycles', 'kernel')
            install_kernels = os.path.join(install_dir, blender_version, 'scripts', 'addons', 'cycles', 'lib')
            os.mkdir(install_kernels)
            print("Copying cuda binaries from %s to %s" % (kernels, install_kernels))
            os.system('cp %s/*.cubin %s' % (kernels, install_kernels))
 else:
    print("Unknown building system")
    sys.exit(1)
--- a/build_files/buildbot/slave_pack.py
+++ b/build_files/buildbot/slave_pack.py
@@ -107,8 +107,8 @@ if builder.find('cmake') != -1:
        if builder.endswith('vc2015'):
            platform += "-vc14"
        builderified_name = 'blender-{}-{}-{}'.format(blender_full_version, git_hash, platform)
-        # NOTE: Blender 2.7 is already respected by blender_full_version.
+        # NOTE: Blender 2.8 is already respected by blender_full_version.
-        if branch != '' and branch != 'blender2.7':
+        if branch != '' and branch != 'blender2.8':
            builderified_name = branch + "-" + builderified_name
        os.rename(result_file, "{}.zip".format(builderified_name))
@@ -135,28 +135,24 @@ if builder.find('cmake') != -1:
        blender_version = "%d.%d" % (blender_version // 100, blender_version % 100)
        blender_hash = parse_header_file(buildinfo_h, 'BUILD_HASH')[1:-1]
        blender_glibc = builder.split('_')[1]
        command_prefix = []
        bits = 64
        blender_arch = 'x86_64'
-        if blender_glibc == 'glibc224':
+        if builder.endswith('x86_64_cmake'):
-            if builder.endswith('x86_64_cmake'):
+            chroot_name = 'buildbot_jessie_x86_64'
-                chroot_name = 'buildbot_stretch_x86_64'
+            bits = 64
-            elif builder.endswith('i686_cmake'):
+            blender_arch = 'x86_64'
-                chroot_name = 'buildbot_stretch_i686'
+        elif builder.endswith('i686_cmake'):
-                bits = 32
+            chroot_name = 'buildbot_jessie_i686'
-                blender_arch = 'i686'
+            bits = 32
-            command_prefix = ['schroot', '-c', chroot_name, '--']
+            blender_arch = 'i686'
        elif blender_glibc == 'glibc217':
            command_prefix = ['scl', 'enable', 'devtoolset-6', '--']
        # Strip all unused symbols from the binaries
        print("Stripping binaries...")
-        subprocess.call(command_prefix + ['strip', '--strip-all', blender])
+        chroot_prefix = ['schroot', '-c', chroot_name, '--']
        subprocess.call(chroot_prefix + ['strip', '--strip-all', blender])
        print("Stripping python...")
        py_target = os.path.join(install_dir, blender_version)
-        subprocess.call(command_prefix + ['find', py_target, '-iname', '*.so', '-exec', 'strip', '-s', '{}', ';'])
+        subprocess.call(chroot_prefix + ['find', py_target, '-iname', '*.so', '-exec', 'strip', '-s', '{}', ';'])
        # Copy all specific files which are too specific to be copied by
        # the CMake rules themselves
@@ -177,8 +173,8 @@ if builder.find('cmake') != -1:
                                                      blender_hash,
                                                      blender_glibc,
                                                      blender_arch)
-        # NOTE: Blender 2.7 is already respected by blender_full_version.
+        # NOTE: Blender 2.8 is already respected by blender_full_version.
-        if branch != '' and branch != 'blender2.7':
+        if branch != '' and branch != 'blender2.8':
            package_name = branch + "-" + package_name
        upload_filename = package_name + ".tar.bz2"
--- a/build_files/cmake/Modules/FindEmbree.cmake
+++ b/build_files/cmake/Modules/FindEmbree.cmake
@@ -47,10 +47,10 @@ FIND_PATH(EMBREE_INCLUDE_DIR
 SET(_embree_FIND_COMPONENTS
  embree3
  embree_avx
  embree_avx2
  embree_sse42
  embree3
  lexers
  math
  simd
--- a/build_files/cmake/Modules/FindGLEW.cmake
+++ b/build_files/cmake/Modules/FindGLEW.cmake
@@ -23,7 +23,7 @@
 # If GLEW_ROOT_DIR was defined in the environment, use it.
 IF(NOT GLEW_ROOT_DIR AND NOT $ENV{GLEW_ROOT_DIR} STREQUAL "")
-  SET(GLEW_ROOT_DIR $ENV{GLEW_ROOT_DIR})
+	SET(GLEW_ROOT_DIR $ENV{GLEW_ROOT_DIR})
 ENDIF()
 SET(_glew_SEARCH_DIRS
--- a/build_files/cmake/Modules/FindLLVM.cmake
+++ b/build_files/cmake/Modules/FindLLVM.cmake
@@ -22,65 +22,65 @@
 #=============================================================================
 if(LLVM_ROOT_DIR)
-  if(DEFINED LLVM_VERSION)
+	if(DEFINED LLVM_VERSION)
-    find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS ${LLVM_ROOT_DIR}/bin NO_CMAKE_PATH)
+		find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS ${LLVM_ROOT_DIR}/bin NO_CMAKE_PATH)
-  endif()
+	endif()
-  if(NOT LLVM_CONFIG)
+	if(NOT LLVM_CONFIG)
-    find_program(LLVM_CONFIG llvm-config HINTS ${LLVM_ROOT_DIR}/bin NO_CMAKE_PATH)
+		find_program(LLVM_CONFIG llvm-config HINTS ${LLVM_ROOT_DIR}/bin NO_CMAKE_PATH)
-  endif()
+	endif()
 else()
-  if(DEFINED LLVM_VERSION)
+	if(DEFINED LLVM_VERSION)
        message(running llvm-config-${LLVM_VERSION})
-    find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION})
+		find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION})
-  endif()
+	endif()
-  if(NOT LLVM_CONFIG)
+	if(NOT LLVM_CONFIG)
-    find_program(LLVM_CONFIG llvm-config)
+		find_program(LLVM_CONFIG llvm-config)
-  endif()
+	endif()
 endif()
 if(NOT DEFINED LLVM_VERSION)
-  execute_process(COMMAND ${LLVM_CONFIG} --version
+	execute_process(COMMAND ${LLVM_CONFIG} --version
-          OUTPUT_VARIABLE LLVM_VERSION
+					OUTPUT_VARIABLE LLVM_VERSION
-          OUTPUT_STRIP_TRAILING_WHITESPACE)
+					OUTPUT_STRIP_TRAILING_WHITESPACE)
-  set(LLVM_VERSION ${LLVM_VERSION} CACHE STRING "Version of LLVM to use")
+	set(LLVM_VERSION ${LLVM_VERSION} CACHE STRING "Version of LLVM to use")
 endif()
 if(NOT LLVM_ROOT_DIR)
-  execute_process(COMMAND ${LLVM_CONFIG} --prefix
+	execute_process(COMMAND ${LLVM_CONFIG} --prefix
-          OUTPUT_VARIABLE LLVM_ROOT_DIR
+					OUTPUT_VARIABLE LLVM_ROOT_DIR
-          OUTPUT_STRIP_TRAILING_WHITESPACE)
+					OUTPUT_STRIP_TRAILING_WHITESPACE)
-  set(LLVM_ROOT_DIR ${LLVM_ROOT_DIR} CACHE PATH "Path to the LLVM installation")
+	set(LLVM_ROOT_DIR ${LLVM_ROOT_DIR} CACHE PATH "Path to the LLVM installation")
 endif()
 if(NOT LLVM_LIBPATH)
-  execute_process(COMMAND ${LLVM_CONFIG} --libdir
+	execute_process(COMMAND ${LLVM_CONFIG} --libdir
-          OUTPUT_VARIABLE LLVM_LIBPATH
+					OUTPUT_VARIABLE LLVM_LIBPATH
-          OUTPUT_STRIP_TRAILING_WHITESPACE)
+					OUTPUT_STRIP_TRAILING_WHITESPACE)
-  set(LLVM_LIBPATH ${LLVM_LIBPATH} CACHE PATH "Path to the LLVM library path")
+	set(LLVM_LIBPATH ${LLVM_LIBPATH} CACHE PATH "Path to the LLVM library path")
-  mark_as_advanced(LLVM_LIBPATH)
+	mark_as_advanced(LLVM_LIBPATH)
 endif()
 if(LLVM_STATIC)
-  find_library(LLVM_LIBRARY
+	find_library(LLVM_LIBRARY
-               NAMES LLVMAnalysis # first of a whole bunch of libs to get
+	             NAMES LLVMAnalysis # first of a whole bunch of libs to get
-               PATHS ${LLVM_LIBPATH})
+	             PATHS ${LLVM_LIBPATH})
 else()
-  find_library(LLVM_LIBRARY
+	find_library(LLVM_LIBRARY
-               NAMES
+	             NAMES
-                 LLVM-${LLVM_VERSION}
+	               LLVM-${LLVM_VERSION}
-                 LLVMAnalysis  # check for the static library as a fall-back
+	               LLVMAnalysis  # check for the static library as a fall-back
-               PATHS ${LLVM_LIBPATH})
+	             PATHS ${LLVM_LIBPATH})
 endif()
 if(LLVM_LIBRARY AND LLVM_ROOT_DIR AND LLVM_LIBPATH)
-  if(LLVM_STATIC)
+	if(LLVM_STATIC)
-    # if static LLVM libraries were requested, use llvm-config to generate
+		# if static LLVM libraries were requested, use llvm-config to generate
-    # the list of what libraries we need, and substitute that in the right
+		# the list of what libraries we need, and substitute that in the right
-    # way for LLVM_LIBRARY.
+		# way for LLVM_LIBRARY.
-    execute_process(COMMAND ${LLVM_CONFIG} --libfiles
+		execute_process(COMMAND ${LLVM_CONFIG} --libfiles
-                    OUTPUT_VARIABLE LLVM_LIBRARY
+		                OUTPUT_VARIABLE LLVM_LIBRARY
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
+		                OUTPUT_STRIP_TRAILING_WHITESPACE)
-    string(REPLACE " " ";" LLVM_LIBRARY "${LLVM_LIBRARY}")
+		string(REPLACE " " ";" LLVM_LIBRARY "${LLVM_LIBRARY}")
-  endif()
+	endif()
 endif()
--- a/build_files/cmake/Modules/FindSndFile.cmake
+++ b/build_files/cmake/Modules/FindSndFile.cmake
@@ -24,11 +24,11 @@
 # If LIBSNDFILE_ROOT_DIR was defined in the environment, use it.
 IF(NOT LIBSNDFILE_ROOT_DIR AND NOT $ENV{LIBSNDFILE_ROOT_DIR} STREQUAL "")
-  SET(LIBSNDFILE_ROOT_DIR $ENV{LIBSNDFILE_ROOT_DIR})
+	SET(LIBSNDFILE_ROOT_DIR $ENV{LIBSNDFILE_ROOT_DIR})
 ENDIF()
 SET(_sndfile_SEARCH_DIRS
-  ${LIBSNDFILE_ROOT_DIR}
+	${LIBSNDFILE_ROOT_DIR}
  /usr/local
  /sw # Fink
  /opt/local # DarwinPorts
@@ -54,14 +54,14 @@ FIND_LIBRARY(LIBSNDFILE_LIBRARY
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(SndFile DEFAULT_MSG
-  LIBSNDFILE_LIBRARY LIBSNDFILE_INCLUDE_DIR)
+	LIBSNDFILE_LIBRARY LIBSNDFILE_INCLUDE_DIR)
 IF(LIBSNDFILE_FOUND)
-  SET(LIBSNDFILE_LIBRARIES ${LIBSNDFILE_LIBRARY})
+	SET(LIBSNDFILE_LIBRARIES ${LIBSNDFILE_LIBRARY})
-  SET(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE_INCLUDE_DIR})
+	SET(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE_INCLUDE_DIR})
 ENDIF(LIBSNDFILE_FOUND)
 MARK_AS_ADVANCED(
-  LIBSNDFILE_INCLUDE_DIR
+	LIBSNDFILE_INCLUDE_DIR
-  LIBSNDFILE_LIBRARY
+	LIBSNDFILE_LIBRARY
 )
--- a/build_files/cmake/Modules/GTestTesting.cmake
+++ b/build_files/cmake/Modules/GTestTesting.cmake
@@ -13,55 +13,55 @@
 #=============================================================================
 macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST)
-  if(WITH_GTESTS)
+	if(WITH_GTESTS)
-    get_property(_current_include_directories
+		get_property(_current_include_directories
-                 DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+		             DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                 PROPERTY INCLUDE_DIRECTORIES)
+		             PROPERTY INCLUDE_DIRECTORIES)
-    set(TEST_INC
+		set(TEST_INC
-      ${_current_include_directories}
+			${_current_include_directories}
-      ${CMAKE_SOURCE_DIR}/tests/gtests
+			${CMAKE_SOURCE_DIR}/tests/gtests
-      ${GLOG_INCLUDE_DIRS}
+			${GLOG_INCLUDE_DIRS}
-      ${GFLAGS_INCLUDE_DIRS}
+			${GFLAGS_INCLUDE_DIRS}
-      ${CMAKE_SOURCE_DIR}/extern/gtest/include
+			${CMAKE_SOURCE_DIR}/extern/gtest/include
-      ${CMAKE_SOURCE_DIR}/extern/gmock/include
+			${CMAKE_SOURCE_DIR}/extern/gmock/include
-    )
+		)
-    unset(_current_include_directories)
+		unset(_current_include_directories)
-    add_executable(${NAME}_test ${SRC})
+		add_executable(${NAME}_test ${SRC})
-    target_link_libraries(${NAME}_test
+		target_link_libraries(${NAME}_test
-                          ${EXTRA_LIBS}
+		                      ${EXTRA_LIBS}
-                          ${PLATFORM_LINKLIBS}
+		                      ${PLATFORM_LINKLIBS}
-                          bf_testing_main
+		                      bf_testing_main
-                          bf_intern_eigen
+		                      bf_intern_eigen
-                          bf_intern_guardedalloc
+		                      bf_intern_guardedalloc
-                          extern_gtest
+		                      extern_gtest
-                          extern_gmock
+		                      extern_gmock
-                          # needed for glog
+		                      # needed for glog
-                          ${PTHREADS_LIBRARIES}
+		                      ${PTHREADS_LIBRARIES}
-                          ${GLOG_LIBRARIES}
+		                      ${GLOG_LIBRARIES}
-                          ${GFLAGS_LIBRARIES})
+		                      ${GFLAGS_LIBRARIES})
-    if(WITH_OPENMP_STATIC)
+		if(WITH_OPENMP_STATIC)
-      target_link_libraries(${NAME}_test ${OpenMP_LIBRARIES})
+			target_link_libraries(${NAME}_test ${OpenMP_LIBRARIES})
-    endif()
+		endif()
-    set_target_properties(${NAME}_test PROPERTIES
+		set_target_properties(${NAME}_test PROPERTIES
-                          RUNTIME_OUTPUT_DIRECTORY         "${TESTS_OUTPUT_DIR}"
+		                      RUNTIME_OUTPUT_DIRECTORY         "${TESTS_OUTPUT_DIR}"
-                          RUNTIME_OUTPUT_DIRECTORY_RELEASE "${TESTS_OUTPUT_DIR}"
+		                      RUNTIME_OUTPUT_DIRECTORY_RELEASE "${TESTS_OUTPUT_DIR}"
-                          RUNTIME_OUTPUT_DIRECTORY_DEBUG   "${TESTS_OUTPUT_DIR}"
+		                      RUNTIME_OUTPUT_DIRECTORY_DEBUG   "${TESTS_OUTPUT_DIR}"
-                          INCLUDE_DIRECTORIES              "${TEST_INC}")
+		                      INCLUDE_DIRECTORIES              "${TEST_INC}")
-    if(${DO_ADD_TEST})
+		if(${DO_ADD_TEST})
-      add_test(NAME ${NAME}_test COMMAND ${TESTS_OUTPUT_DIR}/${NAME}_test WORKING_DIRECTORY $<TARGET_FILE_DIR:blender>)
+			add_test(NAME ${NAME}_test COMMAND ${TESTS_OUTPUT_DIR}/${NAME}_test WORKING_DIRECTORY $<TARGET_FILE_DIR:blender>)
-    endif()
+		endif()
-  endif()
+	endif()
 endmacro()
 macro(BLENDER_SRC_GTEST NAME SRC EXTRA_LIBS)
-  BLENDER_SRC_GTEST_EX("${NAME}" "${SRC}" "${EXTRA_LIBS}" "TRUE")
+	BLENDER_SRC_GTEST_EX("${NAME}" "${SRC}" "${EXTRA_LIBS}" "TRUE")
 endmacro()
 macro(BLENDER_TEST NAME EXTRA_LIBS)
-  BLENDER_SRC_GTEST_EX("${NAME}" "${NAME}_test.cc" "${EXTRA_LIBS}" "TRUE")
+	BLENDER_SRC_GTEST_EX("${NAME}" "${NAME}_test.cc" "${EXTRA_LIBS}" "TRUE")
 endmacro()
 macro(BLENDER_TEST_PERFORMANCE NAME EXTRA_LIBS)
-  BLENDER_SRC_GTEST_EX("${NAME}" "${NAME}_test.cc" "${EXTRA_LIBS}" "FALSE")
+	BLENDER_SRC_GTEST_EX("${NAME}" "${NAME}_test.cc" "${EXTRA_LIBS}" "FALSE")
 endmacro()
--- a/build_files/cmake/RpmBuild.cmake
+++ b/build_files/cmake/RpmBuild.cmake
@@ -1,25 +1,26 @@
 #
 # VLMC RPM Finder
 # Authors: Rohit Yadav <rohityadav89@gmail.com>
 #
 if(NOT DEFINED RPMBUILD)
-  find_program(RPMBUILD
+	find_program(RPMBUILD
-    NAMES rpmbuild
+		NAMES rpmbuild
-    PATHS "/usr/bin")
+		PATHS "/usr/bin")
-  mark_as_advanced(RPMBUILD)
+	mark_as_advanced(RPMBUILD)
-  if(RPMBUILD)
+	if(RPMBUILD)
-    message(STATUS "RPM Build Found: ${RPMBUILD}")
+		message(STATUS "RPM Build Found: ${RPMBUILD}")
-  else()
+	else()
-    message(STATUS "RPM Build Not Found (rpmbuild). RPM generation will not be available")
+		message(STATUS "RPM Build Not Found (rpmbuild). RPM generation will not be available")
-  endif()
+	endif()
 endif()
 if(RPMBUILD)
-  set(RPMBUILD_FOUND TRUE)
+	set(RPMBUILD_FOUND TRUE)
 else()
-  set(RPMBUILD_FOUND FALSE)
+	set(RPMBUILD_FOUND FALSE)
 endif()
--- a/build_files/cmake/buildinfo.cmake
+++ b/build_files/cmake/buildinfo.cmake
@@ -14,162 +14,162 @@ set(MY_WC_COMMIT_TIMESTAMP 0)
 # Guess if this is a git working copy and then look up the revision
 if(EXISTS ${SOURCE_DIR}/.git)
-  execute_process(COMMAND git rev-parse --abbrev-ref HEAD
+	execute_process(COMMAND git rev-parse --abbrev-ref HEAD
-                  WORKING_DIRECTORY ${SOURCE_DIR}
+	                WORKING_DIRECTORY ${SOURCE_DIR}
-                  OUTPUT_VARIABLE MY_WC_BRANCH
+	                OUTPUT_VARIABLE MY_WC_BRANCH
-                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+	                OUTPUT_STRIP_TRAILING_WHITESPACE)
-  if(MY_WC_BRANCH STREQUAL "HEAD")
+	if(MY_WC_BRANCH STREQUAL "HEAD")
-    # Detached HEAD, check whether commit hash is reachable
+		# Detached HEAD, check whether commit hash is reachable
-    # in the master branch
+		# in the master branch
-    execute_process(COMMAND git rev-parse --short=12 HEAD
+		execute_process(COMMAND git rev-parse --short HEAD
-                    WORKING_DIRECTORY ${SOURCE_DIR}
+		                WORKING_DIRECTORY ${SOURCE_DIR}
-                    OUTPUT_VARIABLE MY_WC_HASH
+		                OUTPUT_VARIABLE MY_WC_HASH
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
+		                OUTPUT_STRIP_TRAILING_WHITESPACE)
-    execute_process(COMMAND git branch --list master blender-v* --contains ${MY_WC_HASH}
+		execute_process(COMMAND git branch --list master blender-v* --contains ${MY_WC_HASH}
-                    WORKING_DIRECTORY ${SOURCE_DIR}
+		                WORKING_DIRECTORY ${SOURCE_DIR}
-                    OUTPUT_VARIABLE _git_contains_check
+		                OUTPUT_VARIABLE _git_contains_check
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
+		                OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if(NOT _git_contains_check STREQUAL "")
+		if(NOT _git_contains_check STREQUAL "")
-      set(MY_WC_BRANCH "master")
+			set(MY_WC_BRANCH "master")
-    else()
+		else()
-      execute_process(COMMAND git show-ref --tags -d
+			execute_process(COMMAND git show-ref --tags -d
-                      WORKING_DIRECTORY ${SOURCE_DIR}
+			                WORKING_DIRECTORY ${SOURCE_DIR}
-                      OUTPUT_VARIABLE _git_tag_hashes
+			                OUTPUT_VARIABLE _git_tag_hashes
-                      OUTPUT_STRIP_TRAILING_WHITESPACE)
+			                OUTPUT_STRIP_TRAILING_WHITESPACE)
-      execute_process(COMMAND git rev-parse HEAD
+			execute_process(COMMAND git rev-parse HEAD
-                      WORKING_DIRECTORY ${SOURCE_DIR}
+			                WORKING_DIRECTORY ${SOURCE_DIR}
-                      OUTPUT_VARIABLE _git_head_hash
+			                OUTPUT_VARIABLE _git_head_hash
-                      OUTPUT_STRIP_TRAILING_WHITESPACE)
+			                OUTPUT_STRIP_TRAILING_WHITESPACE)
-      if(_git_tag_hashes MATCHES "${_git_head_hash}")
+			if(_git_tag_hashes MATCHES "${_git_head_hash}")
-        set(MY_WC_BRANCH "master")
+				set(MY_WC_BRANCH "master")
-      else()
+			else()
-        execute_process(COMMAND git branch --contains ${MY_WC_HASH}
+				execute_process(COMMAND git branch --contains ${MY_WC_HASH}
-                        WORKING_DIRECTORY ${SOURCE_DIR}
+				                WORKING_DIRECTORY ${SOURCE_DIR}
-                        OUTPUT_VARIABLE _git_contains_branches
+				                OUTPUT_VARIABLE _git_contains_branches
-                        OUTPUT_STRIP_TRAILING_WHITESPACE)
+				                OUTPUT_STRIP_TRAILING_WHITESPACE)
-        string(REGEX REPLACE "^\\*[ \t]+" "" _git_contains_branches "${_git_contains_branches}")
+				string(REGEX REPLACE "^\\*[ \t]+" "" _git_contains_branches "${_git_contains_branches}")
-        string(REGEX REPLACE "[\r\n]+" ";" _git_contains_branches "${_git_contains_branches}")
+				string(REGEX REPLACE "[\r\n]+" ";" _git_contains_branches "${_git_contains_branches}")
-        string(REGEX REPLACE ";[ \t]+" ";" _git_contains_branches "${_git_contains_branches}")
+				string(REGEX REPLACE ";[ \t]+" ";" _git_contains_branches "${_git_contains_branches}")
-        foreach(_branch ${_git_contains_branches})
+				foreach(_branch ${_git_contains_branches})
-          if(NOT "${_branch}" MATCHES "\\(HEAD.*")
+					if(NOT "${_branch}" MATCHES "\\(HEAD.*")
-            set(MY_WC_BRANCH "${_branch}")
+						set(MY_WC_BRANCH "${_branch}")
-            break()
+						break()
-          endif()
+					endif()
-        endforeach()
+				endforeach()
-        unset(_branch)
+				unset(_branch)
-        unset(_git_contains_branches)
+				unset(_git_contains_branches)
-      endif()
+			endif()
-      unset(_git_tag_hashes)
+			unset(_git_tag_hashes)
-      unset(_git_head_hashs)
+			unset(_git_head_hashs)
-    endif()
+		endif()
-    unset(_git_contains_check)
+		unset(_git_contains_check)
-  else()
+	else()
-    execute_process(COMMAND git log HEAD..@{u}
+		execute_process(COMMAND git log HEAD..@{u}
-                    WORKING_DIRECTORY ${SOURCE_DIR}
+		                WORKING_DIRECTORY ${SOURCE_DIR}
-                    OUTPUT_VARIABLE _git_below_check
+		                OUTPUT_VARIABLE _git_below_check
-                    OUTPUT_STRIP_TRAILING_WHITESPACE
+		                OUTPUT_STRIP_TRAILING_WHITESPACE
-                    ERROR_QUIET)
+		                ERROR_QUIET)
-    if(NOT _git_below_check STREQUAL "")
+		if(NOT _git_below_check STREQUAL "")
-      # If there're commits between HEAD and upstream this means
+			# If there're commits between HEAD and upstream this means
-      # that we're reset-ed to older revision. Use it's hash then.
+			# that we're reset-ed to older revision. Use it's hash then.
-      execute_process(COMMAND git rev-parse --short=12 HEAD
+			execute_process(COMMAND git rev-parse --short HEAD
-                      WORKING_DIRECTORY ${SOURCE_DIR}
+			                WORKING_DIRECTORY ${SOURCE_DIR}
-                      OUTPUT_VARIABLE MY_WC_HASH
+			                OUTPUT_VARIABLE MY_WC_HASH
-                      OUTPUT_STRIP_TRAILING_WHITESPACE)
+			                OUTPUT_STRIP_TRAILING_WHITESPACE)
-    else()
+		else()
-      execute_process(COMMAND git rev-parse --short=12 @{u}
+			execute_process(COMMAND git rev-parse --short @{u}
-                      WORKING_DIRECTORY ${SOURCE_DIR}
+			                WORKING_DIRECTORY ${SOURCE_DIR}
-                      OUTPUT_VARIABLE MY_WC_HASH
+			                OUTPUT_VARIABLE MY_WC_HASH
-                      OUTPUT_STRIP_TRAILING_WHITESPACE
+			                OUTPUT_STRIP_TRAILING_WHITESPACE
-                      ERROR_QUIET)
+			                ERROR_QUIET)
-      if(MY_WC_HASH STREQUAL "")
+			if(MY_WC_HASH STREQUAL "")
-        # Local branch, not set to upstream.
+				# Local branch, not set to upstream.
-        # Well, let's use HEAD for now
+				# Well, let's use HEAD for now
-        execute_process(COMMAND git rev-parse --short=12 HEAD
+				execute_process(COMMAND git rev-parse --short HEAD
-                        WORKING_DIRECTORY ${SOURCE_DIR}
+				                WORKING_DIRECTORY ${SOURCE_DIR}
-                        OUTPUT_VARIABLE MY_WC_HASH
+				                OUTPUT_VARIABLE MY_WC_HASH
-                        OUTPUT_STRIP_TRAILING_WHITESPACE)
+				                OUTPUT_STRIP_TRAILING_WHITESPACE)
-      endif()
+			endif()
-    endif()
+		endif()
-    if(MY_WC_BRANCH MATCHES "^blender-v")
+		if(MY_WC_BRANCH MATCHES "^blender-v")
-      set(MY_WC_BRANCH "master")
+			set(MY_WC_BRANCH "master")
-    endif()
+		endif()
-    unset(_git_below_check)
+		unset(_git_below_check)
-  endif()
+	endif()
-  execute_process(COMMAND git log -1 --format=%ct
+	execute_process(COMMAND git log -1 --format=%ct
-                  WORKING_DIRECTORY ${SOURCE_DIR}
+	                WORKING_DIRECTORY ${SOURCE_DIR}
-                  OUTPUT_VARIABLE MY_WC_COMMIT_TIMESTAMP
+	                OUTPUT_VARIABLE MY_WC_COMMIT_TIMESTAMP
-                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+	                OUTPUT_STRIP_TRAILING_WHITESPACE)
-  # May fail in rare cases
+	# May fail in rare cases
-  if(MY_WC_COMMIT_TIMESTAMP STREQUAL "")
+	if(MY_WC_COMMIT_TIMESTAMP STREQUAL "")
-    set(MY_WC_COMMIT_TIMESTAMP 0)
+		set(MY_WC_COMMIT_TIMESTAMP 0)
-  endif()
+	endif()
-  # Update GIT index before getting dirty files
+	# Update GIT index before getting dirty files
-  execute_process(COMMAND git update-index -q --refresh
+	execute_process(COMMAND git update-index -q --refresh
-                  WORKING_DIRECTORY ${SOURCE_DIR}
+	                WORKING_DIRECTORY ${SOURCE_DIR}
-                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+	                OUTPUT_STRIP_TRAILING_WHITESPACE)
-  execute_process(COMMAND git diff-index --name-only HEAD --
+	execute_process(COMMAND git diff-index --name-only HEAD --
-                  WORKING_DIRECTORY ${SOURCE_DIR}
+	                WORKING_DIRECTORY ${SOURCE_DIR}
-                  OUTPUT_VARIABLE _git_changed_files
+	                OUTPUT_VARIABLE _git_changed_files
-                  OUTPUT_STRIP_TRAILING_WHITESPACE)
+	                OUTPUT_STRIP_TRAILING_WHITESPACE)
-  if(NOT _git_changed_files STREQUAL "")
+	if(NOT _git_changed_files STREQUAL "")
-    set(MY_WC_BRANCH "${MY_WC_BRANCH} (modified)")
+		set(MY_WC_BRANCH "${MY_WC_BRANCH} (modified)")
-  else()
+	else()
-    # Unpushed commits are also considered local modifications
+		# Unpushed commits are also considered local modifications
-    execute_process(COMMAND git log @{u}..
+		execute_process(COMMAND git log @{u}..
-                    WORKING_DIRECTORY ${SOURCE_DIR}
+		                WORKING_DIRECTORY ${SOURCE_DIR}
-                    OUTPUT_VARIABLE _git_unpushed_log
+		                OUTPUT_VARIABLE _git_unpushed_log
-                    OUTPUT_STRIP_TRAILING_WHITESPACE
+		                OUTPUT_STRIP_TRAILING_WHITESPACE
-                    ERROR_QUIET)
+		                ERROR_QUIET)
-    if(NOT _git_unpushed_log STREQUAL "")
+		if(NOT _git_unpushed_log STREQUAL "")
-      set(MY_WC_BRANCH "${MY_WC_BRANCH} (modified)")
+			set(MY_WC_BRANCH "${MY_WC_BRANCH} (modified)")
-    endif()
+		endif()
-    unset(_git_unpushed_log)
+		unset(_git_unpushed_log)
-  endif()
+	endif()
-  unset(_git_changed_files)
+	unset(_git_changed_files)
 endif()
 # BUILD_PLATFORM and BUILD_PLATFORM are taken from CMake
 # but BUILD_DATE and BUILD_TIME are platform dependent
 if(UNIX)
-  if(NOT BUILD_DATE)
+	if(NOT BUILD_DATE)
-    execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
+		execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-  endif()
+	endif()
-  if(NOT BUILD_TIME)
+	if(NOT BUILD_TIME)
-    execute_process(COMMAND date "+%H:%M:%S" OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
+		execute_process(COMMAND date "+%H:%M:%S" OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
-  endif()
+	endif()
 elseif(WIN32)
-  if(NOT BUILD_DATE)
+	if(NOT BUILD_DATE)
-    execute_process(COMMAND cmd /c date /t OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
+		execute_process(COMMAND cmd /c date /t OUTPUT_VARIABLE BUILD_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-  endif()
+	endif()
-  if(NOT BUILD_TIME)
+	if(NOT BUILD_TIME)
-    execute_process(COMMAND cmd /c time /t OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
+		execute_process(COMMAND cmd /c time /t OUTPUT_VARIABLE BUILD_TIME OUTPUT_STRIP_TRAILING_WHITESPACE)
-  endif()
+	endif()
 endif()
 # Write a file with the BUILD_HASH define
 file(WRITE buildinfo.h.txt
-  "#define BUILD_HASH \"${MY_WC_HASH}\"\n"
+	"#define BUILD_HASH \"${MY_WC_HASH}\"\n"
-  "#define BUILD_COMMIT_TIMESTAMP ${MY_WC_COMMIT_TIMESTAMP}\n"
+	"#define BUILD_COMMIT_TIMESTAMP ${MY_WC_COMMIT_TIMESTAMP}\n"
-  "#define BUILD_BRANCH \"${MY_WC_BRANCH}\"\n"
+	"#define BUILD_BRANCH \"${MY_WC_BRANCH}\"\n"
-  "#define BUILD_DATE \"${BUILD_DATE}\"\n"
+	"#define BUILD_DATE \"${BUILD_DATE}\"\n"
-  "#define BUILD_TIME \"${BUILD_TIME}\"\n"
+	"#define BUILD_TIME \"${BUILD_TIME}\"\n"
 )
 # cleanup
--- a/build_files/cmake/cmake_consistency_check.py
+++ b/build_files/cmake/cmake_consistency_check.py
@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # Contributor(s): Campbell Barton
 #
 # ***** END GPL LICENSE BLOCK *****
 # <pep8 compliant>
@@ -27,8 +29,7 @@ if not sys.version.startswith("3"):
    sys.exit(1)
 from cmake_consistency_check_config import (
-    IGNORE_SOURCE,
+    IGNORE,
    IGNORE_CMAKE,
    UTF8_CHECK,
    SOURCE_DIR,
    BUILD_DIR,
@@ -155,7 +156,6 @@ def cmake_get_src(f):
                        break
                    # replace dirs
                    l = l.replace("${CMAKE_SOURCE_DIR}", SOURCE_DIR)
                    l = l.replace("${CMAKE_CURRENT_SOURCE_DIR}", cmake_base)
                    l = l.replace("${CMAKE_CURRENT_BINARY_DIR}", cmake_base_bin)
                    l = l.strip('"')
@@ -238,16 +238,8 @@ def cmake_get_src(f):
    filen.close()
-def is_ignore_source(f, ignore_used):
+def is_ignore(f, ignore_used):
-    for index, ig in enumerate(IGNORE_SOURCE):
+    for index, ig in enumerate(IGNORE):
        if ig in f:
            ignore_used[index] = True
            return True
    return False
 def is_ignore_cmake(f, ignore_used):
    for index, ig in enumerate(IGNORE_CMAKE):
        if ig in f:
            ignore_used[index] = True
            return True
@@ -258,12 +250,8 @@ def main():
    print("Scanning:", SOURCE_DIR)
    ignore_used_source = [False] * len(IGNORE_SOURCE)
    ignore_used_cmake = [False] * len(IGNORE_CMAKE)
    for cmake in source_list(SOURCE_DIR, is_cmake):
-        if not is_ignore_cmake(cmake, ignore_used_cmake):
+        cmake_get_src(cmake)
            cmake_get_src(cmake)
    # First do stupid check, do these files exist?
    print("\nChecking for missing references:")
@@ -294,10 +282,12 @@ def main():
    del is_err
    del errs
    ignore_used = [False] * len(IGNORE)
    # now check on files not accounted for.
    print("\nC/C++ Files CMake does not know about...")
    for cf in sorted(source_list(SOURCE_DIR, is_c)):
-        if not is_ignore_source(cf, ignore_used_source):
+        if not is_ignore(cf, ignore_used):
            if cf not in global_c:
                print("missing_c: ", cf)
@@ -314,7 +304,7 @@ def main():
    print("\nC/C++ Headers CMake does not know about...")
    for hf in sorted(source_list(SOURCE_DIR, is_c_header)):
-        if not is_ignore_source(hf, ignore_used_source):
+        if not is_ignore(hf, ignore_used):
            if hf not in global_h:
                print("missing_h: ", hf)
@@ -336,15 +326,9 @@ def main():
                                traceback.print_exc()
    # Check ignores aren't stale
-    print("\nCheck for unused 'IGNORE_SOURCE' paths...")
+    print("\nCheck for unused 'IGNORE' paths...")
-    for index, ig in enumerate(IGNORE_SOURCE):
+    for index, ig in enumerate(IGNORE):
-        if not ignore_used_source[index]:
+        if not ignore_used[index]:
            print("unused ignore: %r" % ig)
    # Check ignores aren't stale
    print("\nCheck for unused 'IGNORE_CMAKE' paths...")
    for index, ig in enumerate(IGNORE_CMAKE):
        if not ignore_used_cmake[index]:
            print("unused ignore: %r" % ig)
--- a/build_files/cmake/cmake_consistency_check_config.py
+++ b/build_files/cmake/cmake_consistency_check_config.py
@@ -1,13 +1,10 @@
 import os
-IGNORE_SOURCE = (
+IGNORE = (
    "/test/",
    "/tests/gtests/",
    "/release/",
    # specific source files
    "extern/audaspace/",
    # specific source files
    "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.cpp",
    "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.cpp",
@@ -20,10 +17,6 @@ IGNORE_SOURCE = (
    "intern/audaspace/SRC/AUD_SRCResampleFactory.cpp",
    "intern/audaspace/SRC/AUD_SRCResampleReader.cpp",
    "doc/doxygen/doxygen.extern.h",
    "doc/doxygen/doxygen.intern.h",
    "doc/doxygen/doxygen.main.h",
    "doc/doxygen/doxygen.source.h",
    "extern/bullet2/src/BulletCollision/CollisionDispatch/btBox2dBox2dCollisionAlgorithm.h",
    "extern/bullet2/src/BulletCollision/CollisionDispatch/btConvex2dConvex2dAlgorithm.h",
    "extern/bullet2/src/BulletCollision/CollisionDispatch/btInternalEdgeUtility.h",
@@ -36,10 +29,6 @@ IGNORE_SOURCE = (
    "intern/audaspace/SRC/AUD_SRCResampleReader.h",
 )
 IGNORE_CMAKE = (
    "extern/audaspace/CMakeLists.txt",
 )
 UTF8_CHECK = True
 SOURCE_DIR = os.path.normpath(os.path.abspath(os.path.normpath(os.path.join(os.path.dirname(__file__), "..", ".."))))
--- a/build_files/cmake/cmake_netbeans_project.py
+++ b/build_files/cmake/cmake_netbeans_project.py
@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # Contributor(s): Campbell Barton, M.G. Kishalmi
 #
 # ***** END GPL LICENSE BLOCK *****
 # <pep8 compliant>
--- a/build_files/cmake/cmake_qtcreator_project.py
+++ b/build_files/cmake/cmake_qtcreator_project.py
@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # Contributor(s): Campbell Barton, M.G. Kishalmi
 #
 # ***** END GPL LICENSE BLOCK *****
 # <pep8 compliant>
--- a/build_files/cmake/cmake_static_check_clang_array.py
+++ b/build_files/cmake/cmake_static_check_clang_array.py
@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # Contributor(s): Campbell Barton
 #
 # ***** END GPL LICENSE BLOCK *****
 # <pep8 compliant>
--- a/build_files/cmake/cmake_static_check_cppcheck.py
+++ b/build_files/cmake/cmake_static_check_cppcheck.py
@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # Contributor(s): Campbell Barton
 #
 # ***** END GPL LICENSE BLOCK *****
 # <pep8 compliant>
--- a/build_files/cmake/cmake_static_check_smatch.py
+++ b/build_files/cmake/cmake_static_check_smatch.py
@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # Contributor(s): Campbell Barton
 #
 # ***** END GPL LICENSE BLOCK *****
 # <pep8 compliant>
--- a/build_files/cmake/cmake_static_check_sparse.py
+++ b/build_files/cmake/cmake_static_check_sparse.py
@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # Contributor(s): Campbell Barton
 #
 # ***** END GPL LICENSE BLOCK *****
 # <pep8 compliant>
--- a/build_files/cmake/cmake_static_check_splint.py
+++ b/build_files/cmake/cmake_static_check_splint.py
@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # Contributor(s): Campbell Barton
 #
 # ***** END GPL LICENSE BLOCK *****
 # <pep8 compliant>
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@ -12,7 +12,7 @@ set(WITH_CODEC_FFMPEG        ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_SNDFILE       ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES              ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_OSL          ON  CACHE BOOL "" FORCE)
-set(WITH_DRACO               ON  CACHE BOOL "" FORCE)
+set(WITH_CYCLES_OPENSUBDIV   ON  CACHE BOOL "" FORCE)
 set(WITH_FFTW3               ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV               ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)
@@ -41,7 +41,6 @@ set(WITH_OPENAL              ON  CACHE BOOL "" FORCE)
 set(WITH_OPENCOLLADA         ON  CACHE BOOL "" FORCE)
 set(WITH_OPENCOLORIO         ON  CACHE BOOL "" FORCE)
 set(WITH_OPENMP              ON  CACHE BOOL "" FORCE)
 set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
 set(WITH_OPENVDB             ON  CACHE BOOL "" FORCE)
 set(WITH_OPENVDB_BLOSC       ON  CACHE BOOL "" FORCE)
 set(WITH_PYTHON_INSTALL      ON  CACHE BOOL "" FORCE)
@@ -55,12 +54,15 @@ set(WITH_MEM_JEMALLOC        ON  CACHE BOOL "" FORCE)
 # platform dependent options
 if(UNIX AND NOT APPLE)
-  set(WITH_JACK                ON  CACHE BOOL "" FORCE)
+	set(WITH_JACK                ON  CACHE BOOL "" FORCE)
-  set(WITH_DOC_MANPAGE         ON  CACHE BOOL "" FORCE)
+	set(WITH_DOC_MANPAGE         ON  CACHE BOOL "" FORCE)
 	set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
 elseif(WIN32)
-  set(WITH_JACK                OFF CACHE BOOL "" FORCE)
+	set(WITH_JACK                OFF CACHE BOOL "" FORCE)
 	set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
 elseif(APPLE)
-  set(WITH_JACK                ON  CACHE BOOL "" FORCE)
+	set(WITH_JACK                ON  CACHE BOOL "" FORCE)
 	set(WITH_OPENSUBDIV          OFF CACHE BOOL "" FORCE)
-#   include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
+#	include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
 endif()
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@ -17,7 +17,7 @@ set(WITH_CODEC_FFMPEG        OFF CACHE BOOL "" FORCE)
 set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
 set(WITH_CYCLES              OFF CACHE BOOL "" FORCE)
 set(WITH_CYCLES_OSL          OFF CACHE BOOL "" FORCE)
-set(WITH_DRACO               OFF CACHE BOOL "" FORCE)
+set(WITH_CYCLES_OPENSUBDIV   OFF CACHE BOOL "" FORCE)
 set(WITH_FFTW3               OFF CACHE BOOL "" FORCE)
 set(WITH_LIBMV               OFF CACHE BOOL "" FORCE)
 set(WITH_LLVM                OFF CACHE BOOL "" FORCE)
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@ -13,7 +13,7 @@ set(WITH_CODEC_FFMPEG        ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_SNDFILE       ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES              ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_OSL          ON  CACHE BOOL "" FORCE)
-set(WITH_DRACO               ON  CACHE BOOL "" FORCE)
+set(WITH_CYCLES_OPENSUBDIV   ON  CACHE BOOL "" FORCE)
 set(WITH_FFTW3               ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV               ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)
@@ -42,7 +42,6 @@ set(WITH_OPENAL              ON  CACHE BOOL "" FORCE)
 set(WITH_OPENCOLLADA         ON  CACHE BOOL "" FORCE)
 set(WITH_OPENCOLORIO         ON  CACHE BOOL "" FORCE)
 set(WITH_OPENMP              ON  CACHE BOOL "" FORCE)
 set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
 set(WITH_OPENVDB             ON  CACHE BOOL "" FORCE)
 set(WITH_OPENVDB_BLOSC       ON  CACHE BOOL "" FORCE)
 set(WITH_PYTHON_INSTALL      ON  CACHE BOOL "" FORCE)
@@ -51,19 +50,21 @@ set(WITH_SDL                 ON  CACHE BOOL "" FORCE)
 set(WITH_X11_XINPUT          ON  CACHE BOOL "" FORCE)
 set(WITH_X11_XF86VMODE       ON  CACHE BOOL "" FORCE)
-set(WITH_MEM_JEMALLOC          ON  CACHE BOOL "" FORCE)
+set(WITH_MEM_JEMALLOC        ON  CACHE BOOL "" FORCE)
-set(WITH_CYCLES_CUDA_BINARIES  ON  CACHE BOOL "" FORCE)
+set(WITH_CYCLES_CUDA_BINARIES ON  CACHE BOOL "" FORCE)
-set(WITH_CYCLES_CUBIN_COMPILER OFF CACHE BOOL "" FORCE)
+set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61 CACHE STRING "" FORCE)
 set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75 CACHE STRING "" FORCE)
 # platform dependent options
 if(UNIX AND NOT APPLE)
-  set(WITH_JACK                ON  CACHE BOOL "" FORCE)
+	set(WITH_JACK                ON  CACHE BOOL "" FORCE)
-  set(WITH_DOC_MANPAGE         ON  CACHE BOOL "" FORCE)
+	set(WITH_DOC_MANPAGE         ON  CACHE BOOL "" FORCE)
 	set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
 elseif(WIN32)
-  set(WITH_JACK                OFF CACHE BOOL "" FORCE)
+	set(WITH_JACK                OFF CACHE BOOL "" FORCE)
 	set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
 elseif(APPLE)
-  set(WITH_JACK                ON  CACHE BOOL "" FORCE)
+	set(WITH_JACK                ON  CACHE BOOL "" FORCE)
 	set(WITH_OPENSUBDIV          OFF CACHE BOOL "" FORCE)
-#   include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
+#	include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
 endif()
--- a/Show More
+++ b/Show More