Fix collision multithreading inconsistency

Multithreading makes collisions be detected in different orders, causing
the clustering step of collision resolution to generate possibly
slightly different results on each run. This commit makes collision
order consistent.

.arcconfig

@@ -1,8 +1,6 @@
 {
 	"project_id" : "Blender",
 	"conduit_uri" : "https://developer.blender.org/",
-	"phabricator.uri" : "https://developer.blender.org/",
 	"git.default-relative-commit" : "origin/master",
-	"arc.land.update.default" : "rebase",
+	"arc.land.update.default" : "rebase"
-	"arc.land.onto.default" : "master"
 }

.clang-format

@@ -1,264 +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
-
-SortIncludes: true
-
-# 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_MESH_BUFFER_CACHE
-  - 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
-  - GP_EVALUATED_STROKES_BEGIN
-  - GSET_FOREACH_BEGIN
-  - GSET_ITER
-  - GSET_ITER_INDEX
-  - ITER_BEGIN
-  - ITER_PIXELS
-  - ITER_SLOTS
-  - ITER_SLOTS_BEGIN
-  - LOOP_EDITED_POINTS
-  - LOOP_KEYS
-  - LOOP_POINTS
-  - LOOP_SELECTED_KEYS
-  - LOOP_SELECTED_POINTS
-  - LOOP_TAGGED_KEYS
-  - LOOP_TAGGED_POINTS
-  - LOOP_UNSELECTED_POINTS
-  - LOOP_VISIBLE_KEYS
-  - LOOP_VISIBLE_POINTS
-  - LISTBASE_CIRCULAR_BACKWARD_BEGIN
-  - LISTBASE_CIRCULAR_FORWARD_BEGIN
-  - LISTBASE_FOREACH
-  - LISTBASE_FOREACH_BACKWARD
-  - LISTBASE_FOREACH_MUTABLE
-  - LISTBASE_FOREACH_BACKWARD_MUTABLE
-  - 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
-  - RENDER_PASS_ITER_BEGIN
-  - RNA_BEGIN
-  - RNA_PROP_BEGIN
-  - RNA_STRUCT_BEGIN
-  - RNA_STRUCT_BEGIN_SKIP_RNA_TYPE
-  - SCULPT_VERTEX_DUPLICATES_AND_NEIGHBORS_ITER_BEGIN
-  - SCULPT_VERTEX_NEIGHBORS_ITER_BEGIN
-  - SEQP_BEGIN
-  - SEQ_BEGIN
-  - SURFACE_QUAD_ITER_BEGIN
-  - foreach
-
-# Use once we bump the minimum version to version 8.
-# # Without this string literals that in-line 'STRINGIFY' behave strangely (a bug?).
-# StatementMacros:
-#   - PyObject_VAR_HEAD
-#   - STRINGIFY

.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]

.github/stale.yml

@@ -1,22 +0,0 @@
-# Configuration for probot-stale - https://github.com/probot/stale
-# This file is used on Blender's GitHub mirror to automatically close any pull request
-# and invite contributors to join the official development platform on blender.org
-
-# Number of days of inactivity before an Issue or Pull Request becomes stale
-daysUntilStale: 1
-
-# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
-# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
-daysUntilClose: 1
-
-# Label to use when marking as stale
-staleLabel: stale
-
-# Comment to post when closing a stale Issue or Pull Request.
-closeComment: >
-  This issue has been automatically closed, because this repository is only
-  used as a mirror of git.blender.org. Blender development happens on
-  developer.blender.org.
-
-  To get started contributing code, please read:
-  https://wiki.blender.org/wiki/Process/Contributing_Code

.gitignore

@@ -11,10 +11,6 @@ __pycache__/
 *.swo
 *#
 
-# Indexes for emacs, vi & others
-TAGS
-tags
-
 # QtCreator
 CMakeLists.txt.user
 
@@ -40,9 +36,3 @@ Desktop.ini
 
 # in-source lib downloads
 /build_files/build_environment/downloads
-
-# in-source buildbot signing configuration
-/build_files/buildbot/codesign/config_server.py
-
-# smoke simulation noise tile (generated)
-waveletNoiseTile.bin

.gitmodules

@@ -1,20 +1,20 @@
 [submodule "release/scripts/addons"]
 	path = release/scripts/addons
 	url = ../blender-addons.git
-	branch = master
 	ignore = all
+	branch = master
 [submodule "release/scripts/addons_contrib"]
 	path = release/scripts/addons_contrib
 	url = ../blender-addons-contrib.git
-	branch = master
 	ignore = all
+	branch = master
 [submodule "release/datafiles/locale"]
 	path = release/datafiles/locale
 	url = ../blender-translations.git
-	branch = master
 	ignore = all
+	branch = master
 [submodule "source/tools"]
 	path = source/tools
 	url = ../blender-dev-tools.git
-	branch = master
 	ignore = all
+	branch = master

GNUmakefile

@@ -24,147 +24,20 @@
 #   ../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).
-
-   * developer:     Enable faster builds, error checking and tests, recommended for developers.
-   * config:        Run cmake configuration tool to set build options.
-   * ninja:         Use ninja build tool for faster builds.
-
-   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 project 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 automated tests with ctest.
-   * 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
-
-   * source_archive:
-     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
 BLENDER_DIR:=$(shell pwd -P)
 BUILD_TYPE:=Release
 
-# CMake arguments, assigned to local variable to make it mutable.
+ifndef BUILD_CMAKE_ARGS
-CMAKE_CONFIG_ARGS := $(BUILD_CMAKE_ARGS)
+	BUILD_CMAKE_ARGS:=
+endif
 
 ifndef BUILD_DIR
 	BUILD_DIR:=$(shell dirname "$(BLENDER_DIR)")/build_$(OS_NCASE)
@@ -172,18 +45,12 @@ endif
 
 # Dependencies DIR's
 DEPS_SOURCE_DIR:=$(BLENDER_DIR)/build_files/build_environment
+DEPS_BUILD_DIR:=$(BUILD_DIR)/deps
+DEPS_INSTALL_DIR:=$(shell dirname "$(BLENDER_DIR)")/lib/$(OS_NCASE)
 
-ifndef DEPS_BUILD_DIR
+ifneq ($(OS_NCASE),darwin)
-	DEPS_BUILD_DIR:=$(BUILD_DIR)/deps
+	# Add processor type to directory name
-endif
+	DEPS_INSTALL_DIR:=$(DEPS_INSTALL_DIR)_$(shell uname -p)
-
-ifndef DEPS_INSTALL_DIR
-	DEPS_INSTALL_DIR:=$(shell dirname "$(BLENDER_DIR)")/lib/$(OS_NCASE)
-
-	ifneq ($(OS_NCASE),darwin)
-		# Add processor type to directory name
-		DEPS_INSTALL_DIR:=$(DEPS_INSTALL_DIR)_$(CPU)
-	endif
 endif
 
 # Allow to use alternative binary (pypy3, etc)
@@ -191,16 +58,6 @@ ifndef PYTHON
 	PYTHON:=python3
 endif
 
-# For macOS python3 is not installed by default, so fallback to python binary
-# in libraries, or python 2 for running make update to get it.
-ifeq ($(OS_NCASE),darwin)
-	ifeq (, $(shell command -v $(PYTHON)))
-		PYTHON:=../lib/darwin/python/bin/python3.7m
-		ifeq (, $(shell command -v $(PYTHON)))
-			PYTHON:=python
-		endif
-	endif
-endif
 
 # -----------------------------------------------------------------------------
 # additional targets for the build configuration
@@ -212,59 +69,23 @@ ifneq "$(findstring debug, $(MAKECMDGOALS))" ""
 endif
 ifneq "$(findstring full, $(MAKECMDGOALS))" ""
 	BUILD_DIR:=$(BUILD_DIR)_full
-	CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/blender_full.cmake" $(CMAKE_CONFIG_ARGS)
+	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/blender_full.cmake"
 endif
 ifneq "$(findstring lite, $(MAKECMDGOALS))" ""
 	BUILD_DIR:=$(BUILD_DIR)_lite
-	CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/blender_lite.cmake" $(CMAKE_CONFIG_ARGS)
+	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/blender_lite.cmake"
 endif
 ifneq "$(findstring cycles, $(MAKECMDGOALS))" ""
 	BUILD_DIR:=$(BUILD_DIR)_cycles
-	CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/cycles_standalone.cmake" $(CMAKE_CONFIG_ARGS)
+	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/cycles_standalone.cmake"
 endif
 ifneq "$(findstring headless, $(MAKECMDGOALS))" ""
 	BUILD_DIR:=$(BUILD_DIR)_headless
-	CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/blender_headless.cmake" $(CMAKE_CONFIG_ARGS)
+	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/blender_headless.cmake"
 endif
 ifneq "$(findstring bpy, $(MAKECMDGOALS))" ""
 	BUILD_DIR:=$(BUILD_DIR)_bpy
-	CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/bpy_module.cmake" $(CMAKE_CONFIG_ARGS)
+	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/bpy_module.cmake"
-endif
-
-ifneq "$(findstring developer, $(MAKECMDGOALS))" ""
-	CMAKE_CONFIG_ARGS:=-C"$(BLENDER_DIR)/build_files/cmake/config/blender_developer.cmake" $(CMAKE_CONFIG_ARGS)
-endif
-
-# -----------------------------------------------------------------------------
-# build tool
-
-ifneq "$(findstring ninja, $(MAKECMDGOALS))" ""
-	CMAKE_CONFIG_ARGS:=$(CMAKE_CONFIG_ARGS) -G Ninja
-	BUILD_COMMAND:=ninja
-	DEPS_BUILD_COMMAND:=ninja
-else
-	ifneq ("$(wildcard $(BUILD_DIR)/build.ninja)","")
-		BUILD_COMMAND:=ninja
-	else
-		BUILD_COMMAND:=make -s
-	endif
-
-	ifneq ("$(wildcard $(DEPS_BUILD_DIR)/build.ninja)","")
-		DEPS_BUILD_COMMAND:=ninja
-	else
-		DEPS_BUILD_COMMAND:=make -s
-	endif
-endif
-
-# -----------------------------------------------------------------------------
-# Blender binary path
-
-# Allow passing in own BLENDER_BIN so developers who don't
-# use the default build path can still use utility helpers.
-ifeq ($(OS), Darwin)
-	BLENDER_BIN?="$(BUILD_DIR)/bin/Blender.app/Contents/MacOS/Blender"
-else
-	BLENDER_BIN?="$(BUILD_DIR)/bin/blender"
 endif
 
 
@@ -275,10 +96,7 @@ ifndef NPROCS
 	ifeq ($(OS), Linux)
 		NPROCS:=$(shell nproc)
 	endif
-	ifeq ($(OS), NetBSD)
+	ifneq (,$(filter $(OS),Darwin FreeBSD NetBSD))
-		NPROCS:=$(shell getconf NPROCESSORS_ONLN)
-	endif
-	ifneq (,$(filter $(OS),Darwin FreeBSD))
 		NPROCS:=$(shell sysctl -n hw.ncpu)
 	endif
 endif
@@ -287,7 +105,7 @@ endif
 # -----------------------------------------------------------------------------
 # Macro for configuring cmake
 
-CMAKE_CONFIG = cmake $(CMAKE_CONFIG_ARGS) \
+CMAKE_CONFIG = cmake $(BUILD_CMAKE_ARGS) \
                      -H"$(BLENDER_DIR)" \
                      -B"$(BUILD_DIR)" \
                      -DCMAKE_BUILD_TYPE_INIT:STRING=$(BUILD_TYPE)
@@ -319,10 +137,10 @@ all: .FORCE
 
 	@echo
 	@echo Building Blender ...
-	$(BUILD_COMMAND) -C "$(BUILD_DIR)" -j $(NPROCS) install
+	$(MAKE) -C "$(BUILD_DIR)" -s -j $(NPROCS) install
 	@echo
 	@echo edit build configuration with: "$(BUILD_DIR)/CMakeCache.txt" run make again to rebuild.
-	@echo Blender successfully built, run from: $(BLENDER_BIN)
+	@echo Blender successfully built, run from: "$(BUILD_DIR)/bin/blender"
 	@echo
 
 debug: all
@@ -331,8 +149,6 @@ lite: all
 cycles: all
 headless: all
 bpy: all
-developer: all
-ninja: all
 
 # -----------------------------------------------------------------------------
 # Build dependencies
@@ -351,7 +167,7 @@ deps: .FORCE
 
 	@echo
 	@echo Building dependencies ...
-	$(DEPS_BUILD_COMMAND) -C "$(DEPS_BUILD_DIR)" -j $(NPROCS) $(DEPS_TARGET)
+	$(MAKE) -C "$(DEPS_BUILD_DIR)" -s -j $(NPROCS) $(DEPS_TARGET)
 	@echo
 	@echo Dependencies successfully built and installed to $(DEPS_INSTALL_DIR).
 	@echo
@@ -364,9 +180,84 @@ config: .FORCE
 
 # -----------------------------------------------------------------------------
 # Help for build targets
-export HELP_TEXT
 help: .FORCE
-	@echo "$$HELP_TEXT"
+	@echo ""
+	@echo "Convenience targets provided for building blender, (multiple at once can be used)"
+	@echo "  * debug     - build a debug binary"
+	@echo "  * full      - enable all supported dependencies & options"
+	@echo "  * lite      - disable non essential features for a smaller binary and faster build"
+	@echo "  * headless  - build without an interface (renderfarm or server automation)"
+	@echo "  * cycles    - build Cycles standalone only, without Blender"
+	@echo "  * bpy       - build as a python module which can be loaded from python directly"
+	@echo "  * deps      - build library dependencies (intended only for platform maintainers)"
+	@echo ""
+	@echo "  * config    - run cmake configuration tool to set build options"
+	@echo ""
+	@echo "  Note, passing the argument 'BUILD_DIR=path' when calling make will override the default build dir."
+	@echo "  Note, passing the argument 'BUILD_CMAKE_ARGS=args' lets you add cmake arguments."
+	@echo ""
+	@echo ""
+	@echo "Project Files for IDE's"
+	@echo "  * project_qtcreator - QtCreator Project Files"
+	@echo "  * project_netbeans  - NetBeans Project Files"
+	@echo "  * project_eclipse   - Eclipse CDT4 Project Files"
+	@echo ""
+	@echo "Package Targets"
+	@echo "  * package_debian  - build a debian package"
+	@echo "  * package_pacman  - build an arch linux pacman package"
+	@echo "  * package_archive - build an archive package"
+	@echo ""
+	@echo "Testing Targets (not associated with building blender)"
+	@echo "  * test               - run ctest, currently tests import/export,"
+	@echo "                         operator execution and that python modules load"
+	@echo "  * test_cmake         - runs our own cmake file checker"
+	@echo "                         which detects errors in the cmake file list definitions"
+	@echo "  * test_pep8          - checks all python script are pep8"
+	@echo "                         which are tagged to use the stricter formatting"
+	@echo "  * test_deprecated    - checks for deprecation tags in our code which may need to be removed"
+	@echo "  * test_style_c       - checks C/C++ conforms with blenders style guide:"
+	@echo "                         http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
+	@echo "  * test_style_c_qtc   - same as test_style but outputs QtCreator tasks format"
+	@echo "  * test_style_osl     - checks OpenShadingLanguage conforms with blenders style guide:"
+	@echo "                         http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
+	@echo "  * test_style_osl_qtc - checks OpenShadingLanguage conforms with blenders style guide:"
+	@echo "                         http://wiki.blender.org/index.php/Dev:Doc/CodeStyle"
+	@echo ""
+	@echo "Static Source Code Checking (not associated with building blender)"
+	@echo "  * check_cppcheck       - run blender source through cppcheck (C & C++)"
+	@echo "  * check_clang_array    - run blender source through clang array checking script (C & C++)"
+	@echo "  * check_splint         - run blenders source through splint (C only)"
+	@echo "  * check_sparse         - run blenders source through sparse (C only)"
+	@echo "  * check_smatch         - run blenders source through smatch (C only)"
+	@echo "  * check_spelling_c     - check for spelling errors (C/C++ only)"
+	@echo "  * check_spelling_c_qtc - same as check_spelling_c but outputs QtCreator tasks format"
+	@echo "  * check_spelling_osl   - check for spelling errors (OSL only)"
+	@echo "  * check_spelling_py    - check for spelling errors (Python only)"
+	@echo "  * check_descriptions   - check for duplicate/invalid descriptions"
+	@echo ""
+	@echo "Utilities (not associated with building blender)"
+	@echo "  * icons    - Updates PNG icons from SVG files."
+	@echo "               Set environment variables 'BLENDER_BIN' and 'INKSCAPE_BIN'"
+	@echo "               to define your own commands."
+	@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
@@ -386,7 +277,7 @@ package_archive: .FORCE
 # Tests
 #
 test: .FORCE
-	$(PYTHON) ./build_files/utils/make_test.py "$(BUILD_DIR)"
+	cd $(BUILD_DIR) ; ctest . --output-on-failure
 
 # run pep8 check check on scripts we distribute.
 test_pep8: .FORCE
@@ -447,7 +338,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)"
@@ -520,33 +411,32 @@ check_spelling_osl: .FORCE
 	    "$(BLENDER_DIR)/intern/cycles/kernel/shaders"
 
 check_descriptions: .FORCE
-	$(BLENDER_BIN) --background -noaudio --factory-startup --python \
+	"$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup --python \
 	    "$(BLENDER_DIR)/source/tools/check_source/check_descriptions.py"
 
 # -----------------------------------------------------------------------------
 # Utilities
 #
 
-source_archive: .FORCE
+tgz: .FORCE
-	./build_files/utils/make_source_archive.sh
+	./build_files/utils/build_tgz.sh
 
-INKSCAPE_BIN?="inkscape"
 icons: .FORCE
-	BLENDER_BIN=$(BLENDER_BIN) INKSCAPE_BIN=$(INKSCAPE_BIN) \
+	"$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
-		"$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
+	"$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
-	BLENDER_BIN=$(BLENDER_BIN) INKSCAPE_BIN=$(INKSCAPE_BIN) \
-		"$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
-
-icons_geom: .FORCE
-	BLENDER_BIN=$(BLENDER_BIN) \
-	    "$(BLENDER_DIR)/release/datafiles/blender_icons_geom_update.py"
 
 update: .FORCE
-	$(PYTHON) ./build_files/utils/make_update.py
+	if [ "$(OS_NCASE)" = "darwin" ] && [ ! -d "../lib/$(OS_NCASE)" ]; then \
-
+		svn checkout https://svn.blender.org/svnroot/bf-blender/trunk/lib/$(OS_NCASE) ../lib/$(OS_NCASE) ; \
-format: .FORCE
+	fi
-	PATH="../lib/${OS_NCASE}_${CPU}/llvm/bin/:../lib/${OS_NCASE}_centos7_${CPU}/llvm/bin/:../lib/${OS_NCASE}/llvm/bin/:$(PATH)" \
+	if [ -d "../lib" ]; then \
-		$(PYTHON) source/tools/utils_maintenance/clang_format_paths.py $(PATHS)
+		svn cleanup ../lib/* ; \
+		svn update ../lib/* ; \
+	fi
+	git pull --rebase
+	git submodule update --init --recursive
+	git submodule foreach git checkout master
+	git submodule foreach git pull --rebase origin master
 
 
 # -----------------------------------------------------------------------------
@@ -555,29 +445,36 @@ format: .FORCE
 
 # Simple version of ./doc/python_api/sphinx_doc_gen.sh with no PDF generation.
 doc_py: .FORCE
-	ASAN_OPTIONS=halt_on_error=0 \
+	"$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup \
-	$(BLENDER_BIN) --background -noaudio --factory-startup \
 		--python doc/python_api/sphinx_doc_gen.py
 	cd doc/python_api ; sphinx-build -b html sphinx-in sphinx-out
-	@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/index.html'"
+	@echo "docs written into: '$(BLENDER_DIR)/doc/python_api/sphinx-out/contents.html'"
 
 doc_doxy: .FORCE
 	cd doc/doxygen; doxygen Doxyfile
 	@echo "docs written into: '$(BLENDER_DIR)/doc/doxygen/html/index.html'"
 
 doc_dna: .FORCE
-	$(BLENDER_BIN) --background -noaudio --factory-startup \
+	"$(BUILD_DIR)/bin/blender" --background -noaudio --factory-startup \
 		--python doc/blender_file_format/BlendFileDnaExporter_25.py
 	@echo "docs written into: '$(BLENDER_DIR)/doc/blender_file_format/dna.html'"
 
 doc_man: .FORCE
-	$(PYTHON) doc/manpage/blender.1.py $(BLENDER_BIN) blender.1
+	$(PYTHON) doc/manpage/blender.1.py "$(BUILD_DIR)/bin/blender"
 
 help_features: .FORCE
-	@$(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_print_build_options.py" $(BLENDER_DIR)"/CMakeLists.txt"
+	@$(PYTHON) -c \
+		"import re; \
+		print('\n'.join([ \
+		w for l in open('"$(BLENDER_DIR)"/CMakeLists.txt', 'r').readlines() \
+		if not l.lstrip().startswith('#') \
+		for w in (re.sub(\
+		    r'.*\boption\s*\(\s*(WITH_[a-zA-Z0-9_]+)\s+(\".*\")\s*.*', r'\g<1> - \g<2>', l).strip('() \n'),) \
+		if w.startswith('WITH_')]))" | uniq
+
 
 clean: .FORCE
-	$(BUILD_COMMAND) -C "$(BUILD_DIR)" clean
+	$(MAKE) -C "$(BUILD_DIR)" clean
 
 .PHONY: all
 

build_files/build_environment/CMakeLists.txt

@@ -19,22 +19,22 @@
 ####################################################################################################
 #
 # This is a build system used by platform maintainers to build library dependencies on
-# Windows, macOS and Linux.
+# Windows and macOS. There is some support for Linux as well, but not ready for releases.
 #
-# For users building Blender, we recommend using the precompiled libraries from lib/ on
+# Windows and macOS users should download the precompiled libraries in lib/, Linux users
-# Windows and macOS, and install_deps.sh on Linux.
+# should run install_deps.sh for building dependencies.
 #
 # WINDOWS USAGE:
-#   Don't call this cmake file yourself, use build_deps.cmd
+#   Don't call this cmake file your self, use build_deps.cmd
 #   build_deps 2013 x64 / build_deps 2013 x86
 #   build_deps 2015 x64 / build_deps 2015 x86
 #
 # MAC OS X USAGE:
-#   Install with homebrew: brew install cmake autoconf automake libtool yasm nasm
+#	Install with homebrew: brew install autoconf automake libtool yasm openssl xz
 #   Run "make deps" from main Blender directory
 #
 # LINUX USAGE:
-#   Install compiler cmake autoconf automake libtool yasm nasm tcl
+#   Install compiler, cmake, autoconf, automake, libtool, yasm
 #   Run "make deps" from main Blender directory
 #
 ####################################################################################################
@@ -43,27 +43,17 @@ project("BlenderDependencies")
 cmake_minimum_required(VERSION 3.5)
 
 include(ExternalProject)
-include(cmake/check_software.cmake)
 include(cmake/options.cmake)
 include(cmake/versions.cmake)
-
-if(ENABLE_MINGW64)
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    include(cmake/setup_mingw64.cmake)
-  else()
-    include(cmake/setup_mingw32.cmake)
-  endif()
-else()
-  set(mingw_LIBDIR ${LIBDIR})
-endif()
-
 include(cmake/zlib.cmake)
+include(cmake/blendthumb.cmake)
 include(cmake/openal.cmake)
 include(cmake/png.cmake)
 include(cmake/jpeg.cmake)
 include(cmake/boost.cmake)
 include(cmake/blosc.cmake)
 include(cmake/pthreads.cmake)
+include(cmake/ilmbase.cmake)
 include(cmake/openexr.cmake)
 include(cmake/freetype.cmake)
 include(cmake/freeglut.cmake)
@@ -78,9 +68,6 @@ include(cmake/opencollada.cmake)
 include(cmake/opencolorio.cmake)
 include(cmake/llvm.cmake)
 include(cmake/clang.cmake)
-if(APPLE)
-  include(cmake/openmp.cmake)
-endif()
 include(cmake/openimageio.cmake)
 include(cmake/tiff.cmake)
 include(cmake/flexbison.cmake)
@@ -89,76 +76,56 @@ include(cmake/tbb.cmake)
 include(cmake/openvdb.cmake)
 include(cmake/python.cmake)
 include(cmake/python_site_packages.cmake)
-include(cmake/package_python.cmake)
 include(cmake/numpy.cmake)
-include(cmake/usd.cmake)
-if(UNIX)
-  # Rely on PugiXML compiled with OpenImageIO
-else()
-  include(cmake/pugixml.cmake)
-endif()
-include(cmake/openimagedenoise.cmake)
-include(cmake/embree.cmake)
-include(cmake/xr_openxr.cmake)
-
 if(WITH_WEBP)
-  include(cmake/webp.cmake)
+	include(cmake/webp.cmake)
+endif()
+if(WIN32)
+	include(cmake/hidapi.cmake)
 endif()
 
-if(WIN32)
+if(ENABLE_MINGW64)
-  # HMD branch deps
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-  include(cmake/hidapi.cmake)
+		include(cmake/setup_mingw64.cmake)
-  # OCIO deps
+	else()
-  include(cmake/tinyxml.cmake)
+		include(cmake/setup_mingw32.cmake)
-  include(cmake/yamlcpp.cmake)
+	endif()
-  # LCMS is an OCIO dep, but only if you build the apps, leaving it here for convenience
+else()
-  # include(cmake/lcms.cmake)
+	set(mingw_LIBDIR ${LIBDIR})
-
 endif()
 
 if(NOT WIN32 OR ENABLE_MINGW64)
-  include(cmake/openjpeg.cmake)
+	include(cmake/openjpeg.cmake)
-  if(NOT WIN32 OR BUILD_MODE STREQUAL Release)
+	if(BUILD_MODE STREQUAL Release)
-    if(WIN32)
+		if(WIN32)
-      include(cmake/zlib_mingw.cmake)
+			include(cmake/zlib_mingw.cmake)
-    endif()
+		endif()
-    include(cmake/lame.cmake)
+		include(cmake/lame.cmake)
-    include(cmake/ogg.cmake)
+		include(cmake/ogg.cmake)
-    include(cmake/vorbis.cmake)
+		include(cmake/vorbis.cmake)
-    include(cmake/theora.cmake)
+		include(cmake/theora.cmake)
-    include(cmake/opus.cmake)
+		include(cmake/vpx.cmake)
-    include(cmake/vpx.cmake)
+		include(cmake/orc.cmake)
-    include(cmake/x264.cmake)
+		include(cmake/schroedinger.cmake)
-    include(cmake/xvidcore.cmake)
+		include(cmake/x264.cmake)
-    include(cmake/faad.cmake)
+		include(cmake/xvidcore.cmake)
-    include(cmake/ffmpeg.cmake)
+		include(cmake/faad.cmake)
-    include(cmake/fftw.cmake)
+		include(cmake/ffmpeg.cmake)
-    include(cmake/sndfile.cmake)
+		include(cmake/fftw.cmake)
-    if(WIN32)
+		include(cmake/sndfile.cmake)
-      include(cmake/iconv.cmake)
+		if(WIN32)
-    endif()
+			include(cmake/iconv.cmake)
-    if(UNIX)
+			include(cmake/lapack.cmake)
-      include(cmake/flac.cmake)
+		endif()
-      include(cmake/xml2.cmake)
+		if(UNIX)
-      if(NOT APPLE)
+			include(cmake/flac.cmake)
-        include(cmake/spnav.cmake)
+			if(NOT APPLE)
-        include(cmake/jemalloc.cmake)
+				include(cmake/spnav.cmake)
-      endif()
+				include(cmake/jemalloc.cmake)
-    endif()
+				include(cmake/xml2.cmake)
-  endif()
+			endif()
-endif()
+		endif()
-
+	endif()
-if(UNIX)
-  include(cmake/bzip2.cmake)
-  include(cmake/ffi.cmake)
-  include(cmake/lzma.cmake)
-  include(cmake/ssl.cmake)
-  include(cmake/sqlite.cmake)
-endif()
-
-if(UNIX AND NOT APPLE)
-  include(cmake/libglu.cmake)
-  include(cmake/mesa.cmake)
 endif()
 
 include(cmake/harvest.cmake)

build_files/build_environment/cmake/alembic.cmake

@@ -17,82 +17,64 @@
 # ***** 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()
 
 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=OFF
+	-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=${LIBDIR}/openexr
+	-DILMBASE_ROOT=${LIBDIR}/ilmbase
-  -DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${LIBDIR}/openexr/include/OpenEXR
+	-DALEMBIC_ILMBASE_INCLUDE_DIRECTORY=${LIBDIR}/ilmbase/include/OpenEXR
-  -DALEMBIC_ILMBASE_HALF_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}Half${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+	-DALEMBIC_ILMBASE_HALF_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${LIBEXT}
-  -DALEMBIC_ILMBASE_IMATH_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}Imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+	-DALEMBIC_ILMBASE_IMATH_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath-2_2${LIBEXT}
-  -DALEMBIC_ILMBASE_ILMTHREAD_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmThread${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+	-DALEMBIC_ILMBASE_ILMTHREAD_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread-2_2${LIBEXT}
-  -DALEMBIC_ILMBASE_IEX_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+	-DALEMBIC_ILMBASE_IEX_LIB=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex-2_2${LIBEXT}
-  -DALEMBIC_ILMBASE_IEXMATH_LIB=${LIBDIR}/openexr/lib/${LIBPREFIX}IexMath${OPENEXR_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)
-    ExternalProject_Add_Step(external_alembic after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/alembic ${HARVEST_TARGET}/alembic
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_alembic after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/alembic/lib/alembic.lib ${HARVEST_TARGET}/alembic/lib/alembic_d.lib
-      DEPENDEES install
-    )
-  endif()
-endif()
-
-
-
 add_dependencies(
-  external_alembic
+	external_alembic
-  external_boost
+	external_boost
-  external_zlib
+	external_zlib
-  external_openexr
+	external_ilmbase
 )

build_files/build_environment/cmake/blendthumb.cmake

@@ -0,0 +1,67 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+if(BUILD_MODE STREQUAL Release)
+	if(WIN32)
+		set(THUMB_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../release/windows/blendthumb)
+
+		ExternalProject_Add(external_zlib_32
+			URL ${ZLIB_URI}
+			CMAKE_GENERATOR ${GENERATOR_32}
+			URL_HASH MD5=${ZLIB_HASH}
+			DOWNLOAD_DIR ${DOWNLOAD_DIR}
+			PREFIX ${BUILD_DIR}/zlib32
+			CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib32 ${DEFAULT_CMAKE_FLAGS}
+			INSTALL_DIR ${LIBDIR}/zlib32
+		)
+
+		ExternalProject_Add(external_zlib_64
+			URL ${ZLIB_URI}
+			CMAKE_GENERATOR ${GENERATOR_64}
+			URL_HASH MD5=${ZLIB_HASH}
+			DOWNLOAD_DIR ${DOWNLOAD_DIR}
+			PREFIX ${BUILD_DIR}/zlib64
+			CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib64 ${DEFAULT_CMAKE_FLAGS}
+			INSTALL_DIR ${LIBDIR}/zlib64
+		)
+
+		ExternalProject_Add(external_blendthumb_32
+			CMAKE_GENERATOR ${GENERATOR_32}
+			SOURCE_DIR ${THUMB_DIR}
+			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
+			INSTALL_DIR ${LIBDIR}/blendthumb32
+		)
+		add_dependencies(
+			external_blendthumb_32
+			external_zlib_32
+		)
+
+		ExternalProject_Add(external_blendthumb_64
+			CMAKE_GENERATOR ${GENERATOR_64}
+			SOURCE_DIR ${THUMB_DIR}
+			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
+			INSTALL_DIR ${LIBDIR}/blendthumb64
+		)
+		add_dependencies(
+			external_blendthumb_64
+			external_zlib_64
+		)
+	endif()
+endif()

build_files/build_environment/cmake/blosc.cmake

@@ -17,57 +17,33 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(BLOSC_EXTRA_ARGS
-  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-  -DBUILD_TESTS=OFF
+	-DBUILD_TESTS=OFF
-  -DBUILD_BENCHMARKS=OFF
+	-DBUILD_BENCHMARKS=OFF
-  -DCMAKE_DEBUG_POSTFIX=_d
+	-DCMAKE_DEBUG_POSTFIX=_d
-  -DThreads_FOUND=1
+	-DThreads_FOUND=1
-  -DPTHREAD_LIBS=${LIBDIR}/pthreads/lib/pthreadVC3.lib
+	-DPTHREAD_LIBS=${LIBDIR}/pthreads/lib/pthreadVC2.lib
-  -DPTHREAD_INCLUDE_DIR=${LIBDIR}/pthreads/inc
+	-DPTHREAD_INCLUDE_DIR=${LIBDIR}/pthreads/inc
-  -DDEACTIVATE_SNAPPY=ON
-  -DCMAKE_POSITION_INDEPENDENT_CODE=ON
-)
-
-# Prevent blosc from including it's own local copy of zlib in the object file
-# and cause linker errors with everybody else.
-set(BLOSC_EXTRA_ARGS ${BLOSC_EXTRA_ARGS}
-  -DPREFER_EXTERNAL_ZLIB=ON
 )
 
 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(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_blosc after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc.lib ${HARVEST_TARGET}/blosc/lib/libblosc.lib
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/blosc/include/ ${HARVEST_TARGET}/blosc/include/
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_blosc after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc_d.lib ${HARVEST_TARGET}/blosc/lib/libblosc_d.lib
-      DEPENDEES install
-    )
-  endif()
 endif()

build_files/build_environment/cmake/boost.cmake

@@ -16,79 +16,99 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-set(BOOST_ADDRESS_MODEL 64)
-
 if(WIN32)
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    set(PYTHON_ARCH x64)
+		set(PYTHON_ARCH x64)
-    set(PYTHON_ARCH2 win-AMD64)
+		set(PYTHON_ARCH2 win-AMD64)
-    set(PYTHON_OUTPUTDIR ${BUILD_DIR}/python/src/external_python/pcbuild/amd64/)
+		set(PYTHON_OUTPUTDIR ${BUILD_DIR}/python/src/external_python/pcbuild/amd64/)
-  else()
+	else()
-    set(PYTHON_ARCH x86)
+		set(PYTHON_ARCH x86)
-    set(PYTHON_ARCH2 win32)
+		set(PYTHON_ARCH2 win32)
-    set(PYTHON_OUTPUTDIR ${BUILD_DIR}/python/src/external_python/pcbuild/win32/)
+		set(PYTHON_OUTPUTDIR ${BUILD_DIR}/python/src/external_python/pcbuild/win32/)
-    set(BOOST_ADDRESS_MODEL 32)
+	endif()
-  endif()
+	if(MSVC12)
-
+		set(BOOST_TOOLSET toolset=msvc-12.0)
-  set(BOOST_TOOLSET toolset=msvc-14.1)
+		set(BOOST_COMPILER_STRING -vc120)
-  set(BOOST_COMPILER_STRING -vc141)
+		set(PYTHON_COMPILER_STRING v120)
-
+	endif()
-  set(BOOST_CONFIGURE_COMMAND bootstrap.bat)
+	if(MSVC14)
-  set(BOOST_BUILD_COMMAND bjam)
+		set(BOOST_TOOLSET toolset=msvc-14.0)
-  set(BOOST_BUILD_OPTIONS runtime-link=shared )
+		set(BOOST_COMPILER_STRING -vc140)
-  set(BOOST_HARVEST_CMD   ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ )
+		set(PYTHON_COMPILER_STRING v140)
-  if(BUILD_MODE STREQUAL Release)
+	endif()
-    set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-${BOOST_VERSION_NODOTS_SHORT}/ ${HARVEST_TARGET}/boost/include/)
+	set(JAM_FILE ${BUILD_DIR}/boost/src/external_boost/user-config.jam)
-  endif()
+	set(semi_path "${PATCH_DIR}/semi.txt")
+	FILE(TO_NATIVE_PATH ${semi_path} semi_path)
+	set(BOOST_CONFIGURE_COMMAND bootstrap.bat &&
+								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/pcbuild >> "${JAM_FILE}" &&
+								type ${semi_path} >> "${JAM_FILE}"
+	)
+	set(BOOST_BUILD_COMMAND bjam)
+	#--user-config=user-config.jam
+	set(BOOST_BUILD_OPTIONS runtime-link=static )
+	#set(BOOST_WITH_PYTHON --with-python)
+	set(BOOST_HARVEST_CMD 	${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ )
+	if(BUILD_MODE STREQUAL Release)
+		set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-1_60/ ${HARVEST_TARGET}/boost/include/)
+	endif()
+	set(BOOST_PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/boost/src/external_boost < ${PATCH_DIR}/boost.diff)
 
 elseif(APPLE)
-  set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
+	set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
-  set(BOOST_BUILD_COMMAND ./b2)
+	set(BOOST_BUILD_COMMAND ./bjam)
-  set(BOOST_BUILD_OPTIONS toolset=darwin cxxflags=${PLATFORM_CXXFLAGS} linkflags=${PLATFORM_LDFLAGS} visibility=global --disable-icu boost.locale.icu=off)
+	set(BOOST_BUILD_OPTIONS toolset=clang cxxflags=${PLATFORM_CXXFLAGS} linkflags=${PLATFORM_LDFLAGS} --disable-icu boost.locale.icu=off)
-  set(BOOST_HARVEST_CMD echo .)
+	set(BOOST_HARVEST_CMD echo .)
-  set(BOOST_PATCH_COMMAND echo .)
+	set(BOOST_PATCH_COMMAND echo .)
 else()
-  set(BOOST_HARVEST_CMD echo .)
+	set(BOOST_HARVEST_CMD echo .)
-  set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
+	set(BOOST_CONFIGURE_COMMAND ./bootstrap.sh)
-  set(BOOST_BUILD_COMMAND ./b2)
+	set(BOOST_BUILD_COMMAND ./bjam)
-  set(BOOST_BUILD_OPTIONS cxxflags=${PLATFORM_CXXFLAGS} --disable-icu boost.locale.icu=off)
+	set(BOOST_BUILD_OPTIONS cxxflags=${PLATFORM_CXXFLAGS} --disable-icu boost.locale.icu=off)
-  set(BOOST_PATCH_COMMAND echo .)
+	set(BOOST_PATCH_COMMAND echo .)
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    set(BOOST_ADDRESS_MODEL 64)
-  else()
-    set(BOOST_ADDRESS_MODEL 32)
-  endif()
 endif()
 
 set(BOOST_OPTIONS
-  --with-filesystem
+	--with-filesystem
-  --with-locale
+	--with-locale
-  --with-thread
+	--with-thread
-  --with-regex
+	--with-regex
-  --with-system
+	--with-system
-  --with-date_time
+	--with-date_time
-  --with-wave
+	--with-wave
-  --with-atomic
+	--with-atomic
-  --with-serialization
+	--with-serialization
-  --with-program_options
+	--with-program_options
-  --with-iostreams
+	--with-iostreams
-  -sNO_BZIP2=1
+	${BOOST_WITH_PYTHON}
-  -sNO_LZMA=1
+	${BOOST_TOOLSET}
-  -sNO_ZSTD=1
-  ${BOOST_TOOLSET}
 )
 
+if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+	set(BOOST_ADDRESS_MODEL 64)
+else()
+	set(BOOST_ADDRESS_MODEL 32)
+endif()
+
 string(TOLOWER ${BUILD_MODE} BOOST_BUILD_TYPE)
 
 ExternalProject_Add(external_boost
-  URL ${BOOST_URI}
+	URL ${BOOST_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${BOOST_HASH}
+	URL_HASH MD5=${BOOST_MD5}
-  PREFIX ${BUILD_DIR}/boost
+	PREFIX ${BUILD_DIR}/boost
-  UPDATE_COMMAND  ""
+	UPDATE_COMMAND	""
-  PATCH_COMMAND ${BOOST_PATCH_COMMAND}
+	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} variant=${BOOST_BUILD_TYPE} 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(
+		external_boost
+		Make_Python_Environment
+	)
+endif()

build_files/build_environment/cmake/bzip2.cmake

@@ -1,39 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(BZIP2_PREFIX "${LIBDIR}/bzip2")
-set(BZIP2_CONFIGURE_ENV echo .)
-set(BZIP2_CONFIGURATION_ARGS)
-
-if(UNIX AND NOT APPLE)
-  set(BZIP2_LDFLAGS "-Wl,--as-needed")
-  set(BZIP2_CFLAGS "-fPIC -Wall -Winline -O2 -g -D_FILE_OFFSET_BITS=64")
-  set(BZIP2_CONFIGURE_ENV ${BZIP2_CONFIGURE_ENV} && export LDFLAGS=${BZIP2_LDFLAGS} && export CFLAGS=${BZIP2_CFLAGS}
-    && export PREFIX=${BZIP2_PREFIX})
-endif()
-
-ExternalProject_Add(external_bzip2
-  URL ${BZIP2_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH SHA256=${BZIP2_HASH}
-  PREFIX ${BUILD_DIR}/bzip2
-  CONFIGURE_COMMAND echo .
-  BUILD_COMMAND ${BZIP2_CONFIGURE_ENV} && cd ${BUILD_DIR}/bzip2/src/external_bzip2/ && make CFLAGS=${BZIP2_CFLAGS} LDFLAGS=${BZIP2_LDFLAGS} -j${MAKE_THREADS}
-  INSTALL_COMMAND ${BZIP2_CONFIGURE_ENV} && cd ${BUILD_DIR}/bzip2/src/external_bzip2/ && make CFLAGS=${BZIP2_CFLAGS} LDFLAGS=${BZIP2_LDFLAGS} PREFIX=${BZIP2_PREFIX} install
-  INSTALL_DIR ${LIBDIR}/bzip2
-)

build_files/build_environment/cmake/check_software.cmake

@@ -1,59 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-if(UNIX)
-  if(APPLE)
-    set(_libtoolize_name glibtoolize)
-  else()
-    set(_libtoolize_name libtoolize)
-  endif()
-
-  set(_required_software
-    autoconf
-    automake
-    ${_libtoolize_name}
-    nasm
-    yasm
-    tclsh
-  )
-
-  foreach(_software ${_required_software})
-    find_program(_software_find NAMES ${_software})
-    if(NOT _software_find)
-      set(_software_missing "${_software_missing}${_software} ")
-    endif()
-    unset(_software_find CACHE)
-  endforeach()
-
-  if(_software_missing)
-    message(
-      "\n"
-      "Missing software for building Blender dependencies:\n"
-      "  ${_software_missing}\n"
-      "\n"
-      "On Debian and Ubuntu:\n"
-      "  apt install autoconf automake libtool yasm nasm tcl\n"
-      "\n"
-      "On macOS (with homebrew):\n"
-      "  brew install cmake autoconf automake libtool yasm nasm\n"
-      "\n"
-      "Other platforms:\n"
-      "  Install equivalent packages.\n")
-    message(FATAL_ERROR "Install missing software before continuing")
-  endif()
-endif()

build_files/build_environment/cmake/clang.cmake

@@ -17,45 +17,38 @@
 # ***** 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=MD
+	-DLLVM_USE_CRT_RELEASE=MT
-  -DLLVM_USE_CRT_DEBUG=MDd
+	-DLLVM_USE_CRT_DEBUG=MTd
-  -DLLVM_CONFIG=${LIBDIR}/llvm/bin/llvm-config
 )
-
-if(WIN32)
-  set(CLANG_GENERATOR "Ninja")
-else()
-  set(CLANG_GENERATOR "Unix Makefiles")
-endif()
-
-
 ExternalProject_Add(external_clang
-  URL ${CLANG_URI}
+	URL ${CLANG_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${CLANG_HASH}
+	URL_HASH MD5=${CLANG_HASH}
-  PREFIX ${BUILD_DIR}/clang
+	PATCH_COMMAND ${PATCH_CMD} -p 2 -N -R -d ${BUILD_DIR}/clang/src/external_clang < ${PATCH_DIR}/clang.diff
-  CMAKE_GENERATOR ${CLANG_GENERATOR}
+	PREFIX ${BUILD_DIR}/clang
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/clang ${DEFAULT_CMAKE_FLAGS} ${CLANG_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/clang ${DEFAULT_CMAKE_FLAGS} ${CLANG_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/clang
+	INSTALL_DIR ${LIBDIR}/clang
 )
 
 if(MSVC)
-  if(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/ &&
-  endif()
+			${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/clang/include/ ${HARVEST_TARGET}/llvm/debug/include/
-  ExternalProject_Add_Step(external_clang after_install
+		)
-    COMMAND ${CLANG_HARVEST_COMMAND}
+	endif()
-    DEPENDEES mkdir update patch download configure build install
+	ExternalProject_Add_Step(external_clang after_install
-  )
+		COMMAND ${CLANG_HARVEST_COMMAND}
+		DEPENDEES mkdir update patch download configure build install
+	)
 endif()
 
 add_dependencies(
-  external_clang
+	external_clang
-  ll
+	ll
 )

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
 )

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
 )

build_files/build_environment/cmake/embree.cmake

@@ -1,69 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# Note the utility apps may use png/tiff/gif system libraries, but the
-# library itself does not depend on them, so should give no problems.
-
-set(EMBREE_EXTRA_ARGS
-  -DEMBREE_ISPC_SUPPORT=OFF
-  -DEMBREE_TUTORIALS=OFF
-  -DEMBREE_STATIC_LIB=ON
-  -DEMBREE_RAY_MASK=ON
-  -DEMBREE_FILTER_FUNCTION=ON
-  -DEMBREE_BACKFACE_CULLING=OFF
-  -DEMBREE_TASKING_SYSTEM=INTERNAL
-  -DEMBREE_MAX_ISA=AVX2
-)
-
-if(WIN32)
-  set(EMBREE_BUILD_DIR ${BUILD_MODE}/)
-else()
-  set(EMBREE_BUILD_DIR)
-endif()
-
-ExternalProject_Add(external_embree
-  URL ${EMBREE_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${EMBREE_HASH}
-  PREFIX ${BUILD_DIR}/embree
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/embree ${DEFAULT_CMAKE_FLAGS} ${EMBREE_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/embree
-)
-if(WIN32)
-
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_embree after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/embree ${HARVEST_TARGET}/embree
-      DEPENDEES install
-    )
-  else()
-  ExternalProject_Add_Step(external_embree after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree3.lib ${HARVEST_TARGET}/embree/lib/embree3_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_avx.lib ${HARVEST_TARGET}/embree/lib/embree_avx_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_avx2.lib ${HARVEST_TARGET}/embree/lib/embree_avx2_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/embree_sse42.lib ${HARVEST_TARGET}/embree/lib/embree_sse42_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/lexers.lib ${HARVEST_TARGET}/embree/lib/lexers_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/math.lib ${HARVEST_TARGET}/embree/lib/math_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/simd.lib ${HARVEST_TARGET}/embree/lib/simd_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/sys.lib ${HARVEST_TARGET}/embree/lib/sys_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/embree/lib/tasking.lib ${HARVEST_TARGET}/embree/lib/tasking_d.lib
-      DEPENDEES install
-    )
-  endif()
-
-endif()

build_files/build_environment/cmake/faad.cmake

@@ -18,23 +18,18 @@
 
 set(FAAD_EXTRA_ARGS)
 
-if(WIN32)
-  set(FAAD_EXTRA_CONFIGURE "utils\\win32\\ac2ver.exe" "faad2" "configure.ac" > libfaad\\win32_ver.h)
-else()
-  set(FAAD_EXTRA_CONFIGURE echo .)
-endif()
-
 ExternalProject_Add(external_faad
-  URL ${FAAD_URI}
+	URL ${FAAD_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${FAAD_HASH}
+	URL_HASH MD5=${FAAD_HASH}
-  PREFIX ${BUILD_DIR}/faad
+	PREFIX ${BUILD_DIR}/faad
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && ${FAAD_EXTRA_CONFIGURE} && ${CONFIGURE_COMMAND} --disable-shared --enable-static --prefix=${LIBDIR}/faad
+	PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/faad/src/external_faad < ${PATCH_DIR}/libfaad.diff
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make -j${MAKE_THREADS}
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && ${CONFIGURE_COMMAND} --disable-shared --enable-static --prefix=${LIBDIR}/faad
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make install
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make -j${MAKE_THREADS}
-  INSTALL_DIR ${LIBDIR}/faad
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/faad/src/external_faad/ && make install
+	INSTALL_DIR ${LIBDIR}/faad
 )
 
 if(MSVC)
-  set_target_properties(external_faad PROPERTIES FOLDER Mingw)
+	set_target_properties(external_faad PROPERTIES FOLDER Mingw)
 endif()

build_files/build_environment/cmake/ffi.cmake

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

build_files/build_environment/cmake/ffmpeg.cmake

@@ -16,139 +16,121 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-set(FFMPEG_CFLAGS "-I${mingw_LIBDIR}/lame/include -I${mingw_LIBDIR}/openjpeg/include/ -I${mingw_LIBDIR}/ogg/include -I${mingw_LIBDIR}/vorbis/include -I${mingw_LIBDIR}/theora/include -I${mingw_LIBDIR}/opus/include -I${mingw_LIBDIR}/vpx/include -I${mingw_LIBDIR}/x264/include -I${mingw_LIBDIR}/xvidcore/include -I${mingw_LIBDIR}/zlib/include")
+set(FFMPEG_CFLAGS "-I${mingw_LIBDIR}/lame/include -I${mingw_LIBDIR}/openjpeg/include/ -I${mingw_LIBDIR}/ogg/include -I${mingw_LIBDIR}/vorbis/include -I${mingw_LIBDIR}/theora/include -I${mingw_LIBDIR}/vpx/include -I${mingw_LIBDIR}/x264/include -I${mingw_LIBDIR}/xvidcore/include -I${mingw_LIBDIR}/dirac/include/dirac -I${mingw_LIBDIR}/schroedinger/include/schroedinger-1.0 -I${mingw_LIBDIR}/zlib/include")
-set(FFMPEG_LDFLAGS "-L${mingw_LIBDIR}/lame/lib -L${mingw_LIBDIR}/openjpeg/lib -L${mingw_LIBDIR}/ogg/lib -L${mingw_LIBDIR}/vorbis/lib -L${mingw_LIBDIR}/theora/lib -L${mingw_LIBDIR}/opus/lib -L${mingw_LIBDIR}/vpx/lib -L${mingw_LIBDIR}/x264/lib -L${mingw_LIBDIR}/xvidcore/lib -L${mingw_LIBDIR}/zlib/lib")
+set(FFMPEG_LDFLAGS "-L${mingw_LIBDIR}/lame/lib -L${mingw_LIBDIR}/openjpeg/lib -L${mingw_LIBDIR}/ogg/lib -L${mingw_LIBDIR}/vorbis/lib -L${mingw_LIBDIR}/theora/lib -L${mingw_LIBDIR}/vpx/lib -L${mingw_LIBDIR}/x264/lib -L${mingw_LIBDIR}/xvidcore/lib -L${mingw_LIBDIR}/dirac/lib -L${mingw_LIBDIR}/schroedinger/lib -L${mingw_LIBDIR}/orc/lib -L${mingw_LIBDIR}/zlib/lib")
-set(FFMPEG_EXTRA_FLAGS --pkg-config-flags=--static --extra-cflags=${FFMPEG_CFLAGS} --extra-ldflags=${FFMPEG_LDFLAGS})
+set(FFMPEG_EXTRA_FLAGS --extra-cflags=${FFMPEG_CFLAGS} --extra-ldflags=${FFMPEG_LDFLAGS})
-set(FFMPEG_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/openjpeg/lib/pkgconfig:${mingw_LIBDIR}/x264/lib/pkgconfig:${mingw_LIBDIR}/vorbis/lib/pkgconfig:${mingw_LIBDIR}/ogg/lib/pkgconfig:${mingw_LIBDIR}:${mingw_LIBDIR}/vpx/lib/pkgconfig:${mingw_LIBDIR}/theora/lib/pkgconfig:${mingw_LIBDIR}/openjpeg/lib/pkgconfig:${mingw_LIBDIR}/opus/lib/pkgconfig:)
+set(FFMPEG_ENV PKG_CONFIG_PATH=${mingw_LIBDIR}/schroedinger/lib/pkgconfig:${mingw_LIBDIR}/orc/lib/pkgconfig:${mingw_LIBDIR}/x264/lib/pkgconfig:${mingw_LIBDIR})
 
 if(WIN32)
-  set(FFMPEG_ENV set ${FFMPEG_ENV} &&)
+	set(FFMPEG_ENV set ${FFMPEG_ENV} &&)
-  set(FFMPEG_EXTRA_FLAGS
+	set(FFMPEG_EXTRA_FLAGS
-    ${FFMPEG_EXTRA_FLAGS}
+		${FFMPEG_EXTRA_FLAGS}
-    --disable-static
+		--disable-static
-    --enable-shared
+		--enable-shared
-    --enable-w32threads
+		--enable-w32threads
-    --disable-pthreads
+		--disable-pthreads
-    --enable-libopenjpeg
+		--enable-libopenjpeg
-  )
+	)
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
-    set(FFMPEG_EXTRA_FLAGS
-      ${FFMPEG_EXTRA_FLAGS}
-      --x86asmexe=yasm
-    )
-  endif()
 else()
-  set(FFMPEG_EXTRA_FLAGS
+	set(FFMPEG_EXTRA_FLAGS
-    ${FFMPEG_EXTRA_FLAGS}
+		${FFMPEG_EXTRA_FLAGS}
-    --enable-static
+		--enable-static
-    --disable-shared
+		--disable-shared
-    --enable-libopenjpeg
+		--enable-libopenjpeg
-  )
+	)
 endif()
 
 if(APPLE)
-  set(FFMPEG_EXTRA_FLAGS
+	set(FFMPEG_EXTRA_FLAGS
-    ${FFMPEG_EXTRA_FLAGS}
+		${FFMPEG_EXTRA_FLAGS}
-    --target-os=darwin
+		--target-os=darwin
-    )
+		)
 endif()
 
 ExternalProject_Add(external_ffmpeg
-  URL ${FFMPEG_URI}
+	URL ${FFMPEG_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${FFMPEG_HASH}
+	URL_HASH MD5=${FFMPEG_HASH}
-  # OpenJpeg is compiled with pthread support on Linux, which is all fine and is what we
+	PREFIX ${BUILD_DIR}/ffmpeg
-  # want for maximum runtime performance, but due to static nature of that library we
+	CONFIGURE_COMMAND ${CONFIGURE_ENV_NO_PERL} &&
-  # need to force ffmpeg to link against pthread, otherwise test program used by autoconf
+		cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ &&
-  # will fail. This patch does that in a way that is compatible with multiple distributions.
+		${FFMPEG_ENV} ${CONFIGURE_COMMAND_NO_TARGET} ${FFMPEG_EXTRA_FLAGS}
-  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/ffmpeg/src/external_ffmpeg < ${PATCH_DIR}/ffmpeg.diff
+		--disable-lzma
-  PREFIX ${BUILD_DIR}/ffmpeg
+		--disable-avfilter
-  CONFIGURE_COMMAND ${CONFIGURE_ENV_NO_PERL} &&
+		--disable-vdpau
-    cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ &&
+		--disable-bzlib
-    ${FFMPEG_ENV} ${CONFIGURE_COMMAND_NO_TARGET} ${FFMPEG_EXTRA_FLAGS}
+		--disable-libgsm
-    --disable-lzma
+		--disable-libspeex
-    --disable-avfilter
+		--enable-libvpx
-    --disable-vdpau
+		--prefix=${LIBDIR}/ffmpeg
-    --disable-bzlib
+		--enable-libschroedinger
-    --disable-libgsm
+		--enable-libtheora
-    --disable-libspeex
+		--enable-libvorbis
-    --enable-libvpx
+		--enable-zlib
-    --enable-libopus
+		--enable-stripping
-    --prefix=${LIBDIR}/ffmpeg
+		--enable-runtime-cpudetect
-    --enable-libtheora
+		--disable-vaapi
-    --enable-libvorbis
+		--disable-nonfree
-    --enable-zlib
+		--enable-gpl
-    --enable-stripping
+		--disable-postproc
-    --enable-runtime-cpudetect
+		--disable-x11grab
-    --disable-vaapi
+		--enable-libmp3lame
-    --disable-nonfree
+		--disable-librtmp
-    --enable-gpl
+		--enable-libx264
-    --disable-postproc
+		--enable-libxvid
-    --enable-libmp3lame
+		--disable-libopencore-amrnb
-    --disable-librtmp
+		--disable-libopencore-amrwb
-    --enable-libx264
+		--disable-libdc1394
-    --enable-libxvid
+		--disable-version3
-    --disable-libopencore-amrnb
+		--disable-debug
-    --disable-libopencore-amrwb
+		--enable-optimizations
-    --disable-libdc1394
+		--disable-sse
-    --disable-version3
+		--disable-ssse3
-    --disable-debug
+		--enable-ffplay
-    --enable-optimizations
+		--disable-openssl
-    --disable-sse
+		--disable-securetransport
-    --disable-ssse3
+		--disable-indev=avfoundation
-    --enable-ffplay
+		--disable-indev=qtkit
-    --disable-openssl
+		--disable-sdl
-    --disable-securetransport
+		--disable-gnutls
-    --disable-indev=avfoundation
+		--disable-vda
-    --disable-indev=qtkit
+		--disable-videotoolbox
-    --disable-sdl2
+		--disable-libxcb
-    --disable-gnutls
+		--disable-xlib
-    --disable-videotoolbox
+		--disable-audiotoolbox
-    --disable-libxcb
+		--disable-cuvid
-    --disable-xlib
+		--disable-nvenc
-    --disable-audiotoolbox
+		--disable-indev=jack
-    --disable-cuvid
+		--disable-indev=alsa
-    --disable-nvenc
+		--disable-outdev=alsa
-    --disable-indev=jack
+	PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/ffmpeg/src/external_ffmpeg < ${PATCH_DIR}/ffmpeg.diff
-    --disable-indev=alsa
+	BUILD_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make -j${MAKE_THREADS}
-    --disable-outdev=alsa
+	INSTALL_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make install
-    --disable-crystalhd
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ffmpeg ${DEFAULT_CMAKE_FLAGS}
-    --disable-sndio
+	INSTALL_DIR ${LIBDIR}/ffmpeg
-  BUILD_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV_NO_PERL} && cd ${BUILD_DIR}/ffmpeg/src/external_ffmpeg/ && make install
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ffmpeg ${DEFAULT_CMAKE_FLAGS}
-  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_opus
+	external_schroedinger
-  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
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/include ${HARVEST_TARGET}/ffmpeg/include
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/bin ${HARVEST_TARGET}/ffmpeg/lib
-    DEPENDEES install
-  )
 endif()

build_files/build_environment/cmake/fftw.cmake

@@ -19,29 +19,22 @@
 set(FFTW_EXTRA_ARGS)
 
 if(WIN32)
-  set(FFTW3_ENV set CFLAGS=-fno-stack-check -fno-stack-protector -mno-stack-arg-probe -fno-lto &&)
+	set(FFTW3_ENV set CFLAGS=-fno-stack-check -fno-stack-protector -mno-stack-arg-probe -fno-lto &&)
-  set(FFTW3_PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/fftw3/src/external_fftw3 < ${PATCH_DIR}/fftw3.diff)
+	set(FFTW3_PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/fftw3/src/external_fftw3 < ${PATCH_DIR}/fftw3.diff)
 endif()
 
 ExternalProject_Add(external_fftw3
-  URL ${FFTW_URI}
+	URL ${FFTW_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${FFTW_HASH}
+	URL_HASH MD5=${FFTW_HASH}
-  PREFIX ${BUILD_DIR}/fftw3
+	PREFIX ${BUILD_DIR}/fftw3
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && ${FFTW3_ENV} cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && ${CONFIGURE_COMMAND} --enable-static --prefix=${mingw_LIBDIR}/fftw3
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && ${FFTW3_ENV} cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && ${CONFIGURE_COMMAND} --enable-static --prefix=${mingw_LIBDIR}/fftw3
-  PATCH_COMMAND ${FFTW3_PATCH_COMMAND}
+	PATCH_COMMAND ${FFTW3_PATCH_COMMAND}
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && make -j${MAKE_THREADS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && make	-j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && make install
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/fftw3/src/external_fftw3/ && make install
-  INSTALL_DIR ${LIBDIR}/fftw3
+	INSTALL_DIR ${LIBDIR}/fftw3
 )
 
 if(MSVC)
-  set_target_properties(external_fftw3 PROPERTIES FOLDER Mingw)
+	set_target_properties(external_fftw3 PROPERTIES FOLDER Mingw)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_fftw3 after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/lib/libfftw3.a ${HARVEST_TARGET}/fftw3/lib/libfftw.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/include/fftw3.h ${HARVEST_TARGET}/fftw3/include/fftw3.h
-      DEPENDEES install
-    )
-  endif()
 endif()

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()

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
 )

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()

build_files/build_environment/cmake/freetype.cmake

@@ -16,28 +16,13 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-set(FREETYPE_EXTRA_ARGS
+set(FREETYPE_EXTRA_ARGS -DCMAKE_RELEASE_POSTFIX:STRING=2ST -DCMAKE_DEBUG_POSTFIX:STRING=2ST_d -DWITH_BZip2=OFF -DWITH_HarfBuzz=OFF)
-  -DCMAKE_RELEASE_POSTFIX:STRING=2ST
-  -DCMAKE_DEBUG_POSTFIX:STRING=2ST_d
-  -DWITH_BZip2=OFF
-  -DWITH_HarfBuzz=OFF
-  -DFT_WITH_HARFBUZZ=OFF
-  -DFT_WITH_BZIP2=OFF
-  -DCMAKE_DISABLE_FIND_PACKAGE_HarfBuzz=TRUE
-  -DCMAKE_DISABLE_FIND_PACKAGE_BZip2=TRUE)
 
 ExternalProject_Add(external_freetype
-  URL ${FREETYPE_URI}
+	URL ${FREETYPE_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${FREETYPE_HASH}
+	URL_HASH MD5=${FREETYPE_HASH}
-  PREFIX ${BUILD_DIR}/freetype
+	PREFIX ${BUILD_DIR}/freetype
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/freetype ${DEFAULT_CMAKE_FLAGS} ${FREETYPE_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/freetype ${DEFAULT_CMAKE_FLAGS} ${FREETYPE_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/freetype
+	INSTALL_DIR ${LIBDIR}/freetype
 )
-
-if(BUILD_MODE STREQUAL Release AND WIN32)
-  ExternalProject_Add_Step(external_freetype after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype ${HARVEST_TARGET}/freetype
-    DEPENDEES install
-  )
-endif()

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
 )

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
 )

build_files/build_environment/cmake/harvest.cmake

@@ -21,84 +21,187 @@
 ########################################################################
 
 if(NOT DEFINED HARVEST_TARGET)
-  set(HARVEST_TARGET ${CMAKE_CURRENT_SOURCE_DIR}/Harvest)
+	set(HARVEST_TARGET ${CMAKE_CURRENT_SOURCE_DIR}/Harvest)
 endif()
 message("HARVEST_TARGET = ${HARVEST_TARGET}")
 
 if(WIN32)
 if(BUILD_MODE STREQUAL Release)
-  add_custom_target(Harvest_Release_Results
+	add_custom_target(Harvest_Release_Results
-    COMMAND # jpeg rename libfile + copy include
+				# Zlib Rename the lib file and copy the include/bin folders
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
+		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstatic.lib ${HARVEST_TARGET}/zlib/lib/libz_st.lib &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zlib/include/ ${HARVEST_TARGET}/zlib/include/ &&
-        # OpenImageIO
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zlib/bin/ ${HARVEST_TARGET}/zlib/bin/ &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include &&
+				# jpeg rename libfile + copy include
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib &&
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/idiff.exe ${HARVEST_TARGET}/OpenImageIO/bin/idiff.exe &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpg/include/ ${HARVEST_TARGET}/jpeg/include/ &&
-        # png
+				# FreeType, straight up copy
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib ${HARVEST_TARGET}/png/lib/libpng.lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freetype ${HARVEST_TARGET}/freetype &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/ &&
+				# pthreads, rename include dir
-        # freeglut-> opengl
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/inc/ ${HARVEST_TARGET}/pthreads/include/ &&
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/freeglut/lib/freeglut_static.lib ${HARVEST_TARGET}/opengl/lib/freeglut_static.lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/lib/ ${HARVEST_TARGET}/pthreads/lib &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freeglut/include/ ${HARVEST_TARGET}/opengl/include/ &&
+				# ffmpeg copy include+bin
-        # glew-> opengl
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/include ${HARVEST_TARGET}/ffmpeg/include &&
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/glew/lib/libglew32.lib ${HARVEST_TARGET}/opengl/lib/glew.lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ffmpeg/bin ${HARVEST_TARGET}/ffmpeg/lib &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/glew/include/ ${HARVEST_TARGET}/opengl/include/ &&
+				# sdl merge bin/lib folder, copy include
-        # sndfile
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/include/sdl2 ${HARVEST_TARGET}/sdl/include &&
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/lib/libsndfile.dll.a ${HARVEST_TARGET}/sndfile/lib/libsndfile-1.lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/lib ${HARVEST_TARGET}/sdl/lib &&
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/bin/libsndfile-1.dll ${HARVEST_TARGET}/sndfile/lib/libsndfile-1.dll &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/bin ${HARVEST_TARGET}/sdl/lib &&
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/include/sndfile.h ${HARVEST_TARGET}/sndfile/include/sndfile.h &&
+				# openal
-        # tiff
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/lib/openal32.lib ${HARVEST_TARGET}/openal/lib/openal32.lib &&
-        ${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiff.lib ${HARVEST_TARGET}/tiff/lib/libtiff.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/bin/openal32.dll ${HARVEST_TARGET}/openal/lib/openal32.dll &&
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tiff/include/ ${HARVEST_TARGET}/tiff/include/ &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openal/include/ ${HARVEST_TARGET}/openal/include/ &&
-        # hidapi
+				# OpenImageIO
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hidapi/ ${HARVEST_TARGET}/hidapi/
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include &&
-    DEPENDS
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib &&
-  )
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenImageIO/bin/idiff.exe ${HARVEST_TARGET}/OpenImageIO/bin/idiff.exe &&
+				# openEXR
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/ilmbase ${HARVEST_TARGET}/openexr &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/lib ${HARVEST_TARGET}/openexr/lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openexr/include ${HARVEST_TARGET}/openexr/include &&
+				# png
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_static.lib ${HARVEST_TARGET}/png/lib/libpng.lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/png/include/ ${HARVEST_TARGET}/png/include/ &&
+				# fftw3
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/lib/libfftw3.a ${HARVEST_TARGET}/fftw3/lib/libfftw.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/fftw3/include/fftw3.h ${HARVEST_TARGET}/fftw3/include/fftw3.h &&
+				# freeglut-> opengl
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/freeglut/lib/freeglut_static.lib ${HARVEST_TARGET}/opengl/lib/freeglut_static.lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/freeglut/include/ ${HARVEST_TARGET}/opengl/include/ &&
+				# glew-> opengl
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/glew/lib/libglew32.lib ${HARVEST_TARGET}/opengl/lib/glew.lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/glew/include/ ${HARVEST_TARGET}/opengl/include/ &&
+				# sndfile
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/lib/libsndfile.dll.a ${HARVEST_TARGET}/sndfile/lib/libsndfile-1.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/bin/libsndfile-1.dll ${HARVEST_TARGET}/sndfile/lib/libsndfile-1.dll &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/sndfile/include/sndfile.h ${HARVEST_TARGET}/sndfile/include/sndfile.h &&
+				# tiff
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiff.lib ${HARVEST_TARGET}/tiff/lib/libtiff.lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tiff/include/ ${HARVEST_TARGET}/tiff/include/ &&
+				# iconv
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/iconv/lib/libiconv.a ${HARVEST_TARGET}/iconv/lib/iconv.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/iconv/include/iconv.h ${HARVEST_TARGET}/iconv/include/iconv.h &&
+				# opencolorIO
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenColorIO/ ${HARVEST_TARGET}/opencolorio &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/OpenColorIO/lib/OpenColorIO.dll ${HARVEST_TARGET}/opencolorio/bin/OpenColorIO.dll &&
+				# Osl
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/osl/ ${HARVEST_TARGET}/osl &&
+				# OpenVDB
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openVDB/ ${HARVEST_TARGET}/openVDB &&
+				# blosc
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc.lib ${HARVEST_TARGET}/blosc/lib/libblosc.lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/blosc/include/ ${HARVEST_TARGET}/blosc/include/ &&
+				# tbb
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb.lib &&
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tbb/include/ ${HARVEST_TARGET}/tbb/include/ &&
+				# opencollada
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencollada/ ${HARVEST_TARGET}/opencollada/ &&
+				# opensubdiv
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opensubdiv ${HARVEST_TARGET}/opensubdiv &&
+				# python
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/python/ ${HARVEST_TARGET}/python/ &&
+				# alembic
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/alembic ${HARVEST_TARGET}/alembic &&
+				# BlendThumb
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/BlendThumb64/bin/blendthumb.dll ${HARVEST_TARGET}/ThumbHandler/lib/BlendThumb64.dll &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/BlendThumb32/bin/blendthumb.dll ${HARVEST_TARGET}/ThumbHandler/lib/BlendThumb.dll &&
+				# python
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}.tar.gz &&
+				# numpy
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}.tar.gz &&
+				# hidapi
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hidapi/ ${HARVEST_TARGET}/hidapi/ &&
+				# webp, straight up copy
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/webp ${HARVEST_TARGET}/webp
+		DEPENDS
+	)
 endif()
 
 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 &&
-        # hdf5
+				# ilmbase+openexr
-        ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hdf5/lib ${HARVEST_TARGET}/hdf5/lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/ilmbase/lib/Half.lib ${HARVEST_TARGET}/openexr/lib/Half_d.lib &&
-    DEPENDS Package_Python
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/ilmbase/lib/Iex-2_2.lib ${HARVEST_TARGET}/openexr/lib/Iex-2_2_d.lib &&
-  )
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/ilmbase/lib/IexMath-2_2.lib ${HARVEST_TARGET}/openexr/lib/IexMath-2_2_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/ilmbase/lib/IlmThread-2_2.lib ${HARVEST_TARGET}/openexr/lib/IlmThread-2_2_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/ilmbase/lib/Imath-2_2.lib ${HARVEST_TARGET}/openexr/lib/Imath-2_2_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/lib/IlmImf-2_2.lib ${HARVEST_TARGET}/openexr/lib/IlmImf-2_2_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/openexr/lib/IlmImfUtil-2_2.lib ${HARVEST_TARGET}/openexr/lib/IlmImfUtil-2_2_d.lib &&
+				# opencollada
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/buffer.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/buffer_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/ftoa.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/ftoa_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/GeneratedSaxParser.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/GeneratedSaxParser_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/MathMLSolver.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/MathMLSolver_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADABaseUtils.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADABaseUtils_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADAFramework.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADAFramework_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADAStreamWriter.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADAStreamWriter_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/pcre.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/pcre_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/UTF.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/UTF_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/xml.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/xml_d.lib &&
+				# blosc
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc_d.lib ${HARVEST_TARGET}/blosc/lib/libblosc_d.lib &&
+				# osl
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslcomp.lib ${HARVEST_TARGET}/osl/lib/oslcomp_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslexec.lib ${HARVEST_TARGET}/osl/lib/oslexec_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslquery.lib ${HARVEST_TARGET}/osl/lib/oslquery_d.lib &&
+				# opensubdiv
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opensubdiv/lib/osdCPU.lib ${HARVEST_TARGET}/opensubdiv/lib/osdCPU_d.lib &&
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/opensubdiv/lib/osdGPU.lib ${HARVEST_TARGET}/opensubdiv/lib/osdGPU_d.lib &&
+				# tbb
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb_debug.lib &&
+				# openvdb
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/openvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb_d.lib &&
+				# python
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/python/ ${HARVEST_TARGET}/python/ &&
+				# alembic
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/alembic/lib/alembic.lib ${HARVEST_TARGET}/alembic/lib/alembic_d.lib &&
+				# hdf5
+				${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/hdf5/lib ${HARVEST_TARGET}/hdf5/lib &&
+				# numpy
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}d.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}d.tar.gz &&
+				# python
+				${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_d.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_d.tar.gz
+		DEPENDS Package_Python
+	)
 endif()
 
 else(WIN32)
 
 function(harvest from to)
-  set(pattern "")
+	set(pattern "")
-  foreach(f ${ARGN})
+	foreach(f ${ARGN})
-    set(pattern ${f})
+		set(pattern ${f})
-  endforeach()
+	endforeach()
 
-  if(pattern STREQUAL "")
+	if(pattern STREQUAL "")
-    get_filename_component(dirpath ${to} DIRECTORY)
+		get_filename_component(dirpath ${to} DIRECTORY)
-    get_filename_component(filename ${to} NAME)
+		get_filename_component(filename ${to} NAME)
-    install(
+		install(
-      FILES ${LIBDIR}/${from}
+			FILES ${LIBDIR}/${from}
-      DESTINATION ${HARVEST_TARGET}/${dirpath}
+			DESTINATION ${HARVEST_TARGET}/${dirpath}
-      RENAME ${filename})
+			RENAME ${filename})
-  else()
+	else()
-    install(
+		install(
-      DIRECTORY ${LIBDIR}/${from}/
+			DIRECTORY ${LIBDIR}/${from}/
-      DESTINATION ${HARVEST_TARGET}/${to}
+			DESTINATION ${HARVEST_TARGET}/${to}
-      USE_SOURCE_PERMISSIONS
+			USE_SOURCE_PERMISSIONS
-      FILES_MATCHING PATTERN ${pattern}
+			FILES_MATCHING PATTERN ${pattern}
-      PATTERN "pkgconfig" EXCLUDE
+			PATTERN "pkgconfig" EXCLUDE
-      PATTERN "cmake" EXCLUDE
+			PATTERN "cmake" EXCLUDE
-      PATTERN "__pycache__" EXCLUDE
+			PATTERN "clang" EXCLUDE
-      PATTERN "tests" EXCLUDE)
+			PATTERN "__pycache__" EXCLUDE
-  endif()
+			PATTERN "tests" EXCLUDE)
+	endif()
 endfunction()
 
 harvest(alembic/include alembic/include "*.h")
 harvest(alembic/lib/libAlembic.a alembic/lib/libAlembic.a)
 harvest(alembic/bin alembic/bin "*")
+harvest(blosc/lib openvdb/lib "*.a")
 harvest(boost/include boost/include "*")
 harvest(boost/lib boost/lib "*.a")
 harvest(ffmpeg/include ffmpeg/include "*.h")
@@ -110,42 +213,24 @@ harvest(freetype/include freetype/include "*.h")
 harvest(freetype/lib/libfreetype2ST.a freetype/lib/libfreetype.a)
 harvest(glew/include glew/include "*.h")
 harvest(glew/lib glew/lib "*.a")
+harvest(ilmbase openexr "*")
+harvest(ilmbase/include openexr/include "*.h")
 harvest(jemalloc/include jemalloc/include "*.h")
 harvest(jemalloc/lib jemalloc/lib "*.a")
 harvest(jpg/include jpeg/include "*.h")
 harvest(jpg/lib jpeg/lib "libjpeg.a")
 harvest(lame/lib ffmpeg/lib "*.a")
-harvest(clang/bin llvm/bin "clang-format")
-harvest(clang/include llvm/include "*")
-harvest(llvm/include llvm/include "*")
 harvest(llvm/bin llvm/bin "llvm-config")
 harvest(llvm/lib llvm/lib "libLLVM*.a")
-if(APPLE)
-  harvest(openmp/lib openmp/lib "*")
-  harvest(openmp/include openmp/include "*.h")
-endif()
 harvest(ogg/lib ffmpeg/lib "*.a")
 harvest(openal/include openal/include "*.h")
 if(UNIX AND NOT APPLE)
-  harvest(openal/lib openal/lib "*.a")
+	harvest(openal/lib openal/lib "*.a")
-
-  harvest(blosc/include blosc/include "*.h")
-  harvest(blosc/lib blosc/lib "*.a")
-
-  harvest(zlib/include zlib/include "*.h")
-  harvest(zlib/lib zlib/lib "*.a")
-
-  harvest(xml2/include xml2/include "*.h")
-  harvest(xml2/lib xml2/lib "*.a")
-else()
-  harvest(blosc/lib openvdb/lib "*.a")
-  harvest(xml2/lib opencollada/lib "*.a")
 endif()
 harvest(opencollada/include/opencollada opencollada/include "*.h")
 harvest(opencollada/lib/opencollada opencollada/lib "*.a")
 harvest(opencolorio/include opencolorio/include "*.h")
 harvest(opencolorio/lib opencolorio/lib "*.a")
-harvest(opencolorio/lib/static opencolorio/lib "*.a")
 harvest(openexr/include openexr/include "*.h")
 harvest(openexr/lib openexr/lib "*.a")
 harvest(openimageio/bin openimageio/bin "idiff")
@@ -153,16 +238,13 @@ harvest(openimageio/bin openimageio/bin "maketx")
 harvest(openimageio/bin openimageio/bin "oiiotool")
 harvest(openimageio/include openimageio/include "*")
 harvest(openimageio/lib openimageio/lib "*.a")
-harvest(openimagedenoise/include openimagedenoise/include "*")
+harvest(openjpeg/include/openjpeg-1.5 openjpeg/include "*.h")
-harvest(openimagedenoise/lib openimagedenoise/lib "*.a")
-harvest(openjpeg/include/openjpeg-2.3 openjpeg/include "*.h")
 harvest(openjpeg/lib openjpeg/lib "*.a")
 harvest(opensubdiv/include opensubdiv/include "*.h")
 harvest(opensubdiv/lib opensubdiv/lib "*.a")
-harvest(openvdb/include/openvdb openvdb/include/openvdb "*.h")
+harvest(openvdb/include/openvdb/openvdb openvdb/include/openvdb "*.h")
 harvest(openvdb/lib openvdb/lib "*.a")
-harvest(xr_openxr_sdk/include/openxr xr_openxr_sdk/include/openxr "*.h")
+harvest(orc/lib/liborc-0.4.a ffmpeg/lib/liborc.a)
-harvest(xr_openxr_sdk/lib xr_openxr_sdk/lib "*.a")
 harvest(osl/bin osl/bin "oslc")
 harvest(osl/include osl/include "*.h")
 harvest(osl/lib osl/lib "*.a")
@@ -172,6 +254,7 @@ harvest(png/lib png/lib "*.a")
 harvest(python/bin python/bin "python${PYTHON_SHORT_VERSION}m")
 harvest(python/include python/include "*h")
 harvest(python/lib python/lib "*")
+harvest(schroedinger/lib/libschroedinger-1.0.a ffmpeg/lib/libschroedinger.a)
 harvest(sdl/include/SDL2 sdl/include "*.h")
 harvest(sdl/lib sdl/lib "libSDL2.a")
 harvest(sndfile/include sndfile/include "*.h")
@@ -184,20 +267,10 @@ harvest(theora/lib ffmpeg/lib "*.a")
 harvest(tiff/include tiff/include "*.h")
 harvest(tiff/lib tiff/lib "*.a")
 harvest(vorbis/lib ffmpeg/lib "*.a")
-harvest(opus/lib ffmpeg/lib "*.a")
 harvest(vpx/lib ffmpeg/lib "*.a")
 harvest(webp/lib ffmpeg/lib "*.a")
 harvest(x264/lib ffmpeg/lib "*.a")
+harvest(xml2/lib opencollada/lib "*.a")
 harvest(xvidcore/lib ffmpeg/lib "*.a")
-harvest(embree/include embree/include "*.h")
-harvest(embree/lib embree/lib "*.a")
-harvest(usd/include usd/include "*.h")
-harvest(usd/lib/usd usd/lib/usd "*")
-harvest(usd/plugin usd/plugin "*")
-
-if(UNIX AND NOT APPLE)
-  harvest(libglu/lib mesa/lib "*.so*")
-  harvest(mesa/lib mesa/lib "*.so*")
-endif()
 
 endif()

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
 )

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
 )

build_files/build_environment/cmake/iconv.cmake

@@ -19,23 +19,16 @@
 set(ICONV_EXTRA_ARGS)
 
 ExternalProject_Add(external_iconv
-  URL ${ICONV_URI}
+	URL ${ICONV_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${ICONV_HASH}
+	URL_HASH MD5=${ICONV_HASH}
-  PREFIX ${BUILD_DIR}/iconv
+	PREFIX ${BUILD_DIR}/iconv
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && ${CONFIGURE_COMMAND} --enable-static --prefix=${mingw_LIBDIR}/iconv
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && ${CONFIGURE_COMMAND} --enable-static --prefix=${mingw_LIBDIR}/iconv
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && make -j${MAKE_THREADS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && make install
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/iconv/src/external_iconv/ && make install
-  INSTALL_DIR ${LIBDIR}/iconv
+	INSTALL_DIR ${LIBDIR}/iconv
 )
 
 if(MSVC)
-  set_target_properties(external_iconv PROPERTIES FOLDER Mingw)
+	set_target_properties(external_iconv PROPERTIES FOLDER Mingw)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_iconv after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/iconv/lib/libiconv.a ${HARVEST_TARGET}/iconv/lib/iconv.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/iconv/include/iconv.h ${HARVEST_TARGET}/iconv/include/iconv.h
-      DEPENDEES install
-    )
-  endif()
 endif()

build_files/build_environment/cmake/ilmbase.cmake

@@ -0,0 +1,35 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+if(WIN32)
+	set(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}")
+endif()
+
+set(ILMBASE_EXTRA_ARGS
+	-DBUILD_SHARED_LIBS=OFF
+	-DCMAKE_CXX_STANDARD_LIBRARIES=${ILMBASE_CMAKE_CXX_STANDARD_LIBRARIES}
+)
+
+ExternalProject_Add(external_ilmbase
+	URL ${ILMBASE_URI}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	URL_HASH MD5=${ILMBASE_HASH}
+	PREFIX ${BUILD_DIR}/ilmbase
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/ilmbase ${DEFAULT_CMAKE_FLAGS} ${ILMBASE_EXTRA_ARGS}
+	INSTALL_DIR ${LIBDIR}/openexr
+)

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
 )

build_files/build_environment/cmake/jpeg.cmake

@@ -17,49 +17,49 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(WIN32)
-  # cmake for windows
+	# cmake for windows
-  set(JPEG_EXTRA_ARGS -DNASM=${NASM_PATH} -DWITH_JPEG8=ON  -DCMAKE_DEBUG_POSTFIX=d)
+	set(JPEG_EXTRA_ARGS  -DWITH_JPEG8=ON  -DCMAKE_DEBUG_POSTFIX=d)
 
-  ExternalProject_Add(external_jpeg
+	ExternalProject_Add(external_jpeg
-    URL ${JPEG_URI}
+		URL ${JPEG_URI}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH MD5=${JPEG_HASH}
+		URL_HASH MD5=${JPEG_HASH}
-    PREFIX ${BUILD_DIR}/jpg
+		PREFIX ${BUILD_DIR}/jpg
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
+		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
-    INSTALL_DIR ${LIBDIR}/jpg
+		INSTALL_DIR ${LIBDIR}/jpg
-  )
+	)
 
-  if(BUILD_MODE STREQUAL Debug)
+	if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_jpeg after_install
+		ExternalProject_Add_Step(external_jpeg after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpegd${LIBEXT}  ${LIBDIR}/jpg/lib/jpeg${LIBEXT}
+			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpegd${LIBEXT}  ${LIBDIR}/jpg/lib/jpeg${LIBEXT}
-      DEPENDEES install
+			DEPENDEES install
-    )
+		)
-  endif()
+	endif()
 
-  if(BUILD_MODE STREQUAL Release)
+	if(BUILD_MODE STREQUAL Release)
-    set(JPEG_LIBRARY jpeg-static${LIBEXT})
+		set(JPEG_LIBRARY jpeg-static${LIBEXT})
-  else()
+	else()
-    set(JPEG_LIBRARY jpeg-staticd${LIBEXT})
+		set(JPEG_LIBRARY jpeg-staticd${LIBEXT})
-  endif()
+	endif()
 else(WIN32)
-  # autoconf for unix
+	# autoconf for unix
-  if(APPLE)
+	if(APPLE)
-    set(JPEG_EXTRA_ARGS --host x86_64-apple-darwin --with-jpeg8)
+		set(JPEG_EXTRA_ARGS --host x86_64-apple-darwin --with-jpeg8)
-  else()
+	else()
-    set(JPEG_EXTRA_ARGS --with-jpeg8)
+		set(JPEG_EXTRA_ARGS --with-jpeg8)
-  endif()
+	endif()
 
-  ExternalProject_Add(external_jpeg
+	ExternalProject_Add(external_jpeg
-    URL ${JPEG_URI}
+		URL ${JPEG_URI}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
+		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH MD5=${JPEG_HASH}
+		URL_HASH MD5=${JPEG_HASH}
-    CONFIGURE_COMMAND ${CONFIGURE_ENV} && autoreconf -fiv && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/jpg NASM=yasm ${JPEG_EXTRA_ARGS}
+		CONFIGURE_COMMAND ${CONFIGURE_ENV} && autoreconf -fiv && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/jpg NASM=yasm ${JPEG_EXTRA_ARGS}
-    BUILD_IN_SOURCE 1
+		BUILD_IN_SOURCE 1
-    BUILD_COMMAND ${CONFIGURE_ENV} && make install
+		BUILD_COMMAND ${CONFIGURE_ENV} && make install
-    PREFIX ${BUILD_DIR}/jpg
+		PREFIX ${BUILD_DIR}/jpg
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
+		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/jpg ${DEFAULT_CMAKE_FLAGS} ${JPEG_EXTRA_ARGS}
-    INSTALL_DIR ${LIBDIR}/jpg
+		INSTALL_DIR ${LIBDIR}/jpg
-  )
+	)
 
-  set(JPEG_LIBRARY libjpeg${LIBEXT})
+	set(JPEG_LIBRARY libjpeg${LIBEXT})
 endif(WIN32)

build_files/build_environment/cmake/lame.cmake

@@ -18,30 +18,30 @@
 
 set(LAME_EXTRA_ARGS)
 if(MSVC)
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
-  set(LAME_EXTRA_ARGS CFLAGS=-msse)
+	set(LAME_EXTRA_ARGS CFLAGS=-msse)
-  endif()
+	endif()
 endif()
 
 ExternalProject_Add(external_lame
-  URL ${LAME_URI}
+	URL ${LAME_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${LAME_HASH}
+	URL_HASH MD5=${LAME_HASH}
-  PREFIX ${BUILD_DIR}/lame
+	PREFIX ${BUILD_DIR}/lame
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/lame --disable-shared --enable-static ${LAME_EXTRA_ARGS}
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/lame --disable-shared --enable-static ${LAME_EXTRA_ARGS}
-    --enable-export=full
+		--enable-export=full
-    --with-fileio=sndfile
+		--with-fileio=sndfile
-    --without-vorbis
+		--without-vorbis
-    --with-pic
+		--with-pic
-    --disable-mp3x
+		--disable-mp3x
-    --disable-mp3rtp
+		--disable-mp3rtp
-    --disable-gtktest
+		--disable-gtktest
-    --disable-frontend
+		--enable-export=full
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && make -j${MAKE_THREADS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && make install
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lame/src/external_lame/ && make install
-  INSTALL_DIR ${LIBDIR}/lame
+	INSTALL_DIR ${LIBDIR}/lame
 )
 
 if(MSVC)
-  set_target_properties(external_lame PROPERTIES FOLDER Mingw)
+	set_target_properties(external_lame PROPERTIES FOLDER Mingw)
 endif()

build_files/build_environment/cmake/lapack.cmake

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

build_files/build_environment/cmake/lcms.cmake

@@ -1,31 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(LCMS_EXTRA_ARGS
-)
-
-ExternalProject_Add(external_lcms
-  URL ${LCMS_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${LCMS_HASH}
-  PREFIX ${BUILD_DIR}/lcms
-  # Patch taken from ocio.
-  PATCH_COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_lcms.txt ${BUILD_DIR}/lcms/src/external_lcms/CMakeLists.txt
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/lcms ${DEFAULT_CMAKE_FLAGS} ${LCMS_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/lcms
-)

build_files/build_environment/cmake/libglu.cmake

@@ -1,40 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(LIBGLU_CFLAGS "-static-libgcc")
-set(LIBGLU_CXXFLAGS "-static-libgcc -static-libstdc++ -Bstatic -lstdc++ -Bdynamic -l:libstdc++.a")
-set(LIBGLU_LDFLAGS "-pthread -static-libgcc -static-libstdc++ -Bstatic -lstdc++ -Bdynamic -l:libstdc++.a")
-
-set(LIBGLU_EXTRA_FLAGS
-  CFLAGS=${LIBGLU_CFLAGS}
-  CXXFLAGS=${LIBGLU_CXXFLAGS}
-  LDFLAGS=${LIBGLU_LDFLAGS}
-)
-
-ExternalProject_Add(external_libglu
-  URL ${LIBGLU_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${LIBGLU_HASH}
-  PREFIX ${BUILD_DIR}/libglu
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/libglu/src/external_libglu/ &&
-    ${CONFIGURE_COMMAND_NO_TARGET} --prefix=${LIBDIR}/libglu ${LIBGLU_EXTRA_FLAGS}
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/libglu/src/external_libglu/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/libglu/src/external_libglu/ && make install
-  INSTALL_DIR ${LIBDIR}/libglu
-)

build_files/build_environment/cmake/llvm.cmake

@@ -17,45 +17,44 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(LLVM_EXTRA_ARGS
-  -DLLVM_USE_CRT_RELEASE=MD
+	-DLLVM_USE_CRT_RELEASE=MT
-  -DLLVM_USE_CRT_DEBUG=MDd
+	-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
-  -DLLVM_BUILD_LLVM_C_DYLIB=OFF
-  -DLLVM_ENABLE_UNWIND_TABLES=OFF
 )
 
 if(WIN32)
-  set(LLVM_GENERATOR "Ninja")
+	set(LLVM_GENERATOR "NMake Makefiles")
 else()
-  set(LLVM_GENERATOR "Unix Makefiles")
+	set(LLVM_GENERATOR "Unix Makefiles")
 endif()
 
 # short project name due to long filename issues on windows
 ExternalProject_Add(ll
-  URL ${LLVM_URI}
+	URL ${LLVM_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${LLVM_HASH}
+	URL_HASH MD5=${LLVM_HASH}
-  CMAKE_GENERATOR ${LLVM_GENERATOR}
+	CMAKE_GENERATOR ${LLVM_GENERATOR}
-  PREFIX ${BUILD_DIR}/ll
+	PREFIX ${BUILD_DIR}/ll
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/ll/src/ll < ${PATCH_DIR}/llvm.diff
+	PATCH_COMMAND ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/ll/src/ll < ${PATCH_DIR}/llvm-alloca-fix.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/llvm ${DEFAULT_CMAKE_FLAGS} ${LLVM_EXTRA_ARGS}
+	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/
+			${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/bin/ ${HARVEST_TARGET}/llvm/debug/bin/ &&
-    )
+			${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/include/ ${HARVEST_TARGET}/llvm/debug/include/
-  endif()
+		)
-  ExternalProject_Add_Step(ll after_install
+	endif()
-    COMMAND ${LLVM_HARVEST_COMMAND}
+	ExternalProject_Add_Step(ll after_install
-    DEPENDEES mkdir update patch download configure build install
+		COMMAND ${LLVM_HARVEST_COMMAND}
-  )
+		DEPENDEES mkdir update patch download configure build install
+	)
 endif()

build_files/build_environment/cmake/lzma.cmake

@@ -1,32 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(LZMA_PATCH_CMD echo .)
-
-ExternalProject_Add(external_lzma
-  URL ${LZMA_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH SHA256=${LZMA_HASH}
-  PREFIX ${BUILD_DIR}/lzma
-  PATCH_COMMAND ${LZMA_PATCH_CMD}
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/lzma
-    --disable-shared
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/lzma/src/external_lzma/ && make install
-  INSTALL_DIR ${LIBDIR}/lzma
-)

build_files/build_environment/cmake/mesa.cmake

@@ -1,54 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(MESA_CFLAGS "-static-libgcc")
-set(MESA_CXXFLAGS "-static-libgcc -static-libstdc++ -Bstatic -lstdc++ -Bdynamic -l:libstdc++.a")
-set(MESA_LDFLAGS "-L${LIBDIR}/zlib/lib -pthread -static-libgcc -static-libstdc++ -Bstatic -lstdc++ -Bdynamic -l:libstdc++.a -l:libz_pic.a")
-
-set(MESA_EXTRA_FLAGS
-  CFLAGS=${MESA_CFLAGS}
-  CXXFLAGS=${MESA_CXXFLAGS}
-  LDFLAGS=${MESA_LDFLAGS}
-  --enable-glx=gallium-xlib
-  --with-gallium-drivers=swrast
-  --disable-dri
-  --disable-gbm
-  --disable-egl
-  --disable-gles1
-  --disable-gles2
-  --disable-llvm-shared-libs
-  --with-llvm-prefix=${LIBDIR}/llvm
-)
-
-ExternalProject_Add(external_mesa
-  URL ${MESA_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${MESA_HASH}
-  PREFIX ${BUILD_DIR}/mesa
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/mesa/src/external_mesa/ &&
-    ${CONFIGURE_COMMAND_NO_TARGET} --prefix=${LIBDIR}/mesa ${MESA_EXTRA_FLAGS}
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/mesa/src/external_mesa/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/mesa/src/external_mesa/ && make install
-  INSTALL_DIR ${LIBDIR}/mesa
-)
-
-add_dependencies(
-  external_mesa
-  ll
-)

build_files/build_environment/cmake/numpy.cmake

@@ -17,33 +17,44 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(MSVC)
-  message("BIN >${PYTHON_BINARY}<")
+	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
+		${CMAKE_COMMAND} -E copy_directory "${BUILD_DIR}/python/src/external_python/run/lib/site-packages/numpy/core/include/numpy" "${LIBDIR}/python/include/python${PYTHON_SHORT_VERSION}/numpy" &&
+		${CMAKE_COMMAND} -E chdir "${BUILD_DIR}/numpy/src/external_numpy/build/lib.${PYTHON_ARCH2}-${PYTHON_SHORT_VERSION}${NUMPY_DIR_POSTFIX}"
+		${CMAKE_COMMAND} -E tar "cfvz" "${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz" "."
+	)
+	set(NUMPY_PATCH ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/numpy/src/external_numpy < ${PATCH_DIR}/numpy.diff )
+else()
+	set(NUMPY_INSTALL echo .)
+	set(NUMPY_PATCH echo .)
+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 ""
+	INSTALL_COMMAND ${NUMPY_INSTALL}
 )
 
 add_dependencies(
-  external_numpy
+	external_numpy
-  external_python
+	Make_Python_Environment
 )

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()

build_files/build_environment/cmake/openal.cmake

@@ -17,51 +17,28 @@
 # ***** 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)
-    # Ensure we have backends for playback.
-    set(OPENAL_EXTRA_ARGS
-      ${OPENAL_EXTRA_ARGS}
-      -DALSOFT_REQUIRE_ALSA=ON
-      -DALSOFT_REQUIRE_OSS=ON
-      -DALSOFT_REQUIRE_PULSEAUDIO=ON
-    )
-  endif()
-
-  ExternalProject_Add(external_openal
-    URL ${OPENAL_URI}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH MD5=${OPENAL_HASH}
-    PREFIX ${BUILD_DIR}/openal
-    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openal ${DEFAULT_CMAKE_FLAGS} ${OPENAL_EXTRA_ARGS}
-    INSTALL_DIR ${LIBDIR}/openal
-    PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openal/src/external_openal < ${PATCH_DIR}/openal.diff
-  )
-
-  if(WIN32)
-    ExternalProject_Add_Step(external_openal after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/lib/openal32.lib ${HARVEST_TARGET}/openal/lib/openal32.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/bin/openal32.dll ${HARVEST_TARGET}/openal/lib/openal32.dll
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openal/include/ ${HARVEST_TARGET}/openal/include/
-      DEPENDEES install
-    )
-  endif()
 
+	ExternalProject_Add(external_openal
+		URL ${OPENAL_URI}
+		DOWNLOAD_DIR ${DOWNLOAD_DIR}
+		URL_HASH MD5=${OPENAL_HASH}
+		PREFIX ${BUILD_DIR}/openal
+		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openal ${DEFAULT_CMAKE_FLAGS} ${OPENAL_EXTRA_ARGS}
+		INSTALL_DIR ${LIBDIR}/openal
+		PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openal/src/external_openal < ${PATCH_DIR}/openal.diff
+	)
 endif()

build_files/build_environment/cmake/opencollada.cmake

@@ -16,50 +16,25 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-if(UNIX)
+if(UNIX AND NOT APPLE)
-  set(OPENCOLLADA_EXTRA_ARGS
+	set(OPENCOLLADA_EXTRA_ARGS
-    -DLIBXML2_INCLUDE_DIR=${LIBDIR}/xml2/include/libxml2
+		-DLIBXML2_INCLUDE_DIR=${LIBDIR}/xml2/include/libxml2
-    -DLIBXML2_LIBRARIES=${LIBDIR}/xml2/lib/libxml2.a)
+		-DLIBXML2_LIBRARIES=${LIBDIR}/xml2/lib/libxml2.a)
 endif()
 
 ExternalProject_Add(external_opencollada
-  URL ${OPENCOLLADA_URI}
+	URL ${OPENCOLLADA_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${OPENCOLLADA_HASH}
+	URL_HASH MD5=${OPENCOLLADA_HASH}
-  PREFIX ${BUILD_DIR}/opencollada
+	PREFIX ${BUILD_DIR}/opencollada
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencollada/src/external_opencollada < ${PATCH_DIR}/opencollada.diff
+	PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencollada/src/external_opencollada < ${PATCH_DIR}/opencollada.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencollada ${DEFAULT_CMAKE_FLAGS} ${OPENCOLLADA_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencollada ${DEFAULT_CMAKE_FLAGS} ${OPENCOLLADA_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/opencollada
+	INSTALL_DIR ${LIBDIR}/opencollada
 )
 
-if(UNIX)
+if(UNIX AND NOT APPLE)
-  add_dependencies(
+	add_dependencies(
-    external_opencollada
+		external_opencollada
-    external_xml2
+		external_xml2
-  )
+	)
-endif()
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_opencollada after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencollada/ ${HARVEST_TARGET}/opencollada/
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_opencollada after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/buffer.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/buffer_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/ftoa.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/ftoa_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/GeneratedSaxParser.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/GeneratedSaxParser_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/MathMLSolver.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/MathMLSolver_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADABaseUtils.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADABaseUtils_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADAFramework.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADAFramework_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADASaxFrameworkLoader_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/OpenCOLLADAStreamWriter.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/OpenCOLLADAStreamWriter_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/pcre.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/pcre_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/UTF.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/UTF_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/xml.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/xml_d.lib
-      DEPENDEES install
-    )
-  endif()
 endif()

build_files/build_environment/cmake/opencolorio.cmake

@@ -17,96 +17,57 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(OPENCOLORIO_EXTRA_ARGS
-  -DOCIO_BUILD_APPS=OFF
+	-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-  -DOCIO_BUILD_PYGLUE=OFF
+	-DBoost_USE_MULTITHREADED=ON
-  -DOCIO_BUILD_NUKE=OFF
+	-DBoost_USE_STATIC_LIBS=ON
-  -DOCIO_USE_BOOST_PTR=OFF
+	-DBoost_USE_STATIC_RUNTIME=ON
-  -DOCIO_BUILD_STATIC=ON
+	-DBOOST_ROOT=${LIBDIR}/boost
-  -DOCIO_BUILD_SHARED=OFF
+	-DBOOST_INCLUDEDIR=${LIBDIR}/boost/include/boost_1_60/boost
-  -DOCIO_BUILD_TRUELIGHT=OFF
+	-DBoost_NO_SYSTEM_PATHS=ON
-  -DOCIO_BUILD_DOCS=OFF
+	-DBoost_DEBUG=ON
-  -DOCIO_BUILD_PYGLUE=OFF
+	-DBoost_MAJOR_VERSION=1
-  -DOCIO_BUILD_JNIGLUE=OFF
+	-DBoost_MINOR_VERSION=60
-  -DOCIO_STATIC_JNIGLUE=OFF
+	-DOCIO_BUILD_APPS=OFF
+	-DOCIO_BUILD_PYGLUE=OFF
+	-DOCIO_BUILD_NUKE=OFF
 )
 
 if(WIN32)
-  set(OCIO_PATCH opencolorio_win.diff)
+	set(OPENCOLORIO_EXTRA_ARGS
-  set(OPENCOLORIO_EXTRA_ARGS
+		${OPENCOLORIO_EXTRA_ARGS}
-    ${OPENCOLORIO_EXTRA_ARGS}
+		-DOCIO_USE_BOOST_PTR=ON
-    -DOCIO_BUILD_TESTS=OFF
+		-DOCIO_BUILD_STATIC=OFF
-    -DOCIO_USE_SSE=ON
+		-DOCIO_BUILD_SHARED=ON
-    -DOCIO_INLINES_HIDDEN=OFF
+	)
-    -DOCIO_PYGLUE_LINK=OFF
-    -DOCIO_PYGLUE_RESPECT_ABI=OFF
-    -DOCIO_PYGLUE_SONAME=OFF
-    -DOCIO_PYGLUE_LIB_PREFIX=OFF
-    -DUSE_EXTERNAL_TINYXML=ON
-    -DTINYXML_INCLUDE_DIR=${LIBDIR}/tinyxml/include
-    -DTINYXML_LIBRARY=${LIBDIR}/tinyxml/lib/tinyxml${libext}
-    -DUSE_EXTERNAL_YAML=ON
-    -DYAML_CPP_FOUND=ON
-    -DYAML_CPP_VERSION=${YAMLCPP_VERSION}
-    -DUSE_EXTERNAL_LCMS=ON
-    -DINC_1=${LIBDIR}/tinyxml/include
-    -DINC_2=${LIBDIR}/yamlcpp/include
-    # Lie because ocio cmake is demanding boost even though it is not needed.
-    -DYAML_CPP_VERSION=0.5.0
-  )
 else()
-  set(OCIO_PATCH opencolorio.diff)
+	set(OPENCOLORIO_EXTRA_ARGS
-  set(OPENCOLORIO_EXTRA_ARGS
+		${OPENCOLORIO_EXTRA_ARGS}
-    ${OPENCOLORIO_EXTRA_ARGS}
+		-DOCIO_USE_BOOST_PTR=OFF
-  )
+		-DOCIO_BUILD_STATIC=ON
+		-DOCIO_BUILD_SHARED=OFF
+	)
 endif()
 
 ExternalProject_Add(external_opencolorio
-  URL ${OPENCOLORIO_URI}
+	URL ${OPENCOLORIO_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${OPENCOLORIO_HASH}
+	URL_HASH MD5=${OPENCOLORIO_HASH}
-  PREFIX ${BUILD_DIR}/opencolorio
+	PREFIX ${BUILD_DIR}/opencolorio
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/opencolorio/src/external_opencolorio < ${PATCH_DIR}/${OCIO_PATCH}
+	PATCH_COMMAND ${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/opencolorio/src/external_opencolorio < ${PATCH_DIR}/opencolorio.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencolorio ${DEFAULT_CMAKE_FLAGS} ${OPENCOLORIO_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opencolorio ${DEFAULT_CMAKE_FLAGS} ${OPENCOLORIO_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/opencolorio
+	INSTALL_DIR ${LIBDIR}/opencolorio
 )
 
 if(NOT WIN32)
-  add_custom_command(
+	add_custom_command(
-    OUTPUT ${LIBDIR}/opencolorio/lib/libtinyxml.a
+		OUTPUT ${LIBDIR}/opencolorio/lib/libtinyxml.a
-    COMMAND cp ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/libtinyxml.a ${LIBDIR}/opencolorio/lib/libtinyxml.a
+		COMMAND cp ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/libtinyxml.a ${LIBDIR}/opencolorio/lib/libtinyxml.a
-    COMMAND cp ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/libyaml-cpp.a ${LIBDIR}/opencolorio/lib/libyaml-cpp.a
+		COMMAND cp ${BUILD_DIR}/opencolorio/src/external_opencolorio-build/ext/dist/lib/libyaml-cpp.a ${LIBDIR}/opencolorio/lib/libyaml-cpp.a
-  )
+	)
-  add_custom_target(external_opencolorio_extra ALL DEPENDS external_opencolorio ${LIBDIR}/opencolorio/lib/libtinyxml.a)
+	add_custom_target(external_opencolorio_extra ALL DEPENDS external_opencolorio ${LIBDIR}/opencolorio/lib/libtinyxml.a)
 endif()
 
 add_dependencies(
-  external_opencolorio
+	external_opencolorio
-  external_boost
+	external_boost
 )
-
-if(WIN32)
-  add_dependencies(
-    external_opencolorio
-    external_tinyxml
-    external_yamlcpp
-
-  )
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_opencolorio after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/include ${HARVEST_TARGET}/opencolorio/include
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opencolorio/lib/static ${HARVEST_TARGET}/opencolorio/lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/libyaml-cppmd.lib ${HARVEST_TARGET}/opencolorio/lib/libyaml-cpp.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tinyxml/lib/tinyxml.lib ${HARVEST_TARGET}/opencolorio/lib/tinyxml.lib
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_opencolorio after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencolorio/lib/static/Opencolorio.lib ${HARVEST_TARGET}/opencolorio/lib/OpencolorIO_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/yamlcpp/lib/libyaml-cppmdd.lib ${HARVEST_TARGET}/opencolorio/lib/libyaml-cpp_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tinyxml/lib/tinyxml.lib ${HARVEST_TARGET}/opencolorio/lib/tinyxml_d.lib
-      DEPENDEES install
-    )
-  endif()
-
-endif()

build_files/build_environment/cmake/openexr.cmake

@@ -17,48 +17,29 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(WIN32)
-  set(OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
+	set(OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES "kernel32${LIBEXT} user32${LIBEXT} gdi32${LIBEXT} winspool${LIBEXT} shell32${LIBEXT} ole32${LIBEXT} oleaut32${LIBEXT} uuid${LIBEXT} comdlg32${LIBEXT} advapi32${LIBEXT} psapi${LIBEXT}")
-  set(OPENEXR_EXTRA_ARGS
-    -DCMAKE_CXX_STANDARD_LIBRARIES=${OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES}
-  )
-else()
-  set(OPENEXR_EXTRA_ARGS
-  )
 endif()
 
 set(OPENEXR_EXTRA_ARGS
-  ${OPENEXR_EXTRA_ARGS}
+	-DBUILD_SHARED_LIBS=OFF
-  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+	-DCMAKE_CXX_STANDARD_LIBRARIES=${OPENEXR_CMAKE_CXX_STANDARD_LIBRARIES}
-  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-  -DBUILD_TESTING=OFF
+	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-  -DOPENEXR_BUILD_BOTH_STATIC_SHARED=OFF
+	-DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase
-  -DILMBASE_BUILD_BOTH_STATIC_SHARED=OFF
-  -DBUILD_SHARED_LIBS=OFF
-  -DOPENEXR_BUILD_UTILS=OFF
-  -DPYILMBASE_ENABLE=OFF
-  -DOPENEXR_VIEWERS_ENABLE=OFF
-  -DILMBASE_LIB_SUFFIX=${OPENEXR_VERSION_BUILD_POSTFIX}
-  -DOPENEXR_LIB_SUFFIX=${OPENEXR_VERSION_BUILD_POSTFIX}
 )
 
 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}
+	PATCH_COMMAND ${PATCH_CMD} -p 0 -d ${BUILD_DIR}/openexr/src/external_openexr < ${PATCH_DIR}/openexr.diff
-  INSTALL_DIR ${LIBDIR}/openexr
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openexr ${DEFAULT_CMAKE_FLAGS} ${OPENEXR_EXTRA_ARGS}
+	INSTALL_DIR ${LIBDIR}/openexr
 )
 
-if(WIN32)
-  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/include ${HARVEST_TARGET}/openexr/include
-    DEPENDEES install
-  )
-endif()
-
 add_dependencies(
-  external_openexr
+	external_openexr
-  external_zlib
+	external_zlib
+	external_ilmbase
 )

build_files/build_environment/cmake/openimagedenoise.cmake

@@ -1,61 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-
-set(OIDN_EXTRA_ARGS
-  -DWITH_EXAMPLE=OFF
-  -DWITH_TEST=OFF
-  -DTBB_ROOT=${LIBDIR}/tbb
-  -DTBB_STATIC_LIB=ON
-  -DOIDN_STATIC_LIB=ON
-)
-
-ExternalProject_Add(external_openimagedenoise
-  URL ${OIDN_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${OIDN_HASH}
-  PREFIX ${BUILD_DIR}/openimagedenoise
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimagedenoise ${DEFAULT_CMAKE_FLAGS} ${OIDN_EXTRA_ARGS}
-  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/openimagedenoise/src/external_openimagedenoise < ${PATCH_DIR}/openimagedenoise.diff
-  INSTALL_DIR ${LIBDIR}/openimagedenoise
-)
-
-add_dependencies(
-  external_openimagedenoise
-  external_tbb
-)
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_openimagedenoise after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openimagedenoise/include ${HARVEST_TARGET}/openimagedenoise/include
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/openimagedenoise.lib ${HARVEST_TARGET}/openimagedenoise/lib/openimagedenoise.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/common.lib ${HARVEST_TARGET}/openimagedenoise/lib/common.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/mkldnn.lib ${HARVEST_TARGET}/openimagedenoise/lib/mkldnn.lib
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_openimagedenoise after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/openimagedenoise.lib ${HARVEST_TARGET}/openimagedenoise/lib/openimagedenoise_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/common.lib ${HARVEST_TARGET}/openimagedenoise/lib/common_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/mkldnn.lib ${HARVEST_TARGET}/openimagedenoise/lib/mkldnn_d.lib
-      DEPENDEES install
-    )
-  endif()
-endif()

build_files/build_environment/cmake/openimageio.cmake

@@ -17,135 +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/openjpeg${LIBEXT}
-    -DOPENJPEG_LIBRARY_DEBUG=${LIBDIR}/openjpeg_msvc/lib/openjp2${LIBEXT}
+		-DOPENJPEG_LIBRARY_DEBUG=${LIBDIR}/openjpeg_msvc/lib/openjpeg${LIBEXT}
-  )
+	)
 else()
-  set(OPENJPEG_FLAGS
+	set(OPENJPEG_FLAGS
-    -DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg/include/openjpeg-${OPENJPEG_SHORT_VERSION}
+		-DOPENJPEG_INCLUDE_DIR=${LIBDIR}/openjpeg/include/openjpeg-${OPENJPEG_SHORT_VERSION}
-    -DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg/lib/${OPENJPEG_LIBRARY}
+		-DOPENJPEG_LIBRARY=${LIBDIR}/openjpeg/lib/${OPENJPEG_LIBRARY}
-  )
+	)
 endif()
 
 set(OPENIMAGEIO_EXTRA_ARGS
-  -DBUILDSTATIC=ON
+	-DBUILDSTATIC=ON
-  ${OPENIMAGEIO_LINKSTATIC}
+	${OPENIMAGEIO_LINKSTATIC}
-  -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/openexr/
+	-DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/openexr/
-  -DOPENEXR_ILMIMF_LIBRARIES=${LIBDIR}/openexr/lib/IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_ILMIMF_LIBRARIES=${LIBDIR}/openexr/lib/IlmImf-2_2${LIBEXT}
-  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
+	-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-  -DBoost_USE_MULTITHREADED=ON
+	-DBoost_USE_MULTITHREADED=ON
-  -DBoost_USE_STATIC_LIBS=ON
+	-DBoost_USE_STATIC_LIBS=ON
-  -DBoost_USE_STATIC_RUNTIME=OFF
+	-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}/openexr/
+	-DILMBASE_INCLUDE_PATH=${LIBDIR}/ilmbase/
-  -DILMBASE_PACKAGE_PREFIX=${LIBDIR}/openexr/
+	-DILMBASE_PACKAGE_PREFIX=${LIBDIR}/ilmbase/
-  -DILMBASE_INCLUDE_DIR=${LIBDIR}/openexr/include/
+	-DILMBASE_INCLUDE_DIR=${LIBDIR}/ilmbase/include/
-  -DOPENEXR_HALF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Half${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_HALF_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Half${LIBEXT}
-  -DOPENEXR_IMATH_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath-2_2${LIBEXT}
-  -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmThread${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread-2_2${LIBEXT}
-  -DOPENEXR_IEX_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex-2_2${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-2_2${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 0 -N -d ${BUILD_DIR}/openimageio/src/external_openimageio/ < ${PATCH_DIR}/openimageio_staticexr.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimageio ${DEFAULT_CMAKE_FLAGS} ${OPENIMAGEIO_EXTRA_ARGS}
+	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_openexr
+	external_ilmbase
-  external_jpeg
+	external_openexr
-  external_boost
+	external_jpeg
-  external_tiff
+	external_boost
-  external_opencolorio
+	external_tiff
-  external_openjpeg${OPENJPEG_POSTFIX}
+	external_opencolorio
-  ${WEBP_DEP}
+	external_openjpeg${OPENJPEG_POSTFIX}
+	${WEBP_DEP}
 )
 if(NOT WIN32)
-  add_dependencies(
+	add_dependencies(
-    external_openimageio
+		external_openimageio
-    external_opencolorio_extra
+		external_opencolorio_extra
-  )
+	)
 endif()

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")
 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.
+#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})
+set(OPENJPEG_LIBRARY libopenjpeg${LIBEXT})
 if(MSVC)
-  set_target_properties(external_openjpeg PROPERTIES FOLDER Mingw)
+	set_target_properties(external_openjpeg PROPERTIES FOLDER Mingw)
 endif()

build_files/build_environment/cmake/openmp.cmake

@@ -1,33 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-
-ExternalProject_Add(external_openmp
-  URL ${OPENMP_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${OPENMP_HASH}
-  PREFIX ${BUILD_DIR}/openmp
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openmp ${DEFAULT_CMAKE_FLAGS}
-  INSTALL_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id @executable_path/../Resources/lib/libomp.dylib runtime/src/libomp.dylib && make install
-  INSTALL_DIR ${LIBDIR}/openmp
-)
-
-add_dependencies(
-  external_openmp
-  external_clang
-)

build_files/build_environment/cmake/opensubdiv.cmake

@@ -17,84 +17,62 @@
 # ***** END GPL LICENSE BLOCK *****
 
 set(OPENSUBDIV_EXTRA_ARGS
-  -DNO_EXAMPLES=ON
+	-DNO_EXAMPLES=ON
-  -DNO_REGRESSION=ON
+	-DNO_REGRESSION=ON
-  -DNO_PYTHON=ON
+	-DNO_PYTHON=ON
-  -DNO_MAYA=ON
+	-DNO_MAYA=ON
-  -DNO_PTEX=ON
+	-DNO_PTEX=ON
-  -DNO_DOC=ON
+	-DNO_DOC=ON
-  -DNO_CLEW=OFF
+	-DNO_CLEW=OFF
-  -DNO_OPENCL=OFF
+	-DNO_OPENCL=OFF
-  -DNO_TUTORIALS=ON
+	-DNO_TUTORIALS=ON
-  -DGLEW_INCLUDE_DIR=${LIBDIR}/glew/include
+	-DGLEW_INCLUDE_DIR=${LIBDIR}/glew/include
-  -DGLEW_LIBRARY=${LIBDIR}/glew/lib/libGLEW${LIBEXT}
+	-DGLEW_LIBRARY=${LIBDIR}/glew/lib/libGLEW${LIBEXT}
-  -DGLFW_INCLUDE_DIR=${LIBDIR}/glfw/include
+	-DGLFW_INCLUDE_DIR=${LIBDIR}/glfw/include
-  -DGLFW_LIBRARIES=${LIBDIR}/glfw/lib/glfw3${LIBEXT}
+	-DGLFW_LIBRARIES=${LIBDIR}/glfw/lib/glfw3${LIBEXT}
 )
 
 if(WIN32)
-  set(OPENSUBDIV_EXTRA_ARGS
+	#no cuda support for vc15 yet
-    ${OPENSUBDIV_EXTRA_ARGS}
+	if(msvc15)
-    -DTBB_INCLUDE_DIR=${LIBDIR}/tbb/include
+		set(OPENSUBDIV_CUDA ON)
-    -DTBB_LIBRARIES=${LIBDIR}/tbb/lib/tbb_static.lib
+	else()
-    -DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL
+		set(OPENSUBDIV_CUDA ON)
-    -DCLEW_LIBRARY=${LIBDIR}/clew/lib/clew${LIBEXT}
+	endif()
-    -DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include
-    -DCUEW_LIBRARY=${LIBDIR}/cuew/lib/cuew${LIBEXT}
-  )
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    set(OPENSUBDIV_EXTRA_ARGS
-      ${OPENSUBDIV_EXTRA_ARGS}
-      -DNO_CUDA=OFF
-    )
-  else()
-    set(OPENSUBDIV_EXTRA_ARGS
-      ${OPENSUBDIV_EXTRA_ARGS}
-      -DNO_CUDA=ON
-    )
-  endif()
 
+	set(OPENSUBDIV_EXTRA_ARGS
+		${OPENSUBDIV_EXTRA_ARGS}
+		-DNO_CUDA=${OPENSUBDIV_CUDA}
+		-DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL
+		-DCLEW_LIBRARY=${LIBDIR}/clew/lib/clew${LIBEXT}
+		-DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include
+		-DCUEW_LIBRARY=${LIBDIR}/cuew/lib/cuew${LIBEXT}
+		-DCMAKE_EXE_LINKER_FLAGS_RELEASE=libcmt.lib
+	)
 else()
-  set(OPENSUBDIV_EXTRA_ARGS
+	set(OPENSUBDIV_EXTRA_ARGS
-    ${OPENSUBDIV_EXTRA_ARGS}
+		${OPENSUBDIV_EXTRA_ARGS}
-    -DNO_CUDA=ON
+		-DNO_CUDA=ON
-    -DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include
+		-DCUEW_INCLUDE_DIR=${LIBDIR}/cuew/include
-    -DCLEW_INCLUDE_DIR=${LIBDIR}/clew/include/CL
+		-DCLEW_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
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opensubdiv -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${OPENSUBDIV_EXTRA_ARGS}
+	PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/opensubdiv/src/external_opensubdiv < ${PATCH_DIR}/opensubdiv.diff
-  INSTALL_DIR ${LIBDIR}/opensubdiv
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opensubdiv -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${OPENSUBDIV_EXTRA_ARGS}
+	INSTALL_DIR ${LIBDIR}/opensubdiv
 )
 
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_opensubdiv after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opensubdiv/lib ${HARVEST_TARGET}/opensubdiv/lib
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/opensubdiv/include ${HARVEST_TARGET}/opensubdiv/include
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_opensubdiv after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opensubdiv/lib/osdCPU.lib ${HARVEST_TARGET}/opensubdiv/lib/osdCPU_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/opensubdiv/lib/osdGPU.lib ${HARVEST_TARGET}/opensubdiv/lib/osdGPU_d.lib
-      DEPENDEES install
-    )
-  endif()
-endif()
-
 add_dependencies(
-  external_opensubdiv
+	external_opensubdiv
-  external_glew
+	external_glew
-  external_glfw
+	external_glfw
-  external_clew
+	external_clew
-  external_cuew
+	external_cuew
-  external_tbb
 )

build_files/build_environment/cmake/openvdb.cmake

@@ -17,83 +17,64 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(BUILD_MODE STREQUAL Debug)
-  set(BLOSC_POST _d)
+	set(BLOSC_POST _d)
 endif()
 
 set(OPENVDB_EXTRA_ARGS
-  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
+	-DILMBASE_HOME=${LIBDIR}/ilmbase/
-  -DBoost_USE_MULTITHREADED=ON
+	-DILMBASE_CUSTOM=ON
-  -DBoost_USE_STATIC_LIBS=ON
+	-DILMBASE_CUSTOM_LIBRARIES=Half;Imath-2_2;IlmThread-2_2;Iex-2_2
-  -DBoost_USE_STATIC_RUNTIME=OFF
+	-DILMBASE_INCLUDE_DIR=${LIBDIR}/ilmbase/include/
-  -DBOOST_ROOT=${LIBDIR}/boost
+	-DILMBASE_HALF_LIBRARIES=${LIBDIR}/ilmbase/lib/Half${LIBEXT}
-  -DBoost_NO_SYSTEM_PATHS=ON
+	-DILMBASE_IMATH_LIBRARIES=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath-2_2${LIBEXT}
-  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+	-DILMBASE_ILMTHREAD_LIBRARIES=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread-2_2${LIBEXT}
-  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+	-DILMBASE_IEX_LIBRARIES=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex-2_2${LIBEXT}
-  -DBlosc_INCLUDE_DIR=${LIBDIR}/blosc/include/
+	-DOPENEXR_HOME=${LIBDIR}/openexr/
-  -DBlosc_LIBRARY=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
+	-DOPENEXR_USE_STATIC_LIBS=ON
-  -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=OFF
+	-DOPENEXR_CUSTOM=ON
-  -DOPENVDB_BUILD_UNITTESTS=Off
+	-DOPENEXR_CUSTOM_LIBRARY=IlmImf-2_2
-  -DOPENVDB_BUILD_PYTHON_MODULE=Off
+	-DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
-  -DBlosc_ROOT=${LIBDIR}/blosc/
+	-DOPENEXR_ILMIMF_LIBRARIES=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf-2_2${LIBEXT}
-  -DTBB_ROOT=${LIBDIR}/tbb/
+	-DTBB_ROOT_DIR=${LIBDIR}/tbb/
-  -DOpenEXR_ROOT=${LIBDIR}/openexr
+	-DTBB_INCLUDE_DIRS=${LIBDIR}/tbb/include
-  -DIlmBase_ROOT=${LIBDIR}/openexr
+	-DTBB_LIBRARY=${LIBDIR}/tbb/lib/tbb_static${LIBEXT}
-  -DOPENEXR_LIBRARYDIR=${LIBDIR}/openexr/lib
+	-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-   # All libs live in openexr, even the ilmbase ones
+	-DBoost_USE_MULTITHREADED=ON
-  -DILMBASE_LIBRARYDIR=${LIBDIR}/openexr/lib
+	-DBoost_USE_STATIC_LIBS=ON
-  -DOPENVDB_CORE_SHARED=Off
+	-DBoost_USE_STATIC_RUNTIME=ON
-  -DOPENVDB_BUILD_BINARIES=Off
+	-DBOOST_ROOT=${LIBDIR}/boost
+	-DBoost_NO_SYSTEM_PATHS=ON
+	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+	-DWITH_BLOSC=ON
+	-DBLOSC_INCLUDE_DIR=${LIBDIR}/blosc/include/
+	-DBLOSC_LIBRARY=${LIBDIR}/blosc/lib/libblosc${BLOSC_POST}${LIBEXT}
 )
 
-if(WIN32)
+set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS})
-  # Namespaces seem to be buggy and cause linker errors due to things not
+
-  # being in the correct namespace
+# CMake script for OpenVDB based on https://raw.githubusercontent.com/diekev/openvdb-cmake/master/CMakeLists.txt
-  # needs to link pthreads due to it being a blosc dependency
+# can't be in external_openvdb because of how the includes are setup.
-  set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
-    -DCMAKE_CXX_STANDARD_LIBRARIES="${LIBDIR}/pthreads/lib/pthreadVC3.lib"
-    -DUSE_EXR=On
-  )
-else()
-  # OpenVDB can't find the _static libraries automatically.
-  set(OPENVDB_EXTRA_ARGS ${OPENVDB_EXTRA_ARGS}
-    -DTbb_LIBRARIES=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
-    -DTbb_tbb_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
-    -DTbb_tbbmalloc_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbbmalloc_static${LIBEXT}
-    -DTbb_tbbmalloc_proxy_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbbmalloc_proxy_static${LIBEXT}
-  )
-endif()
 
 ExternalProject_Add(openvdb
-  URL ${OPENVDB_URI}
+	URL ${OPENVDB_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${OPENVDB_HASH}
+	URL_HASH MD5=${OPENVDB_HASH}
-  PREFIX ${BUILD_DIR}/openvdb
+	PREFIX ${BUILD_DIR}/openvdb
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb.diff
+	PATCH_COMMAND COMMAND
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openvdb ${DEFAULT_CMAKE_FLAGS} ${OPENVDB_EXTRA_ARGS}
+		${CMAKE_COMMAND} -E copy ${PATCH_DIR}/cmakelists_openvdb.txt  ${BUILD_DIR}/openvdb/src/openvdb/CMakeLists.txt &&
-  INSTALL_DIR ${LIBDIR}/openvdb
+		${CMAKE_COMMAND} -E copy_directory ${PATCH_DIR}/cmake/  ${BUILD_DIR}/openvdb/src/openvdb/cmake/ &&
+		${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/openvdb/src/openvdb < ${PATCH_DIR}/openvdb_vc2013.diff
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openvdb ${DEFAULT_CMAKE_FLAGS} ${OPENVDB_EXTRA_ARGS}
+	INSTALL_DIR ${LIBDIR}/openvdb
 )
 
 add_dependencies(
-  openvdb
+	openvdb
-  external_tbb
+	external_tbb
-  external_boost
+	external_boost
-  external_openexr
+	external_ilmbase
-  external_zlib
+	external_openexr
-  external_blosc
+	external_zlib
+	external_blosc
 )
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(openvdb after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openvdb/include ${HARVEST_TARGET}/openvdb/include
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/libopenvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb.lib
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(openvdb after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openvdb/lib/libopenvdb.lib ${HARVEST_TARGET}/openvdb/lib/openvdb_d.lib
-      DEPENDEES install
-    )
-  endif()
-endif()

build_files/build_environment/cmake/options.cmake

@@ -17,21 +17,21 @@
 # ***** 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)
 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)
@@ -45,173 +45,170 @@ 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")
-  if(WITH_OPTIMIZED_DEBUG)
-    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  else()
-    set(BLENDER_CMAKE_C_FLAGS_DEBUG "/MDd ${COMMON_MSVC_FLAGS} /Zi /Ob0 /Od /RTC1 /D_DEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  endif()
-  set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "/MD ${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CMAKE_C_FLAGS_RELEASE "/MD ${COMMON_MSVC_FLAGS} /O2 /Ob2 /DNDEBUG /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
-  set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "/MD ${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 "/MDd ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /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_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_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_CXX_FLAGS_MINSIZEREL "/MD /${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG  /D PLATFORM_WINDOWS /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_CXX_FLAGS_RELEASE "/MD ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /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_CXX_FLAGS_RELWITHDEBINFO "/MD ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /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(PLATFORM_FLAGS)
+	if(WITH_OPTIMIZED_DEBUG)
-  set(PLATFORM_CXX_FLAGS)
+		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(PLATFORM_CMAKE_FLAGS)
+	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")
+	endif()
+	set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "/MT /${COMMON_MSVC_FLAGS} /O1 /Ob1 /D NDEBUG  /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+	set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "/MT ${COMMON_MSVC_FLAGS} /O2 /Ob2 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
+	set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MT ${COMMON_MSVC_FLAGS} /Zi /O2 /Ob1 /D NDEBUG /D PLATFORM_WINDOWS /DPSAPI_VERSION=1 /DOIIO_STATIC_BUILD /DTINYFORMAT_ALLOW_WCHAR_STRINGS")
 
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+	set(PLATFORM_FLAGS)
-    set(MINGW_PATH ${DOWNLOAD_DIR}/mingw/mingw64)
+	set(PLATFORM_CXX_FLAGS)
-    set(MINGW_SHELL ming64sh.cmd)
+	set(PLATFORM_CMAKE_FLAGS)
-    set(PERL_SHELL ${DOWNLOAD_DIR}/perl/portableshell.bat)
-    set(MINGW_HOST x86_64-w64-mingw32)
-  else()
-    set(MINGW_PATH ${DOWNLOAD_DIR}/mingw/mingw32)
-    set(MINGW_SHELL ming32sh.cmd)
-    set(PERL_SHELL ${DOWNLOAD_DIR}/perl32/portableshell.bat)
-    set(MINGW_HOST i686-w64-mingw32)
-  endif()
 
-  set(CONFIGURE_ENV
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    cd ${MINGW_PATH} &&
+		set(MINGW_PATH ${DOWNLOAD_DIR}/mingw/mingw64)
-    call ${PERL_SHELL} &&
+		set(MINGW_SHELL ming64sh.cmd)
-    call ${MINGW_SHELL} &&
+		set(PERL_SHELL ${DOWNLOAD_DIR}/perl/portableshell.bat)
-    set path &&
+		set(MINGW_HOST x86_64-w64-mingw32)
-    set CFLAGS=-g &&
+	else()
-    set LDFLAGS=-Wl,--as-needed -static-libgcc
+		set(MINGW_PATH ${DOWNLOAD_DIR}/mingw/mingw32)
-  )
+		set(MINGW_SHELL ming32sh.cmd)
+		set(PERL_SHELL ${DOWNLOAD_DIR}/perl32/portableshell.bat)
+		set(MINGW_HOST i686-w64-mingw32)
+	endif()
 
-  set(CONFIGURE_ENV_NO_PERL
+	set(CONFIGURE_ENV
-    cd ${MINGW_PATH} &&
+		cd ${MINGW_PATH} &&
-    call ${MINGW_SHELL} &&
+		call ${MINGW_SHELL} &&
-    set path &&
+		call ${PERL_SHELL} &&
-    set CFLAGS=-g &&
+		set path &&
-    set LDFLAGS=-Wl,--as-needed -static-libgcc
+		set CFLAGS=-g &&
-  )
+		set LDFLAGS=-Wl,--as-needed -static-libgcc
+	)
 
-  set(CONFIGURE_COMMAND sh ./configure)
+	set(CONFIGURE_ENV_NO_PERL
-  set(CONFIGURE_COMMAND_NO_TARGET ${CONFIGURE_COMMAND})
+		cd ${MINGW_PATH} &&
+		call ${MINGW_SHELL} &&
+		set path &&
+		set CFLAGS=-g &&
+		set LDFLAGS=-Wl,--as-needed -static-libgcc
+	)
+
+	set(CONFIGURE_COMMAND sh ./configure)
+	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.12)
+		set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OSX_SDK_VERSION}.sdk)
 
-    set(PLATFORM_CFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}")
+		set(PLATFORM_CFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}")
-    set(PLATFORM_CXXFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++")
+		set(PLATFORM_CXXFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++")
-    set(PLATFORM_LDFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}")
+		set(PLATFORM_LDFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}")
-    set(PLATFORM_BUILD_TARGET --build=x86_64-apple-darwin15.0.0) # OS X 10.11
+		set(PLATFORM_BUILD_TARGET --build=x86_64-apple-darwin13.0.0) # OS X 10.9
-    set(PLATFORM_CMAKE_FLAGS
+		set(PLATFORM_CMAKE_FLAGS
-      -DCMAKE_OSX_ARCHITECTURES:STRING=${OSX_ARCHITECTURES}
+			-DCMAKE_OSX_ARCHITECTURES:STRING=${OSX_ARCHITECTURES}
-      -DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_DEPLOYMENT_TARGET}
+			-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_DEPLOYMENT_TARGET}
-      -DCMAKE_OSX_SYSROOT:PATH=${OSX_SYSROOT}
+			-DCMAKE_OSX_SYSROOT:PATH=${OSX_SYSROOT}
-    )
+		)
-  else()
+	else()
-    set(PLATFORM_CFLAGS "-fPIC")
+		set(PLATFORM_CFLAGS "-fPIC")
-    set(PLATFORM_CXXFLAGS "-std=c++11 -fPIC")
+		set(PLATFORM_CXXFLAGS "-std=c++11 -fPIC")
-    set(PLATFORM_LDFLAGS)
+		set(PLATFORM_LDFLAGS)
-    set(PLATFORM_BUILD_TARGET)
+		set(PLATFORM_BUILD_TARGET)
-    set(PLATFORM_CMAKE_FLAGS -DCMAKE_INSTALL_LIBDIR=lib)
+		set(PLATFORM_CMAKE_FLAGS)
-  endif()
+	endif()
 
-  if(WITH_OPTIMIZED_DEBUG)
+	if(WITH_OPTIMIZED_DEBUG)
-    set(BLENDER_CMAKE_C_FLAGS_DEBUG "-O2 -DNDEBUG ${PLATFORM_CFLAGS}")
+		set(BLENDER_CMAKE_C_FLAGS_DEBUG "-O2 -DNDEBUG")
-  else()
+	else()
-    set(BLENDER_CMAKE_C_FLAGS_DEBUG "-g ${PLATFORM_CFLAGS}")
+		set(BLENDER_CMAKE_C_FLAGS_DEBUG "-g")
-  endif()
+	endif()
-  set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG ${PLATFORM_CFLAGS}")
+	set(BLENDER_CMAKE_C_FLAGS_MINSIZEREL "-Os -DNDEBUG")
-  set(BLENDER_CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ${PLATFORM_CFLAGS}")
+	set(BLENDER_CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
-  set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${PLATFORM_CFLAGS}")
+	set(BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG")
 
-  if(WITH_OPTIMIZED_DEBUG)
+	if(WITH_OPTIMIZED_DEBUG)
-    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "-O2 -DNDEBUG ${PLATFORM_CXXFLAGS}")
+		set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "-O2 -DNDEBUG ${PLATFORM_CXXFLAGS}")
-  else()
+	else()
-    set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "-g ${PLATFORM_CXXFLAGS}")
+		set(BLENDER_CMAKE_CXX_FLAGS_DEBUG "-g ${PLATFORM_CXXFLAGS}")
-  endif()
+	endif()
 
-  set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG ${PLATFORM_CXXFLAGS}")
+	set(BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL "-Os -DNDEBUG ${PLATFORM_CXXFLAGS}")
-  set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${PLATFORM_CXXFLAGS}")
+	set(BLENDER_CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ${PLATFORM_CXXFLAGS}")
-  set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${PLATFORM_CXXFLAGS}")
+	set(BLENDER_CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG ${PLATFORM_CXXFLAGS}")
 
-  set(CONFIGURE_ENV
+	set(CONFIGURE_ENV
-    export MACOSX_DEPLOYMENT_TARGET=${OSX_DEPLOYMENT_TARGET} &&
+		export MACOSX_DEPLOYMENT_TARGET=${OSX_DEPLOYMENT_TARGET} &&
-    export CFLAGS=${PLATFORM_CFLAGS} &&
+		export CFLAGS=${PLATFORM_CFLAGS} &&
-    export CXXFLAGS=${PLATFORM_CXXFLAGS} &&
+		export CXXFLAGS=${PLATFORM_CXXFLAGS} &&
-    export LDFLAGS=${PLATFORM_LDFLAGS}
+		export LDFLAGS=${PLATFORM_LDFLAGS}
-  )
+	)
-  set(CONFIGURE_ENV_NO_PERL ${CONFIGURE_ENV})
+	set(CONFIGURE_ENV_NO_PERL ${CONFIGURE_ENV})
-  set(CONFIGURE_COMMAND ./configure ${PLATFORM_BUILD_TARGET})
+	set(CONFIGURE_COMMAND ./configure ${PLATFORM_BUILD_TARGET})
-  set(CONFIGURE_COMMAND_NO_TARGET ./configure)
+	set(CONFIGURE_COMMAND_NO_TARGET ./configure)
 endif()
 
 set(DEFAULT_CMAKE_FLAGS
-  -DCMAKE_BUILD_TYPE=${BUILD_MODE}
+	-DCMAKE_BUILD_TYPE=${BUILD_MODE}
-  -DCMAKE_C_FLAGS_DEBUG=${BLENDER_CMAKE_C_FLAGS_DEBUG}
+	-DCMAKE_C_FLAGS_DEBUG=${BLENDER_CMAKE_C_FLAGS_DEBUG}
-  -DCMAKE_C_FLAGS_MINSIZEREL=${BLENDER_CMAKE_C_FLAGS_MINSIZEREL}
+	-DCMAKE_C_FLAGS_MINSIZEREL=${BLENDER_CMAKE_C_FLAGS_MINSIZEREL}
-  -DCMAKE_C_FLAGS_RELEASE=${BLENDER_CMAKE_C_FLAGS_RELEASE}
+	-DCMAKE_C_FLAGS_RELEASE=${BLENDER_CMAKE_C_FLAGS_RELEASE}
-  -DCMAKE_C_FLAGS_RELWITHDEBINFO=${BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO}
+	-DCMAKE_C_FLAGS_RELWITHDEBINFO=${BLENDER_CMAKE_C_FLAGS_RELWITHDEBINFO}
-  -DCMAKE_CXX_FLAGS_DEBUG=${BLENDER_CMAKE_CXX_FLAGS_DEBUG}
+	-DCMAKE_CXX_FLAGS_DEBUG=${BLENDER_CMAKE_CXX_FLAGS_DEBUG}
-  -DCMAKE_CXX_FLAGS_MINSIZEREL=${BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL}
+	-DCMAKE_CXX_FLAGS_MINSIZEREL=${BLENDER_CMAKE_CXX_FLAGS_MINSIZEREL}
-  -DCMAKE_CXX_FLAGS_RELEASE=${BLENDER_CMAKE_CXX_FLAGS_RELEASE}
+	-DCMAKE_CXX_FLAGS_RELEASE=${BLENDER_CMAKE_CXX_FLAGS_RELEASE}
-  -DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
+	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
-  ${PLATFORM_CMAKE_FLAGS}
+	${PLATFORM_CMAKE_FLAGS}
 )
 
 if(WIN32)
-  # We need both flavors to build the thumbnail dlls
+	#we need both flavors to build the thumbnail dlls
-  if(MSVC12)
+	if(MSVC12)
-    set(GENERATOR_32 "Visual Studio 12 2013")
+		set(GENERATOR_32 "Visual Studio 12 2013")
-    set(GENERATOR_64 "Visual Studio 12 2013 Win64")
+		set(GENERATOR_64 "Visual Studio 12 2013 Win64")
-  elseif(MSVC14)
+	elseif(MSVC14)
-    set(GENERATOR_32 "Visual Studio 14 2015")
+		set(GENERATOR_32 "Visual Studio 14 2015")
-    set(GENERATOR_64 "Visual Studio 14 2015 Win64")
+		set(GENERATOR_64 "Visual Studio 14 2015 Win64")
-  endif()
+	endif()
 endif()
 
 
 if(WIN32)
-  if(BUILD_MODE STREQUAL Debug)
+	set(ZLIB_LIBRARY zlibstatic${LIBEXT})
-    set(ZLIB_LIBRARY zlibstaticd${LIBEXT})
-  else()
-    set(ZLIB_LIBRARY zlibstatic${LIBEXT})
-  endif()
 else()
-  set(ZLIB_LIBRARY libz${LIBEXT})
+	set(ZLIB_LIBRARY libz${LIBEXT})
 endif()
 
 if(MSVC)
-  set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+	set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 endif()
 
 set(CMAKE_INSTALL_MESSAGE LAZY)

build_files/build_environment/cmake/opus.cmake

@@ -1,35 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-ExternalProject_Add(external_opus
-  URL ${OPUS_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH SHA256=${OPUS_HASH}
-  PREFIX ${BUILD_DIR}/opus
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/opus/src/external_opus/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/opus
-    --disable-shared
-    --enable-static
-    --with-pic
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/opus/src/external_opus/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/opus/src/external_opus/ && make install
-  INSTALL_DIR ${LIBDIR}/opus
-)
-
-if(MSVC)
-  set_target_properties(external_opus PROPERTIES FOLDER Mingw)
-endif()

build_files/build_environment/cmake/orc.cmake

@@ -0,0 +1,32 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+ExternalProject_Add(external_orc
+	URL ${ORC_URI}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	URL_HASH SHA256=${ORC_HASH}
+	PREFIX ${BUILD_DIR}/orc
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/orc/src/external_orc/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/orc --disable-shared --enable-static
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/orc/src/external_orc/ && make -j${MAKE_THREADS}
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/orc/src/external_orc/ && make install
+	INSTALL_DIR ${LIBDIR}/orc
+)
+
+if(MSVC)
+	set_target_properties(external_orc PROPERTIES FOLDER Mingw)
+endif()

build_files/build_environment/cmake/osl.cmake

@@ -17,125 +17,82 @@
 # ***** 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 -DBISON_EXECUTABLE=${LIBDIR}/flexbison/win_bison.exe)
+	set(OSL_FLEX_BISON -DFLEX_EXECUTABLE=${LIBDIR}/flexbison/win_flex.exe -DFLEX_EXTRA_OPTIONS="--wincompat" -DBISON_EXECUTABLE=${LIBDIR}/flexbison/win_bison.exe)
-  set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/libpng16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
+	set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/libpng16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf-2_2${LIBEXT}")
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "4")
-    set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=0)
+		set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=0)
-  else()
+	else()
-    set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=sse2)
+		set(OSL_SIMD_FLAGS -DOIIO_NOSIMD=1 -DOIIO_SIMD=sse2)
-  endif()
+	endif()
-  SET(OSL_PLATFORM_FLAGS -DLINKSTATIC=ON)
 else()
-  set(OSL_CMAKE_CXX_STANDARD_LIBRARIES)
+	set(OSL_CMAKE_CXX_STANDARD_LIBRARIES)
-  set(OSL_FLEX_BISON)
+	set(OSL_FLEX_BISON)
-  set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/${LIBPREFIX}png16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}")
+	set(OSL_OPENIMAGEIO_LIBRARY "${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO${LIBEXT};${LIBDIR}/openimageio/lib/${LIBPREFIX}OpenImageIO_Util${LIBEXT};${LIBDIR}/png/lib/${LIBPREFIX}png16${LIBEXT};${LIBDIR}/jpg/lib/${LIBPREFIX}jpeg${LIBEXT};${LIBDIR}/tiff/lib/${LIBPREFIX}tiff${LIBEXT};${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf-2_2${LIBEXT}")
-  SET(OSL_PLATFORM_FLAGS)
 endif()
 
-set(OSL_ILMBASE_CUSTOM_LIBRARIES "${LIBDIR}/openexr/lib/Imath${OPENEXR_VERSION_POSTFIX}.lib^^${LIBDIR}/openexr/lib/Half{OPENEXR_VERSION_POSTFIX}.lib^^${LIBDIR}/openexr/lib/IlmThread${OPENEXR_VERSION_POSTFIX}.lib^^${LIBDIR}/openexr/lib/Iex${OPENEXR_VERSION_POSTFIX}.lib")
+set(OSL_ILMBASE_CUSTOM_LIBRARIES "${LIBDIR}/ilmbase/lib/Imath-2_2.lib^^${LIBDIR}/ilmbase/lib/Half.lib^^${LIBDIR}/ilmbase/lib/IlmThread-2_2.lib^^${LIBDIR}/ilmbase/lib/Iex-2_2.lib")
-set(OSL_LLVM_LIBRARY "${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMAnalysis${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMAsmParser${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMAsmPrinter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMBitReader${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMBitWriter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMCodeGen${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMCore${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMDebugInfo${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMExecutionEngine${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMInstCombine${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMInstrumentation${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMInterpreter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMJIT${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMLinker${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMC${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMCDisassembler${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMCJIT${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMMCParser${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMObject${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMRuntimeDyld${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMScalarOpts${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMSelectionDAG${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMSupport${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMTableGen${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMTarget${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMTransformUtils${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMVectorize${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86AsmParser${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86AsmPrinter${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86CodeGen${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Desc${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Disassembler${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Info${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMX86Utils${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMipa${LIBEXT};${LIBDIR}/llvm/lib/${LIBPREFIX}LLVMipo${LIBEXT}")
+set(OSL_LLVM_LIBRARY "${LIBDIR}/llvm/lib/LLVMAnalysis${LIBEXT};${LIBDIR}/llvm/lib/LLVMAsmParser${LIBEXT};${LIBDIR}/llvm/lib/LLVMAsmPrinter${LIBEXT};${LIBDIR}/llvm/lib/LLVMBitReader${LIBEXT};${LIBDIR}/llvm/lib/LLVMBitWriter${LIBEXT};${LIBDIR}/llvm/lib/LLVMCodeGen${LIBEXT};${LIBDIR}/llvm/lib/LLVMCore${LIBEXT};${LIBDIR}/llvm/lib/LLVMDebugInfo${LIBEXT};${LIBDIR}/llvm/lib/LLVMExecutionEngine${LIBEXT};${LIBDIR}/llvm/lib/LLVMInstCombine${LIBEXT};${LIBDIR}/llvm/lib/LLVMInstrumentation${LIBEXT};${LIBDIR}/llvm/lib/LLVMInterpreter${LIBEXT};${LIBDIR}/llvm/lib/LLVMJIT${LIBEXT};${LIBDIR}/llvm/lib/LLVMLinker${LIBEXT};${LIBDIR}/llvm/lib/LLVMMC${LIBEXT};${LIBDIR}/llvm/lib/LLVMMCDisassembler${LIBEXT};${LIBDIR}/llvm/lib/LLVMMCJIT${LIBEXT};${LIBDIR}/llvm/lib/LLVMMCParser${LIBEXT};${LIBDIR}/llvm/lib/LLVMObject${LIBEXT};${LIBDIR}/llvm/lib/LLVMRuntimeDyld${LIBEXT};${LIBDIR}/llvm/lib/LLVMScalarOpts${LIBEXT};${LIBDIR}/llvm/lib/LLVMSelectionDAG${LIBEXT};${LIBDIR}/llvm/lib/LLVMSupport${LIBEXT};${LIBDIR}/llvm/lib/LLVMTableGen${LIBEXT};${LIBDIR}/llvm/lib/LLVMTarget${LIBEXT};${LIBDIR}/llvm/lib/LLVMTransformUtils${LIBEXT};${LIBDIR}/llvm/lib/LLVMVectorize${LIBEXT};${LIBDIR}/llvm/lib/LLVMX86AsmParser${LIBEXT};${LIBDIR}/llvm/lib/LLVMX86AsmPrinter${LIBEXT};${LIBDIR}/llvm/lib/LLVMX86CodeGen${LIBEXT};${LIBDIR}/llvm/lib/LLVMX86Desc${LIBEXT};${LIBDIR}/llvm/lib/LLVMX86Disassembler${LIBEXT};${LIBDIR}/llvm/lib/LLVMX86Info${LIBEXT};${LIBDIR}/llvm/lib/LLVMX86Utils${LIBEXT};${LIBDIR}/llvm/lib/LLVMipa${LIBEXT};${LIBDIR}/llvm/lib/LLVMipo${LIBEXT}")
 
 set(OSL_EXTRA_ARGS
-  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
+	-DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-  -DBoost_USE_MULTITHREADED=ON
+	-DBoost_USE_MULTITHREADED=ON
-  -DBoost_USE_STATIC_LIBS=ON
+	-DBoost_USE_STATIC_LIBS=ON
-  -DBoost_USE_STATIC_RUNTIME=OFF
+	-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}/openexr/
+	-DILMBASE_HOME=${LIBDIR}/ilmbase/
-  -DILMBASE_INCLUDE_DIR=${LIBDIR}/openexr/include/
+	-DILMBASE_INCLUDE_DIR=${LIBDIR}/ilmbase/include/
-  -DOPENEXR_HALF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Half${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_IMATH_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Imath-2_2${LIBEXT}
-  -DOPENEXR_IMATH_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Imath${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}IlmThread-2_2${LIBEXT}
-  -DOPENEXR_ILMTHREAD_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmThread${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_IEX_LIBRARY=${LIBDIR}/ilmbase/lib/${LIBPREFIX}Iex-2_2${LIBEXT}
-  -DOPENEXR_IEX_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+	-DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
-  -DOPENEXR_INCLUDE_DIR=${LIBDIR}/openexr/include/
+	-DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf-2_2${LIBEXT}
-  -DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
+	-DOSL_BUILD_TESTS=OFF
-  -DOSL_BUILD_TESTS=OFF
+	-DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-  -DOSL_BUILD_MATERIALX=OFF
+	-DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
-  -DZLIB_LIBRARY=${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+	-DOPENIMAGEIOHOME=${LIBDIR}/openimageio/
-  -DZLIB_INCLUDE_DIR=${LIBDIR}/zlib/include/
+	-DOPENIMAGEIO_LIBRARY=${OSL_OPENIMAGEIO_LIBRARY}
-  -DOPENIMAGEIOHOME=${LIBDIR}/openimageio/
+	-DOPENIMAGEIO_INCLUDES=${LIBDIR}/openimageio/include
-  -DOPENIMAGEIO_INCLUDE_DIR=${LIBDIR}/openimageio/include
+	${OSL_FLEX_BISON}
-  -DOPENIMAGEIO_LIBRARY=${OSL_OPENIMAGEIO_LIBRARY}
+	-DCMAKE_CXX_STANDARD_LIBRARIES=${OSL_CMAKE_CXX_STANDARD_LIBRARIES}
-  ${OSL_FLEX_BISON}
+	-DBUILDSTATIC=ON
-  -DCMAKE_CXX_STANDARD_LIBRARIES=${OSL_CMAKE_CXX_STANDARD_LIBRARIES}
+	-DLINKSTATIC=ON
-  -DBUILDSTATIC=ON
+	-DOSL_BUILD_PLUGINS=Off
-  ${OSL_PLATFORM_FLAGS}
+	-DSTOP_ON_WARNING=OFF
-  -DOSL_BUILD_PLUGINS=Off
+	-DOSL_BUILD_CPP11=ON
-  -DSTOP_ON_WARNING=OFF
+	-DUSE_LLVM_BITCODE=OFF
-  -DUSE_LLVM_BITCODE=OFF
+	${OSL_SIMD_FLAGS}
-  -DUSE_PARTIO=OFF
-  -DUSE_QT=OFF
-  ${OSL_SIMD_FLAGS}
-  -DPARTIO_LIBRARIES=
 )
 
-if(WIN32)
-  set(OSL_EXTRA_ARGS
-    ${OSL_EXTRA_ARGS}
-    -DPUGIXML_HOME=${LIBDIR}/pugixml
-  )
-elseif(APPLE)
-  # Make symbol hiding consistent with OIIO which defaults to OFF,
-  # avoids linker warnings on macOS
-  set(OSL_EXTRA_ARGS
-    ${OSL_EXTRA_ARGS}
-    -DHIDE_SYMBOLS=OFF
-  )
-endif()
-
 ExternalProject_Add(external_osl
-  URL ${OSL_URI}
+	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
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/osl -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${DEFAULT_CMAKE_FLAGS} ${OSL_EXTRA_ARGS}
+		${PATCH_CMD} -p 3 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl.diff &&
-  INSTALL_DIR ${LIBDIR}/osl
+		${PATCH_CMD} -p 0 -d ${BUILD_DIR}/osl/src/external_osl < ${PATCH_DIR}/osl_simd_oiio.diff
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/osl -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} ${DEFAULT_CMAKE_FLAGS} ${OSL_EXTRA_ARGS}
+	INSTALL_DIR ${LIBDIR}/osl
 )
 
 add_dependencies(
-  external_osl
+	external_osl
-  external_boost
+	external_boost
-  ll
+	ll
-  external_clang
+	external_clang
-  external_openexr
+	external_ilmbase
-  external_zlib
+	external_openexr
-  external_flexbison
+	external_zlib
-  external_openimageio
+	external_flexbison
+	external_openimageio
 )
-
-if(UNIX)
-  # Rely on PugiXML compiled with OpenImageIO
-else()
-  add_dependencies(
-    external_osl
-    external_pugixml
-  )
-endif()
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_osl after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/osl/ ${HARVEST_TARGET}/osl
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_osl after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslcomp.lib ${HARVEST_TARGET}/osl/lib/oslcomp_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslexec.lib ${HARVEST_TARGET}/osl/lib/oslexec_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslquery.lib ${HARVEST_TARGET}/osl/lib/oslquery_d.lib
-      DEPENDEES install
-    )
-  endif()
-endif()

build_files/build_environment/cmake/package_python.cmake

@@ -1,60 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-if(MSVC)
-  set(PYTARGET ${HARVEST_TARGET}/python/${PYTHON_SHORT_VERSION_NO_DOTS})
-  set(PYSRC ${LIBDIR}/python/)
-
-  if(BUILD_MODE STREQUAL Release)
-    add_custom_command(
-      OUTPUT ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
-      COMMAND echo packaging python
-      COMMAND echo this should ouput at ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
-      COMMAND ${CMAKE_COMMAND} -E make_directory ${PYTARGET}/libs
-      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python.exe ${PYTARGET}/bin/python.exe
-      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_SHORT_VERSION_NO_DOTS}.dll ${PYTARGET}/bin/python${PYTHON_SHORT_VERSION_NO_DOTS}.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python3${PYTHON_POSTFIX}.dll ${PYTARGET}/bin/python3${PYTHON_POSTFIX}.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_SHORT_VERSION_NO_DOTS}.pdb ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.pdb
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/include/ ${PYTARGET}/include/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/lib/ ${PYTARGET}/lib/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/DLLs/ ${PYTARGET}/DLLs/
-      COMMAND cd ${PYTARGET}/lib/ && for /d /r . %%d in (__pycache__) do @if exist "%%d" echo "%%d" && rd /s/q "%%d"
-    )
-    add_custom_target(Package_Python ALL DEPENDS external_python external_numpy external_python_site_packages OUTPUT ${HARVEST_TARGET}/python/${PYTHON_SHORT_VERSION_NO_DOTS}/bin/python${PYTHON_POSTFIX}.exe)
-  endif()
-
-  if(BUILD_MODE STREQUAL Debug)
-    add_custom_command(
-      OUTPUT ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
-      COMMAND echo packaging python
-      COMMAND echo this should ouput at ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
-      COMMAND ${CMAKE_COMMAND} -E make_directory ${PYTARGET}/libs
-      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_POSTFIX}.exe ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
-      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll ${PYTARGET}/bin/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python3${PYTHON_POSTFIX}.dll ${PYTARGET}/bin/python3${PYTHON_POSTFIX}.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/include/ ${PYTARGET}/include/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/lib/ ${PYTARGET}/lib/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/DLLs/ ${PYTARGET}/DLLs/
-      COMMAND cd ${PYTARGET}/lib/ && for /d /r . %%d in (__pycache__) do @if exist "%%d" echo "%%d" && rd /s/q "%%d"
-    )
-    add_custom_target(Package_Python ALL DEPENDS external_python external_numpy external_python_site_packages OUTPUT ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe)
-  endif()
-endif()

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()

build_files/build_environment/cmake/pthreads.cmake

@@ -17,37 +17,30 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(WIN32)
+		set(PTHREAD_XCFLAGS /MD)
 
-    if(MSVC14) # vs2015 has timespec
+		if(MSVC14) # vs2015 has timespec
-      set(PTHREAD_CPPFLAGS "/I. /DHAVE_CONFIG_H /D_TIMESPEC_DEFINED ")
+			set(PTHREAD_CPPFLAGS "/I. /DHAVE_PTW32_CONFIG_H /D_TIMESPEC_DEFINED ")
-    else() # everything before doesn't
+		else() # everything before doesn't
-      set(PTHREAD_CPPFLAGS "/I. /DHAVE_CONFIG_H ")
+			set(PTHREAD_CPPFLAGS "/I. /DHAVE_PTW32_CONFIG_H ")
-    endif()
+		endif()
 
-    set(PTHREADS_BUILD cd ${BUILD_DIR}/pthreads/src/external_pthreads/ && cd && nmake VC-static /e CPPFLAGS=${PTHREAD_CPPFLAGS} /e XLIBS=/NODEFAULTLIB:msvcr)
+		set(PTHREADS_BUILD cd ${BUILD_DIR}/pthreads/src/external_pthreads/ && cd && nmake VC /e CPPFLAGS=${PTHREAD_CPPFLAGS} /e XCFLAGS=${PTHREAD_XCFLAGS} /e XLIBS=/NODEFAULTLIB:msvcr)
-
-    ExternalProject_Add(external_pthreads
-      URL ${PTHREADS_URI}
-      DOWNLOAD_DIR ${DOWNLOAD_DIR}
-      URL_HASH MD5=${PTHREADS_HASH}
-      PREFIX ${BUILD_DIR}/pthreads
-      CONFIGURE_COMMAND echo .
-      BUILD_COMMAND ${PTHREADS_BUILD}
-      INSTALL_COMMAND COMMAND
-        ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/libpthreadVC3${LIBEXT} ${LIBDIR}/pthreads/lib/pthreadVC3${LIBEXT} &&
-        ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthread.h ${LIBDIR}/pthreads/inc/pthread.h &&
-        ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/sched.h ${LIBDIR}/pthreads/inc/sched.h &&
-        ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/semaphore.h ${LIBDIR}/pthreads/inc/semaphore.h &&
-        ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/_ptw32.h ${LIBDIR}/pthreads/inc/_ptw32.h
-      INSTALL_DIR ${LIBDIR}/pthreads
-    )
-
-    if(BUILD_MODE STREQUAL Release)
-      ExternalProject_Add_Step(external_pthreads after_install
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/inc/ ${HARVEST_TARGET}/pthreads/include/
-        COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/pthreads/lib/ ${HARVEST_TARGET}/pthreads/lib
-        DEPENDEES install
-      )
-    endif()
 
+		ExternalProject_Add(external_pthreads
+			URL ${PTHREADS_URI}
+			DOWNLOAD_DIR ${DOWNLOAD_DIR}
+			URL_HASH SHA512=${PTHREADS_SHA512}
+			PREFIX ${BUILD_DIR}/pthreads
+			CONFIGURE_COMMAND echo .
+			PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/pthreads/src/external_pthreads < ${PATCH_DIR}/pthreads.diff
+			BUILD_COMMAND ${PTHREADS_BUILD}
+			INSTALL_COMMAND COMMAND
+				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthreadVC2.dll ${LIBDIR}/pthreads/lib/pthreadVC2.dll &&
+				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthreadVC2${LIBEXT} ${LIBDIR}/pthreads/lib/pthreadVC2${LIBEXT} &&
+				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthread.h ${LIBDIR}/pthreads/inc/pthread.h &&
+				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/sched.h ${LIBDIR}/pthreads/inc/sched.h &&
+				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/semaphore.h ${LIBDIR}/pthreads/inc/semaphore.h
+			INSTALL_DIR ${LIBDIR}/pthreads
+		)
 endif()

build_files/build_environment/cmake/pugixml.cmake

@@ -1,43 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(PUGIXML_EXTRA_ARGS
-)
-
-ExternalProject_Add(external_pugixml
-  URL ${PUGIXML_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${PUGIXML_HASH}
-  PREFIX ${BUILD_DIR}/pugixml
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/pugixml ${DEFAULT_CMAKE_FLAGS} ${PUGIXML_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/pugixml
-)
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_pugixml after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib ${HARVEST_TARGET}/osl/lib/pugixml.lib
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_pugixml after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/pugixml/lib/pugixml.lib ${HARVEST_TARGET}/osl/lib/pugixml_d.lib
-      DEPENDEES install
-    )
-  endif() 
-endif()

build_files/build_environment/cmake/python.cmake

@@ -18,86 +18,123 @@
 
 set(PYTHON_POSTFIX)
 if(BUILD_MODE STREQUAL Debug)
-  set(PYTHON_POSTFIX _d)
+	set(PYTHON_POSTFIX _d)
-  set(PYTHON_EXTRA_INSTLAL_FLAGS -d)
 endif()
 
 if(WIN32)
-  set(PYTHON_BINARY_INTERNAL ${BUILD_DIR}/python/src/external_python/PCBuild/amd64/python${PYTHON_POSTFIX}.exe)
+	set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe)
-  set(PYTHON_BINARY ${LIBDIR}/python/python${PYTHON_POSTFIX}.exe)
-  set(PYTHON_SRC ${BUILD_DIR}/python/src/external_python/)
-  macro(cmake_to_dos_path MsysPath ResultingPath)
-    string(REPLACE "/" "\\" ${ResultingPath} "${MsysPath}")
-  endmacro()
 
-  set(PYTHON_EXTERNALS_FOLDER ${BUILD_DIR}/python/src/external_python/externals)
+	macro(cmake_to_dos_path MsysPath ResultingPath)
-  set(DOWNLOADS_EXTERNALS_FOLDER ${DOWNLOAD_DIR}/externals)
+		string(REPLACE "/" "\\" ${ResultingPath} "${MsysPath}")
+	endmacro()
 
-  cmake_to_dos_path(${PYTHON_EXTERNALS_FOLDER} PYTHON_EXTERNALS_FOLDER_DOS)
+	set(PYTHON_EXTERNALS_FOLDER ${BUILD_DIR}/python/src/external_python/externals)
-  cmake_to_dos_path(${DOWNLOADS_EXTERNALS_FOLDER} DOWNLOADS_EXTERNALS_FOLDER_DOS)
+	set(DOWNLOADS_EXTERNALS_FOLDER ${DOWNLOAD_DIR}/externals)
 
-  ExternalProject_Add(external_python
+	cmake_to_dos_path(${PYTHON_EXTERNALS_FOLDER} PYTHON_EXTERNALS_FOLDER_DOS)
-    URL ${PYTHON_URI}
+	cmake_to_dos_path(${DOWNLOADS_EXTERNALS_FOLDER} DOWNLOADS_EXTERNALS_FOLDER_DOS)
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH MD5=${PYTHON_HASH}
-    PREFIX ${BUILD_DIR}/python
-    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}
-    INSTALL_COMMAND ${PYTHON_BINARY_INTERNAL} ${PYTHON_SRC}/PC/layout/main.py -b ${PYTHON_SRC}/PCbuild/amd64 -s ${PYTHON_SRC} -t ${PYTHON_SRC}/tmp/  --include-underpth --include-stable --include-pip --include-dev --include-launchers  --include-venv --include-symbols ${PYTHON_EXTRA_INSTLAL_FLAGS} --copy ${LIBDIR}/python
-  )
 
+	message("Python externals = ${PYTHON_EXTERNALS_FOLDER}")
+	message("Python externals_dos = ${PYTHON_EXTERNALS_FOLDER_DOS}")
+	message("Python DOWNLOADS_EXTERNALS_FOLDER = ${DOWNLOADS_EXTERNALS_FOLDER}")
+	message("Python DOWNLOADS_EXTERNALS_FOLDER_DOS = ${DOWNLOADS_EXTERNALS_FOLDER_DOS}")
+
+	ExternalProject_Add(external_python
+		URL ${PYTHON_URI}
+		DOWNLOAD_DIR ${DOWNLOAD_DIR}
+		URL_HASH MD5=${PYTHON_HASH}
+		PREFIX ${BUILD_DIR}/python
+		PATCH_COMMAND
+			echo mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}" &&
+			mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}" &&
+			${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python.diff &&
+			${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/python/src/external_python/pc < ${PATCH_DIR}/pyshell.diff
+		CONFIGURE_COMMAND ""
+		BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p ${PYTHON_ARCH} -c ${BUILD_MODE} -k ${PYTHON_COMPILER_STRING}
+		INSTALL_COMMAND COMMAND
+			${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll &&
+			${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib &&
+			${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.exp ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.exp &&
+			${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/include ${LIBDIR}/python/include/Python${PYTHON_SHORT_VERSION} &&
+			${CMAKE_COMMAND} -E copy "${BUILD_DIR}/python/src/external_python/PC/pyconfig.h" ${LIBDIR}/python/include/Python${PYTHON_SHORT_VERSION}/pyconfig.h
+	)
+	message("PythinRedist = ${BUILD_DIR}/python/src/external_python/redist")
+	message("POutput = ${PYTHON_OUTPUTDIR}")
 else()
-  if(APPLE)
+	if(APPLE)
-    # disable functions that can be in 10.13 sdk but aren't available on 10.9 target
+		# we need to manually add homebrew headers to get ssl module building
-    set(PYTHON_FUNC_CONFIGS
+		set(PYTHON_CFLAGS "-I/usr/local/opt/openssl/include -I${OSX_SYSROOT}/usr/include ${PLATFORM_CFLAGS}")
-      export ac_cv_func_futimens=no &&
+		set(PYTHON_LDFLAGS "-L/usr/local/opt/openssl/lib ${PLATFORM_LDFLAGS}")
-      export ac_cv_func_utimensat=no &&
+		set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV} && export CFLAGS=${PYTHON_CFLAGS} && export LDFLAGS=${PYTHON_LDFLAGS})
-      export ac_cv_func_basename_r=no &&
+		set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python.exe)
-      export ac_cv_func_clock_getres=no &&
+		set(PYTHON_PATCH ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_apple.diff)
-      export ac_cv_func_clock_gettime=no &&
+	else()
-      export ac_cv_func_clock_settime=no &&
+		set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV})
-      export ac_cv_func_dirname_r=no &&
+		set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python)
-      export ac_cv_func_getentropy=no &&
+	endif()
-      export ac_cv_func_mkostemp=no &&
-      export ac_cv_func_mkostemps=no &&
-      export ac_cv_func_timingsafe_bcmp=no)
-    set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV} && ${PYTHON_FUNC_CONFIGS})
-    set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python.exe)
-  else()
-    set(PYTHON_CONFIGURE_ENV ${CONFIGURE_ENV})
-    set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/python)
-  endif()
 
-  set(PYTHON_CONFIGURE_EXTRA_ARGS "--with-openssl=${LIBDIR}/ssl")
+	ExternalProject_Add(external_python
-  set(PYTHON_CFLAGS "-I${LIBDIR}/sqlite/include -I${LIBDIR}/bzip2/include -I${LIBDIR}/lzma/include -I${LIBDIR}/zlib/include")
+		URL ${PYTHON_URI}
-  set(PYTHON_LDFLAGS "-L${LIBDIR}/ffi/lib -L${LIBDIR}/sqlite/lib -L${LIBDIR}/bzip2/lib -L${LIBDIR}/lzma/lib -L${LIBDIR}/zlib/lib")
+		DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  set(PYTHON_CONFIGURE_EXTRA_ENV
+		URL_HASH MD5=${PYTHON_HASH}
-    export CFLAGS=${PYTHON_CFLAGS} &&
+		PREFIX ${BUILD_DIR}/python
-    export CPPFLAGS=${PYTHON_CFLAGS} &&
+		PATCH_COMMAND ${PYTHON_PATCH}
-    export LDFLAGS=${PYTHON_LDFLAGS} &&
+		CONFIGURE_COMMAND ${PYTHON_CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/python
-    export PKG_CONFIG_PATH=${LIBDIR}/ffi/lib/pkgconfig)
+		BUILD_COMMAND ${PYTHON_CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && make -j${MAKE_THREADS}
-  set(PYTHON_PATCH ${PATCH_CMD} --verbose -p1 -d ${BUILD_DIR}/python/src/external_python < ${PATCH_DIR}/python_linux.diff)
+		INSTALL_COMMAND ${PYTHON_CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && make install
+		INSTALL_DIR ${LIBDIR}/python)
 
-  ExternalProject_Add(external_python
+	add_custom_target(Make_Python_Environment ALL DEPENDS external_python)
-    URL ${PYTHON_URI}
-    DOWNLOAD_DIR ${DOWNLOAD_DIR}
-    URL_HASH MD5=${PYTHON_HASH}
-    PREFIX ${BUILD_DIR}/python
-    PATCH_COMMAND ${PYTHON_PATCH}
-    CONFIGURE_COMMAND ${PYTHON_CONFIGURE_ENV} && ${PYTHON_CONFIGURE_EXTRA_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/python ${PYTHON_CONFIGURE_EXTRA_ARGS}
-    BUILD_COMMAND ${PYTHON_CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && make -j${MAKE_THREADS}
-    INSTALL_COMMAND ${PYTHON_CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && make install
-    INSTALL_DIR ${LIBDIR}/python)
 endif()
 
-if(UNIX)
+if(MSVC)
-  add_dependencies(
+	add_custom_command(
-    external_python
+		OUTPUT ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz
-    external_bzip2
+		OUTPUT ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe
-    external_ffi
+		COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/lib ${BUILD_DIR}/python/src/external_python/redist/lib
-    external_lzma
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_POSTFIX}.exe" ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe
-    external_ssl
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_bz2${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_bz2${PYTHON_POSTFIX}.pyd
-    external_sqlite
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_hashlib${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_hashlib${PYTHON_POSTFIX}.pyd
-    external_zlib
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_lzma${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_lzma${PYTHON_POSTFIX}.pyd
-  )
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_sqlite3${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_sqlite3${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ssl${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ssl${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/pyexpat${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/pyexpat${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/select${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/select${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/unicodedata${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/unicodedata${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/winsound${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/winsound${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ctypes${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ctypes${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ctypes_test${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ctypes_test${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_decimal${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_decimal${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_elementtree${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_elementtree${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_msi${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_msi${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_multiprocessing${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_multiprocessing${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_overlapped${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_overlapped${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_socket${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_socket${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testbuffer${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testbuffer${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testcapi${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testcapi${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testimportmultiple${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testimportmultiple${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testmultiphase${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testmultiphase${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E chdir "${BUILD_DIR}/python/src/external_python/redist" ${CMAKE_COMMAND} -E tar "cfvz" "${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz" "."
+	)
+
+	add_custom_target(Package_Python ALL DEPENDS external_python ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe)
+
+	if(MSVC12)
+		set(PYTHON_DISTUTIL_PATCH ${PATCH_CMD} --verbose -p 0 -d ${BUILD_DIR}/python/src/external_python/run/lib/distutils < ${PATCH_DIR}/python_runtime_vc2013.diff)
+	else()
+		set(PYTHON_DISTUTIL_PATCH echo "No patch needed")
+	endif()
+
+	add_custom_command(OUTPUT ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe
+		COMMAND	${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/redist ${BUILD_DIR}/python/src/external_python/run
+		COMMAND	${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/include ${BUILD_DIR}/python/src/external_python/run/include
+		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}.lib" ${BUILD_DIR}/python/src/external_python/run/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib  #missing postfix on purpose, distutils is not expecting it
+		COMMAND	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib" ${BUILD_DIR}/python/src/external_python/run/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib  #other things like numpy still want it though.
+		COMMAND	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_POSTFIX}.exe" ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe
+		COMMAND	${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe -m ensurepip --upgrade
+		COMMAND	${PYTHON_DISTUTIL_PATCH}
+	)
+	add_custom_target(Make_Python_Environment ALL DEPENDS ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe Package_Python)
 endif()

build_files/build_environment/cmake/python.map

@@ -1,9 +0,0 @@
-{
-global:
-    Py*;
-    _Py*;
-    _py*;
-local:
-    *;
-};
-

build_files/build_environment/cmake/python_site_packages.cmake

@@ -15,16 +15,27 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # ***** 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" &&
+		${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/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/requests ${HARVEST_TARGET}/Release/site-packages/requests
+	)
+else()
+	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:
+	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
-  external_python
+	Make_Python_Environment
 )

build_files/build_environment/cmake/schroedinger.cmake

@@ -0,0 +1,48 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+if(WIN32)
+	set(SCHROEDINGER_EXTRA_FLAGS "CFLAGS=-g -I./ -I${LIBDIR}/orc/include/orc-0.4" "LDFLAGS=-Wl,--as-needed -static-libgcc -L${LIBDIR}/orc/lib" ORC_CFLAGS=-I${LIBDIR}/orc/include/orc-0.4 ORC_LDFLAGS=-L${LIBDIR}/orc/lib ORC_LIBS=${LIBDIR}/orc/lib/liborc-0.4.a ORCC=${LIBDIR}/orc/bin/orcc.exe)
+else()
+	set(SCHROEDINGER_CFLAGS "${PLATFORM_CFLAGS} -I./ -I${LIBDIR}/orc/include/orc-0.4")
+	set(SCHROEDINGER_LDFLAGS "${PLATFORM_LDFLAGS} -L${LIBDIR}/orc/lib")
+	set(SCHROEDINGER_EXTRA_FLAGS CFLAGS=${SCHROEDINGER_CFLAGS} LDFLAGS=${SCHROEDINGER_LDFLAGS} ORC_CFLAGS=-I${LIBDIR}/orc/include/orc-0.4 ORC_LDFLAGS=-L${LIBDIR}/orc/lib ORCC=${LIBDIR}/orc/bin/orcc) # ORC_LIBS=${LIBDIR}/orc/lib/liborc-0.4.a
+endif()
+
+ExternalProject_Add(external_schroedinger
+	URL ${SCHROEDINGER_URI}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	URL_HASH SHA256=${SCHROEDINGER_HASH}
+	PREFIX ${BUILD_DIR}/schroedinger
+	PATCH_COMMAND ${PATCH_CMD} --verbose -p 0 -N -d ${BUILD_DIR}/schroedinger/src/external_schroedinger < ${PATCH_DIR}/schroedinger.diff
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
+		cd ${BUILD_DIR}/schroedinger/src/external_schroedinger/ &&
+		${CONFIGURE_COMMAND} --prefix=${LIBDIR}/schroedinger --disable-shared --enable-static ${SCHROEDINGER_EXTRA_FLAGS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/schroedinger/src/external_schroedinger/ && make -j${MAKE_THREADS}
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/schroedinger/src/external_schroedinger/ && make install
+	INSTALL_DIR ${LIBDIR}/schroedinger
+)
+
+add_dependencies(
+	external_schroedinger
+	external_orc
+)
+
+if(MSVC)
+	set_target_properties(external_schroedinger PROPERTIES FOLDER Mingw)
+endif()

build_files/build_environment/cmake/sdl.cmake

@@ -17,33 +17,23 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(WIN32)
-  set(SDL_EXTRA_ARGS
+	set(SDL_EXTRA_ARGS
-    -DSDL_STATIC=Off
+		-DSDL_STATIC=Off
-  )
+	)
 else()
-  set(SDL_EXTRA_ARGS
+	set(SDL_EXTRA_ARGS
-    -DSDL_STATIC=ON
+		-DSDL_STATIC=ON
-    -DSDL_SHARED=OFF
+		-DSDL_SHARED=OFF
-    -DSDL_VIDEO=OFF
+		-DSDL_VIDEO=OFF
-    -DSNDIO=OFF
+	)
-  )
 endif()
 
 ExternalProject_Add(external_sdl
-  URL ${SDL_URI}
+	URL ${SDL_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${SDL_HASH}
+	URL_HASH MD5=${SDL_HASH}
-  PREFIX ${BUILD_DIR}/sdl
+	PREFIX ${BUILD_DIR}/sdl
-  PATCH_COMMAND ${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/sdl/src/external_sdl < ${PATCH_DIR}/sdl.diff
+	PATCH_COMMAND ${PATCH_CMD} -p 0 -N -d ${BUILD_DIR}/sdl/src/external_sdl < ${PATCH_DIR}/sdl.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/sdl ${DEFAULT_CMAKE_FLAGS} ${SDL_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/sdl ${DEFAULT_CMAKE_FLAGS} ${SDL_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/sdl
+	INSTALL_DIR ${LIBDIR}/sdl
 )
-
-if(BUILD_MODE STREQUAL Release AND WIN32)
-  ExternalProject_Add_Step(external_sdl after_install
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/include/sdl2 ${HARVEST_TARGET}/sdl/include
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/lib ${HARVEST_TARGET}/sdl/lib
-    COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/bin ${HARVEST_TARGET}/sdl/lib
-    DEPENDEES install
-  )
-endif()

build_files/build_environment/cmake/setup_mingw32.cmake

@@ -24,204 +24,195 @@
 
 message("LIBDIR = ${LIBDIR}")
 macro(cmake_to_msys_path MsysPath ResultingPath)
-  string(REPLACE ":" "" TmpPath "${MsysPath}")
+	string(REPLACE ":" "" TmpPath "${MsysPath}")
-  string(SUBSTRING ${TmpPath} 0 1 Drive)
+	string(SUBSTRING ${TmpPath} 0 1 Drive)
-  string(SUBSTRING ${TmpPath} 1 255 PathPart)
+	string(SUBSTRING ${TmpPath} 1 255 PathPart)
-  string(TOLOWER ${Drive} LowerDrive)
+	string(TOLOWER ${Drive} LowerDrive)
-  string(CONCAT ${ResultingPath} "/" ${LowerDrive} ${PathPart})
+	string(CONCAT ${ResultingPath} "/" ${LowerDrive} ${PathPart})
 endmacro()
 cmake_to_msys_path(${LIBDIR} mingw_LIBDIR)
 message("mingw_LIBDIR = ${mingw_LIBDIR}")
 
 message("Checking for mingw32")
 # download mingw32
-if(NOT EXISTS "${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z")
+if(NOT EXISTS "${DOWNLOAD_DIR}/i686-w64-mingw32-gcc-4.8.0-win32_rubenvb.7z")
-  message("Downloading mingw32")
+	message("Downloading mingw32")
-  file(DOWNLOAD "https://astuteinternet.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.4/threads-win32/sjlj/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z" "${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z")
+	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win32/Personal%20Builds/rubenvb/gcc-4.8-release/i686-w64-mingw32-gcc-4.8.0-win32_rubenvb.7z" "${DOWNLOAD_DIR}/i686-w64-mingw32-gcc-4.8.0-win32_rubenvb.7z")
 endif()
 
 # make mingw root directory
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/mingw
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/mingw
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}
-  )
+	)
 endif()
 
 # extract mingw32
-if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd") AND (EXISTS "${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z"))
+if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/mingw32env.cmd") AND (EXISTS "${DOWNLOAD_DIR}/i686-w64-mingw32-gcc-4.8.0-win32_rubenvb.7z"))
-  message("Extracting mingw32")
+	message("Extracting mingw32")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/i686-4.9.4-release-win32-sjlj-rt_v5-rev0.7z
+		COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/i686-w64-mingw32-gcc-4.8.0-win32_rubenvb.7z
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw
-  )
+	)
 endif()
 
 message("Checking for pkg-config")
 if(NOT EXISTS "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
-  message("Downloading pkg-config")
+	message("Downloading pkg-config")
-  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip" "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
+	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip" "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
 endif()
 
 # extract pkgconfig
 if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/pkg-config.exe") AND (EXISTS "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"))
-  message("Extracting pkg-config")
+	message("Extracting pkg-config")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"
+		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/
-  )
+	)
 
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1/bin/pkg-config.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/pkg-config.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1/bin/pkg-config.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/pkg-config.exe"
-  )
+	)
 
 endif()
 
 message("Checking for nasm")
-if(NOT EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip")
+if(NOT EXISTS "${DOWNLOAD_DIR}/nasm-2.12.01-win32.zip")
-  message("Downloading nasm")
+	message("Downloading nasm")
-  file(DOWNLOAD "http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/win32/nasm-2.13.02-win32.zip" "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip")
+	file(DOWNLOAD "http://www.nasm.us/pub/nasm/releasebuilds/2.12.01/win32/nasm-2.12.01-win32.zip" "${DOWNLOAD_DIR}/nasm-2.12.01-win32.zip")
 endif()
 
 # extract nasm
-if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe") AND (EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip"))
+if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe") AND (EXISTS "${DOWNLOAD_DIR}/nasm-2.12.01-win32.zip"))
-  message("Extracting nasm")
+	message("Extracting nasm")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/nasm-2.13.02-win32.zip"
+		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/nasm-2.12.01-win32.zip"
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/
-  )
+	)
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/nasm-2.13.02/nasm.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/nasm-2.12.01/nasm.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe"
-  )
+	)
 
 endif()
-SET(NASM_PATH ${DOWNLOAD_DIR}/mingw/mingw32/bin/nasm.exe)
+
 message("Checking for mingwGet")
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
-  message("Downloading mingw-get")
+	message("Downloading mingw-get")
-  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/Installer/mingw-get/mingw-get-0.6.2-beta-20131004-1/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip" "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
+	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/Installer/mingw-get/mingw-get-0.6.2-beta-20131004-1/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip" "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
 endif()
 
 # extract mingw_get
 if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get.exe") AND (EXISTS "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"))
-  message("Extracting mingw-get")
+	message("Extracting mingw-get")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"
+		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw/mingw32/
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw/mingw32/
-  )
+	)
 endif()
 
 if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/make.exe"))
-  message("Installing MSYS")
+	message("Installing MSYS")
-  execute_process(
+	execute_process(
-    COMMAND ${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get install msys msys-patch
+		COMMAND ${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get install msys msys-patch
-    WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw32/bin/
+		WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw32/bin/
-  )
+	)
 endif()
 
-if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/mktemp.exe"))
-  message("Installing mktemp")
-  execute_process(
-    COMMAND ${DOWNLOAD_DIR}/mingw/mingw32/bin/mingw-get install msys msys-mktemp
-    WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw32/bin/
-  )
-endif()
-
-
 message("Checking for CoreUtils")
 # download old core_utils for pr.exe (ffmpeg needs it to build)
 if(NOT EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
-  message("Downloading CoreUtils 5.97")
+	message("Downloading CoreUtils 5.97")
-  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/MSYS/Base/msys-core/_obsolete/coreutils-5.97-MSYS-1.0.11-2/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2" "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
+	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/MSYS/Base/msys-core/_obsolete/coreutils-5.97-MSYS-1.0.11-2/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2" "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
 endif()
 
 if((EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/pr.exe"))
-  message("Installing pr from CoreUtils 5.97")
+	message("Installing pr from CoreUtils 5.97")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/tmp_coreutils
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/tmp_coreutils
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}
-  )
+	)
 
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2
+		COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
-  )
+	)
 
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy ${DOWNLOAD_DIR}/tmp_coreutils/coreutils-5.97/bin/pr.exe "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/pr.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy ${DOWNLOAD_DIR}/tmp_coreutils/coreutils-5.97/bin/pr.exe "${DOWNLOAD_DIR}/mingw/mingw32/msys/1.0/bin/pr.exe"
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
-  )
+	)
 endif()
 
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd")
-  message("Installing ming32sh.cmd")
+	message("Installing ming32sh.cmd")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/ming32sh.cmd  ${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd
+		COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/ming32sh.cmd  ${DOWNLOAD_DIR}/mingw/mingw32/ming32sh.cmd
-  )
+	)
 endif()
 
 message("Checking for perl")
 # download perl for libvpx
 if(NOT EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip")
-  message("Downloading perl")
+	message("Downloading perl")
-  file(DOWNLOAD "http://strawberryperl.com/download/5.22.1.3/strawberry-perl-5.22.1.3-32bit-portable.zip" "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip")
+	file(DOWNLOAD "http://strawberryperl.com/download/5.22.1.3/strawberry-perl-5.22.1.3-32bit-portable.zip" "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip")
 endif()
 
 # make perl root directory
 if(NOT EXISTS "${DOWNLOAD_DIR}/perl32")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/perl32
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/perl32
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}
-  )
+	)
 endif()
 
 # extract perl
 if((NOT EXISTS "${DOWNLOAD_DIR}/perl32/portable.perl") AND (EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip"))
-  message("Extracting perl")
+	message("Extracting perl")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip
+		COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-32bit-portable.zip
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/perl32
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/perl32
-  )
+	)
 endif()
 
 # get yasm for vpx
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/yasm.exe")
-  message("Downloading yasm")
+	message("Downloading yasm")
-  file(DOWNLOAD "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win32.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/yasm.exe")
+	file(DOWNLOAD "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win32.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/yasm.exe")
 endif()
 
 message("checking i686-w64-mingw32-strings")
 # copy strings.exe to i686-w64-mingw32-strings for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strings.exe")
-  message("fixing i686-w64-mingw32-strings.exe")
+	message("fixing i686-w64-mingw32-strings.exe")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/strings.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strings.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/strings.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strings.exe"
-  )
+	)
 endif()
 
 message("checking i686-w64-mingw32-ar.exe")
 # copy ar.exe to i686-w64-mingw32-ar.exe for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ar.exe")
-  message("fixing i686-w64-mingw32-ar.exe")
+	message("fixing i686-w64-mingw32-ar.exe")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/ar.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ar.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/ar.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ar.exe"
-  )
+	)
 endif()
 
 message("checking i686-w64-mingw32-strip.exe")
 # copy strip.exe to i686-w64-mingw32-strip.exe for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strip.exe")
-  message("fixing i686-w64-mingw32-strip.exe")
+	message("fixing i686-w64-mingw32-strip.exe")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/strip.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strip.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/strip.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-strip.exe"
-  )
+	)
 endif()
 
 message("checking i686-w64-mingw32-ranlib.exe")
 # copy ranlib.exe to i686-w64-mingw32-ranlib.exe for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ranlib.exe")
-  message("fixing i686-w64-mingw32-ranlib.exe")
+	message("fixing i686-w64-mingw32-ranlib.exe")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/ranlib.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ranlib.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw32/bin/ranlib.exe" "${DOWNLOAD_DIR}/mingw/mingw32/bin/i686-w64-mingw32-ranlib.exe"
-  )
+	)
 endif()

build_files/build_environment/cmake/setup_mingw64.cmake

@@ -24,204 +24,195 @@
 
 message("LIBDIR = ${LIBDIR}")
 macro(cmake_to_msys_path MsysPath ResultingPath)
-  string(REPLACE ":" "" TmpPath "${MsysPath}")
+	string(REPLACE ":" "" TmpPath "${MsysPath}")
-  string(SUBSTRING ${TmpPath} 0 1 Drive)
+	string(SUBSTRING ${TmpPath} 0 1 Drive)
-  string(SUBSTRING ${TmpPath} 1 255 PathPart)
+	string(SUBSTRING ${TmpPath} 1 255 PathPart)
-  string(TOLOWER ${Drive} LowerDrive)
+	string(TOLOWER ${Drive} LowerDrive)
-  string(CONCAT ${ResultingPath} "/" ${LowerDrive} ${PathPart})
+	string(CONCAT ${ResultingPath} "/" ${LowerDrive} ${PathPart})
 endmacro()
 cmake_to_msys_path(${LIBDIR} mingw_LIBDIR)
 message("mingw_LIBDIR = ${mingw_LIBDIR}")
 
 message("Checking for mingw64")
 # download ming64
-if(NOT EXISTS "${DOWNLOAD_DIR}/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z")
+if(NOT EXISTS "${DOWNLOAD_DIR}/x86_64-w64-mingw32-gcc-4.8.0-win64_rubenvb.7z")
-  message("Downloading mingw64")
+	message("Downloading mingw64")
-  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/4.9.4/threads-win32/seh/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z" "${DOWNLOAD_DIR}/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z")
+	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win64/Personal%20Builds/rubenvb/gcc-4.8-release/x86_64-w64-mingw32-gcc-4.8.0-win64_rubenvb.7z" "${DOWNLOAD_DIR}/x86_64-w64-mingw32-gcc-4.8.0-win64_rubenvb.7z")
 endif()
 
 # make mingw root directory
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/mingw
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/mingw
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}
-  )
+	)
 endif()
 
 # extract mingw64
-if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/ming64sh.cmd") AND (EXISTS "${DOWNLOAD_DIR}/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z"))
+if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/mingw64env.cmd") AND (EXISTS "${DOWNLOAD_DIR}/x86_64-w64-mingw32-gcc-4.8.0-win64_rubenvb.7z"))
-  message("Extracting mingw64")
+	message("Extracting mingw64")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/x86_64-4.9.4-release-win32-seh-rt_v5-rev0.7z
+		COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/x86_64-w64-mingw32-gcc-4.8.0-win64_rubenvb.7z
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw
-  )
+	)
 endif()
 
 message("Checking for pkg-config")
 if(NOT EXISTS "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
-  message("Downloading pkg-config")
+	message("Downloading pkg-config")
-  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip" "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
+	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip" "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip")
 endif()
 
 # extract pkgconfig
 if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/pkg-config.exe") AND (EXISTS "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"))
-  message("Extracting pkg-config")
+	message("Extracting pkg-config")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"
+		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1_bin-win32.zip"
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/
-  )
+	)
 
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1/bin/pkg-config.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/pkg-config.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/pkg-config-lite-0.28-1/bin/pkg-config.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/pkg-config.exe"
-  )
+	)
 
 endif()
 
 message("Checking for nasm")
-if(NOT EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win64.zip")
+if(NOT EXISTS "${DOWNLOAD_DIR}/nasm-2.12.01-win64.zip")
-  message("Downloading nasm")
+	message("Downloading nasm")
-  file(DOWNLOAD "http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/win64/nasm-2.13.02-win64.zip" "${DOWNLOAD_DIR}/nasm-2.13.02-win64.zip")
+	file(DOWNLOAD "http://www.nasm.us/pub/nasm/releasebuilds/2.12.01/win64/nasm-2.12.01-win64.zip" "${DOWNLOAD_DIR}/nasm-2.12.01-win64.zip")
 endif()
 
 # extract nasm
-if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/nasm.exe") AND (EXISTS "${DOWNLOAD_DIR}/nasm-2.13.02-win64.zip"))
+if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/nasm.exe") AND (EXISTS "${DOWNLOAD_DIR}/nasm-2.12.01-win64.zip"))
-  message("Extracting nasm")
+	message("Extracting nasm")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/nasm-2.13.02-win64.zip"
+		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/nasm-2.12.01-win64.zip"
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/
-  )
+	)
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/nasm-2.13.02/nasm.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/nasm.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/nasm-2.12.01/nasm.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/nasm.exe"
-  )
+	)
 
 endif()
-SET(NASM_PATH ${DOWNLOAD_DIR}/mingw/mingw64/bin/nasm.exe)
 
 message("Checking for mingwGet")
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
-  message("Downloading mingw-get")
+	message("Downloading mingw-get")
-  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/Installer/mingw-get/mingw-get-0.6.2-beta-20131004-1/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip" "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
+	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/Installer/mingw-get/mingw-get-0.6.2-beta-20131004-1/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip" "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip")
 endif()
 
 # extract mingw_get
 if((NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get.exe") AND (EXISTS "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"))
-  message("Extracting mingw-get")
+	message("Extracting mingw-get")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"
+		COMMAND ${CMAKE_COMMAND} -E tar jxf "${DOWNLOAD_DIR}/mingw-get-0.6.2-mingw32-beta-20131004-1-bin.zip"
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw/mingw64/
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/mingw/mingw64/
-  )
+	)
 endif()
 
 if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/make.exe"))
-  message("Installing MSYS")
+	message("Installing MSYS")
-  execute_process(
+	execute_process(
-    COMMAND ${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get install msys msys-patch
+		COMMAND ${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get install msys msys-patch
-    WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw64/bin/
+		WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw64/bin/
-  )
+	)
-endif()
-
-if((EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get.exe") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/mktemp.exe"))
-  message("Installing mktemp")
-  execute_process(
-    COMMAND ${DOWNLOAD_DIR}/mingw/mingw64/bin/mingw-get install msys msys-mktemp
-    WORKING_DIRECTORY  ${DOWNLOAD_DIR}/mingw/mingw64/bin/
-  )
 endif()
 
 message("Checking for CoreUtils")
 # download old core_utils for pr.exe (ffmpeg needs it to build)
 if(NOT EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
-  message("Downloading CoreUtils 5.97")
+	message("Downloading CoreUtils 5.97")
-  file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/MSYS/Base/msys-core/_obsolete/coreutils-5.97-MSYS-1.0.11-2/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2" "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
+	file(DOWNLOAD "https://nchc.dl.sourceforge.net/project/mingw/MSYS/Base/msys-core/_obsolete/coreutils-5.97-MSYS-1.0.11-2/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2" "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2")
 endif()
 
 if((EXISTS "${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2") AND (NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/pr.exe"))
-  message("Installing pr from CoreUtils 5.97")
+	message("Installing pr from CoreUtils 5.97")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/tmp_coreutils
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/tmp_coreutils
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}
-  )
+	)
 
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2
+		COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/coreutils-5.97-MSYS-1.0.11-snapshot.tar.bz2
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
-  )
+	)
 
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy ${DOWNLOAD_DIR}/tmp_coreutils/coreutils-5.97/bin/pr.exe "${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/pr.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy ${DOWNLOAD_DIR}/tmp_coreutils/coreutils-5.97/bin/pr.exe "${DOWNLOAD_DIR}/mingw/mingw64/msys/1.0/bin/pr.exe"
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/tmp_coreutils/
-  )
+	)
 endif()
 
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/ming64sh.cmd")
-  message("Installing ming64sh.cmd")
+	message("Installing ming64sh.cmd")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/ming64sh.cmd  ${DOWNLOAD_DIR}/mingw/mingw64/ming64sh.cmd
+		COMMAND ${CMAKE_COMMAND} -E copy ${PATCH_DIR}/ming64sh.cmd  ${DOWNLOAD_DIR}/mingw/mingw64/ming64sh.cmd
-  )
+	)
 endif()
 
 message("Checking for perl")
 # download perl for libvpx
 if(NOT EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip")
-  message("Downloading perl")
+	message("Downloading perl")
-  file(DOWNLOAD "http://strawberryperl.com/download/5.22.1.3/strawberry-perl-5.22.1.3-64bit-portable.zip" "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip")
+	file(DOWNLOAD "http://strawberryperl.com/download/5.22.1.3/strawberry-perl-5.22.1.3-64bit-portable.zip" "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip")
 endif()
 
 # make perl root directory
 if(NOT EXISTS "${DOWNLOAD_DIR}/perl")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/perl
+		COMMAND ${CMAKE_COMMAND} -E make_directory ${DOWNLOAD_DIR}/perl
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}
-  )
+	)
 endif()
 
 # extract perl
 if((NOT EXISTS "${DOWNLOAD_DIR}/perl/portable.perl") AND (EXISTS "${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip"))
-  message("Extracting perl")
+	message("Extracting perl")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip
+		COMMAND ${CMAKE_COMMAND} -E tar jxf ${DOWNLOAD_DIR}/strawberry-perl-5.22.1.3-64bit-portable.zip
-    WORKING_DIRECTORY ${DOWNLOAD_DIR}/perl
+		WORKING_DIRECTORY ${DOWNLOAD_DIR}/perl
-  )
+	)
 endif()
 
 # get yasm for vpx
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/yasm.exe")
-  message("Downloading yasm")
+	message("Downloading yasm")
-  file(DOWNLOAD "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win64.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/yasm.exe")
+	file(DOWNLOAD "http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win64.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/yasm.exe")
 endif()
 
 message("checking x86_64-w64-mingw32-strings.exe")
 # copy strings.exe to x86_64-w64-mingw32-strings.exe for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-strings.exe")
-  message("fixing x86_64-w64-mingw32-strings.exe")
+	message("fixing x86_64-w64-mingw32-strings.exe")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/strings.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-strings.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/strings.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-strings.exe"
-  )
+	)
 endif()
 
 message("checking x86_64-w64-mingw32-ar.exe")
 # copy ar.exe to x86_64-w64-mingw32-ar.exe for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-ar.exe")
-  message("fixing x86_64-w64-mingw32-ar.exe")
+	message("fixing x86_64-w64-mingw32-ar.exe")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/ar.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-ar.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/ar.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-ar.exe"
-  )
+	)
 endif()
 
 message("checking x86_64-w64-mingw32-strip.exe")
 # copy strip.exe to x86_64-w64-mingw32-strip.exe for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-strip.exe")
-  message("fixing x86_64-w64-mingw32-strip.exe")
+	message("fixing x86_64-w64-mingw32-strip.exe")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/strip.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-strip.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/strip.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-strip.exe"
-  )
+	)
 endif()
 
 message("checking x86_64-w64-mingw32-ranlib.exe")
 # copy ranlib.exe to x86_64-w64-mingw32-ranlib.exe for x264
 if(NOT EXISTS "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-ranlib.exe")
-  message("fixing x86_64-w64-mingw32-ranlib.exe")
+	message("fixing x86_64-w64-mingw32-ranlib.exe")
-  execute_process(
+	execute_process(
-    COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/ranlib.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-ranlib.exe"
+		COMMAND ${CMAKE_COMMAND} -E copy "${DOWNLOAD_DIR}/mingw/mingw64/bin/ranlib.exe" "${DOWNLOAD_DIR}/mingw/mingw64/bin/x86_64-w64-mingw32-ranlib.exe"
-  )
+	)
 endif()

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()

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
 )

build_files/build_environment/cmake/sqlite.cmake

@@ -1,59 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(SQLITE_CONFIGURE_ENV echo .)
-set(SQLITE_CONFIGURATION_ARGS)
-
-if(UNIX)
-  if(NOT APPLE)
-    set(SQLITE_LDFLAGS -Wl,--as-needed)
-  endif()
-  set(SQLITE_CFLAGS
-    "-DSQLITE_SECURE_DELETE -DSQLITE_ENABLE_COLUMN_METADATA \
-    -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS \
-    -DSQLITE_ENABLE_RTREE=1 -DSQLITE_SOUNDEX=1 \
-    -DSQLITE_ENABLE_UNLOCK_NOTIFY \
-    -DSQLITE_OMIT_LOOKASIDE=1 -DSQLITE_ENABLE_DBSTAT_VTAB \
-    -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT=1 \
-    -DSQLITE_ENABLE_LOAD_EXTENSION \
-    -DSQLITE_ENABLE_JSON1 \
-    -DSQLITE_LIKE_DOESNT_MATCH_BLOBS \
-    -DSQLITE_THREADSAFE=1 \
-    -DSQLITE_ENABLE_FTS3_TOKENIZER=1 \
-    -DSQLITE_MAX_SCHEMA_RETRY=25 \
-    -DSQLITE_ENABLE_PREUPDATE_HOOK \
-    -DSQLITE_ENABLE_SESSION \
-    -DSQLITE_ENABLE_STMTVTAB \
-    -DSQLITE_MAX_VARIABLE_NUMBER=250000 \
-    -fPIC")
-  set(SQLITE_CONFIGURE_ENV ${SQLITE_CONFIGURE_ENV} && export LDFLAGS=${SQLITE_LDFLAGS} && export CFLAGS=${SQLITE_CFLAGS})
-  set(SQLITE_CONFIGURATION_ARGS ${SQLITE_CONFIGURATION_ARGS} --enable-threadsafe --enable-load-extension --enable-json1 --enable-fts4 --enable-fts5
-      --enable-shared=no)
-endif()
-
-ExternalProject_Add(external_sqlite
-  URL ${SQLITE_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH SHA1=${SQLITE_HASH}
-  PREFIX ${BUILD_DIR}/sqlite
-  PATCH_COMMAND ${SQLITE_PATCH_CMD}
-  CONFIGURE_COMMAND ${SQLITE_CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/sqlite ${SQLITE_CONFIGURATION_ARGS}
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/sqlite/src/external_sqlite/ && make install
-  INSTALL_DIR ${LIBDIR}/sqlite
-)

build_files/build_environment/cmake/ssl.cmake

@@ -1,48 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(SSL_CONFIGURE_COMMAND ./Configure)
-set(SSL_PATCH_CMD echo .)
-
-if(APPLE)
-  set(SSL_OS_COMPILER "blender-darwin-x86_64")
-else()
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    set(SSL_EXTRA_ARGS enable-ec_nistp_64_gcc_128)
-    set(SSL_OS_COMPILER "blender-linux-x86_64")
-  else()
-    set(SSL_OS_COMPILER "blender-linux-x86")
-  endif()
-endif()
-
-ExternalProject_Add(external_ssl
-  URL ${SSL_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH SHA256=${SSL_HASH}
-  PREFIX ${BUILD_DIR}/ssl
-  PATCH_COMMAND ${SSL_PATCH_CMD}
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && ${SSL_CONFIGURE_COMMAND} --prefix=${LIBDIR}/ssl
-    --openssldir=${LIBDIR}/ssl
-    no-shared
-    no-idea no-mdc2 no-rc5 no-zlib no-ssl3 enable-unit-test no-ssl3-method enable-rfc3779 enable-cms
-    --config=${CMAKE_CURRENT_SOURCE_DIR}/cmake/ssl.conf
-    ${SSL_OS_COMPILER}
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/ssl/src/external_ssl/ && make install
-  INSTALL_DIR ${LIBDIR}/ssl
-)

build_files/build_environment/cmake/ssl.conf

@@ -1,15 +0,0 @@
-%targets = (
-
-  "blender-linux-x86" => {
-    inherit_from     => [ "linux-x86" ],
-    cflags => add("-fPIC"),
-  },
-  "blender-linux-x86_64" => {
-    inherit_from     => [ "linux-x86_64" ],
-    cflags => add("-fPIC"),
-  },
-  "blender-darwin-x86_64" => {
-    inherit_from     => [ "darwin64-x86_64-cc" ],
-    cflags => add("-fPIC"),
-  },
-);

build_files/build_environment/cmake/tbb.cmake

@@ -15,53 +15,30 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # ***** END GPL LICENSE BLOCK *****
-if(WIN32)
+
-  set(TBB_EXTRA_ARGS
+set(TBB_EXTRA_ARGS
-    -DTBB_BUILD_SHARED=On
+	-DTBB_BUILD_SHARED=Off
-    -DTBB_BUILD_TBBMALLOC=On
+	-DTBB_BUILD_TBBMALLOC=Off
-    -DTBB_BUILD_TBBMALLOC_PROXY=On
+	-DTBB_BUILD_TBBMALLOC_PROXY=Off
-    -DTBB_BUILD_STATIC=On
+	-DTBB_BUILD_STATIC=On
 )
+
+if(TBB_VERSION MATCHES 2018)
+	set(TBB_VS_VERSION vs2013)
+elseif(TBB_VERSION MATCHES 2017)
+	set(TBB_VS_VERSION vs2012)
 else()
-  set(TBB_EXTRA_ARGS
+	set(TBB_VS_VERSION vs2010)
-    -DTBB_BUILD_SHARED=Off
-    -DTBB_BUILD_TBBMALLOC=On
-    -DTBB_BUILD_TBBMALLOC_PROXY=Off
-    -DTBB_BUILD_STATIC=On
-  )
 endif()
 
 # 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/${TBB_VS_VERSION}/version_string.ver ${BUILD_DIR}/tbb/src/external_tbb/src/tbb/version_string.ver
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tbb ${DEFAULT_CMAKE_FLAGS} ${TBB_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tbb ${DEFAULT_CMAKE_FLAGS} ${TBB_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/tbb
+	INSTALL_DIR ${LIBDIR}/tbb
 )
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_tbb after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc.dll ${HARVEST_TARGET}/tbb/lib/tbbmalloc.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc_proxy.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy.dll ${HARVEST_TARGET}/tbb/lib/tbbmalloc_proxy.dll
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tbb/include/ ${HARVEST_TARGET}/tbb/include/
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_tbb after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb_debug.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy.lib ${HARVEST_TARGET}/tbb/lib/tbbmalloc_proxy_debug.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc.dll ${HARVEST_TARGET}/tbb/lib/debug/tbbmalloc.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbbmalloc_proxy.dll ${HARVEST_TARGET}/tbb/lib/debug/tbbmalloc_proxy.dll
-      DEPENDEES install
-    )
-  endif()
-endif()

build_files/build_environment/cmake/theora.cmake

@@ -16,35 +16,29 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-if(UNIX)
-  set(THEORA_CONFIGURE_ENV ${CONFIGURE_ENV} && export HAVE_PDFLATEX=no)
-else()
-  set(THEORA_CONFIGURE_ENV ${CONFIGURE_ENV})
-endif()
-
 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 ${THEORA_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 ${THEORA_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 ${THEORA_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()

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()

build_files/build_environment/cmake/tinyxml.cmake

@@ -1,31 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(TINYXML_EXTRA_ARGS
-)
-
-ExternalProject_Add(external_tinyxml
-  URL ${TINYXML_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${TINYXML_HASH}
-  PREFIX ${BUILD_DIR}/tinyxml
-  # patch taken from ocio
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -N -d ${BUILD_DIR}/tinyxml/src/external_tinyxml < ${PATCH_DIR}/tinyxml.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/tinyxml ${DEFAULT_CMAKE_FLAGS} ${TINYXML_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/tinyxml
-)

build_files/build_environment/cmake/usd.cmake

@@ -1,101 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-set(USD_EXTRA_ARGS
-  -DBoost_COMPILER:STRING=${BOOST_COMPILER_STRING}
-  -DBoost_USE_MULTITHREADED=ON
-  -DBoost_USE_STATIC_LIBS=ON
-  -DBoost_USE_STATIC_RUNTIME=OFF
-  -DBOOST_ROOT=${LIBDIR}/boost
-  -DTBB_INCLUDE_DIRS=${LIBDIR}/tbb/include
-  -DTBB_LIBRARIES=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
-  -DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}tbb_static${LIBEXT}
-
-  # This is a preventative measure that avoids possible conflicts when add-ons
-  # try to load another USD library into the same process space.
-  -DPXR_SET_INTERNAL_NAMESPACE=usdBlender
-
-  -DPXR_ENABLE_PYTHON_SUPPORT=OFF
-  -DPXR_BUILD_IMAGING=OFF
-  -DPXR_BUILD_TESTS=OFF
-  -DBUILD_SHARED_LIBS=OFF
-  -DPYTHON_EXECUTABLE=${PYTHON_BINARY}
-  -DPXR_BUILD_MONOLITHIC=ON
-
-  # The PXR_BUILD_USD_TOOLS argument is patched-in by usd.diff. An upstream pull request
-  # can be found at https://github.com/PixarAnimationStudios/USD/pull/1048.
-  -DPXR_BUILD_USD_TOOLS=OFF
-
-  -DCMAKE_DEBUG_POSTFIX=_d
-  # USD is hellbound on making a shared lib, unless you point this variable to a valid cmake file
-  # doesn't have to make sense, but as long as it points somewhere valid it will skip the shared lib.
-  -DPXR_MONOLITHIC_IMPORT=${BUILD_DIR}/usd/src/external_usd/cmake/defaults/Version.cmake
-)
-
-ExternalProject_Add(external_usd
-  URL ${USD_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${USD_HASH}
-  PREFIX ${BUILD_DIR}/usd
-  PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/usd/src/external_usd < ${PATCH_DIR}/usd.diff
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/usd -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${USD_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/usd
-)
-
-add_dependencies(
-  external_usd
-  external_tbb
-  external_boost
-)
-
-if(WIN32)
-  # USD currently demands python be available at build time
-  # and then proceeds not to use it, but still checks that the
-  # version of the interpreter it is not going to use is atleast 2.7
-  # so we need this dep currently since there is no system python
-  # on windows.
-  add_dependencies(
-    external_usd
-    external_python
-  )
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_usd after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/ ${HARVEST_TARGET}/usd
-      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Release/libusd_m.lib ${HARVEST_TARGET}/usd/lib/libusd_m.lib
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_usd after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/usd/lib ${HARVEST_TARGET}/usd/lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/Debug/libusd_m_d.lib ${HARVEST_TARGET}/usd/lib/libusd_m_d.lib
-      DEPENDEES install
-    )
-  endif()
-else()
-  # USD has two build options. The default build creates lots of small libraries,
-  # whereas the 'monolithic' build produces only a single library. The latter
-  # makes linking simpler, so that's what we use in Blender. However, running
-  # 'make install' in the USD sources doesn't install the static library in that
-  # case (only the shared library). As a result, we need to grab the `libusd_m.a`
-  # file from the build directory instead of from the install directory.
-  ExternalProject_Add_Step(external_usd after_install
-    COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/usd/src/external_usd-build/pxr/libusd_m.a ${HARVEST_TARGET}/usd/lib/libusd_m.a
-    DEPENDEES install
-  )
-endif()

build_files/build_environment/cmake/versions.cmake

@@ -16,59 +16,46 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-set(ZLIB_VERSION 1.2.11)
+set(ZLIB_VERSION 1.2.8)
-set(ZLIB_URI https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz)
+set(ZLIB_URI https://netcologne.dl.sourceforge.net/project/libpng/zlib/${ZLIB_VERSION}/zlib-${ZLIB_VERSION}.tar.gz)
-set(ZLIB_HASH 1c9f62f0778697a09d36121ead88e08e)
+set(ZLIB_HASH 44d667c142d7cda120332623eab69f40)
 
-set(OPENAL_VERSION 1.18.2)
+set(OPENAL_VERSION 1.17.2)
-set(OPENAL_URI http://openal-soft.org/openal-releases/openal-soft-${OPENAL_VERSION}.tar.bz2)
+set(OPENAL_URI http://kcat.strangesoft.net/openal-releases/openal-soft-${OPENAL_VERSION}.tar.bz2)
-set(OPENAL_HASH d4eeb0889812e2fdeaa1843523d76190)
+set(OPENAL_HASH 1764e0d8fec499589b47ebc724e0913d)
 
-set(PNG_VERSION 1.6.35)
+set(PNG_VERSION 1.6.21)
-set(PNG_URI http://prdownloads.sourceforge.net/libpng/libpng-${PNG_VERSION}.tar.xz)
+set(PNG_URI http://prdownloads.sourceforge.net/libpng/libpng-${PNG_VERSION}.tar.gz)
-set(PNG_HASH 678b7e696a62a193ed3503b04bf449d6)
+set(PNG_HASH aca36ec8e0a3b406a5912243bc243717)
 
-set(JPEG_VERSION 1.5.3)
+set(JPEG_VERSION 1.4.2)
 set(JPEG_URI https://github.com/libjpeg-turbo/libjpeg-turbo/archive/${JPEG_VERSION}.tar.gz)
-set(JPEG_HASH 5b7549d440b86c98a517355c102d155e)
+set(JPEG_HASH f9804884c1c41eb7f4febb9353a2cb27)
 
-set(BOOST_VERSION 1.70.0)
+set(BOOST_VERSION 1.60.0)
-set(BOOST_VERSION_NODOTS 1_70_0)
+set(BOOST_VERSION_NODOTS 1_60_0)
-set(BOOST_VERSION_NODOTS_SHORT 1_70)
+set(BOOST_URI http://sourceforge.net/projects/boost/files/boost/${BOOST_VERSION}/boost_${BOOST_VERSION_NODOTS}.tar.bz2/download)
-set(BOOST_URI https://dl.bintray.com/boostorg/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_NODOTS}.tar.gz)
+set(BOOST_MD5 65a840e1a0b13a558ff19eeb2c4f0cbe)
-set(BOOST_HASH fea771fe8176828fabf9c09242ee8c26)
 
-# Using old version as recommended by OpenVDB build documentation.
+set(BLOSC_VERSION 1.7.1)
-set(BLOSC_VERSION 1.5.0)
+set(BLOSC_URI https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.zip)
-set(BLOSC_URI https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.tar.gz)
+set(BLOSC_HASH ff5cc729a5a25934ef714217218eed26)
-set(BLOSC_HASH 6e4a49c8c06f05aa543f3312cfce3d55)
 
-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(OPENEXR_VERSION 2.4.0)
+set(ILMBASE_VERSION 2.2.0)
-set(OPENEXR_URI https://github.com/AcademySoftwareFoundation/openexr/archive/v${OPENEXR_VERSION}.tar.gz)
+set(ILMBASE_URI http://download.savannah.nongnu.org/releases/openexr/ilmbase-${ILMBASE_VERSION}.tar.gz)
-set(OPENEXR_HASH 9e4d69cf2a12c6fb19b98af7c5e0eaee)
+set(ILMBASE_HASH b540db502c5fa42078249f43d18a4652)
-if(WIN32)
-  # Openexr started appending _d on its own so now
-  # we need to tell the build the postfix is _s while
-  # telling all other deps the postfix is _s_d
-  if(BUILD_MODE STREQUAL Release)
-    set(OPENEXR_VERSION_POSTFIX _s)
-    set(OPENEXR_VERSION_BUILD_POSTFIX _s)
-  else()
-    set(OPENEXR_VERSION_POSTFIX _s_d)
-    set(OPENEXR_VERSION_BUILD_POSTFIX _s)
-  endif()
-else()
-  set(OPENEXR_VERSION_BUILD_POSTFIX)
-  set(OPENEXR_VERSION_POSTFIX)
-endif()
 
-set(FREETYPE_VERSION 2.10.1)
+set(OPENEXR_VERSION 2.2.0)
-set(FREETYPE_URI http://prdownloads.sourceforge.net/freetype/freetype-${FREETYPE_VERSION}.tar.gz)
+set(OPENEXR_URI http://download.savannah.nongnu.org/releases/openexr/openexr-2.2.0.tar.gz)
-set(FREETYPE_HASH c50a3c9e5e62bdc938a6e1598a782947)
+set(OPENEXR_HASH b64e931c82aa3790329c21418373db4e)
+
+set(FREETYPE_VERSION 263)
+set(FREETYPE_URI http://download.savannah.gnu.org/releases/freetype/ft${FREETYPE_VERSION}.zip)
+set(FREETYPE_HASH 0db2a43301572e5c2b4a0864f237aeeb)
 
 set(GLEW_VERSION 1.13.0)
 set(GLEW_URI http://prdownloads.sourceforge.net/glew/glew/${GLEW_VERSION}/glew-${GLEW_VERSION}.tgz)
@@ -82,145 +69,160 @@ set(HDF5_VERSION 1.8.17)
 set(HDF5_URI https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8/hdf5-${HDF5_VERSION}/src/hdf5-${HDF5_VERSION}.tar.gz)
 set(HDF5_HASH 7d572f8f3b798a628b8245af0391a0ca)
 
-set(ALEMBIC_VERSION 1.7.12)
+set(ALEMBIC_VERSION 1.7.1)
-set(ALEMBIC_URI https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.tar.gz)
+set(ALEMBIC_URI https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.zip)
-set(ALEMBIC_MD5 e2b3777f23c5c09481a008cc6f0f8a40)
+set(ALEMBIC_MD5 cf7705055501d5ea0cb8256866496f79)
 
-# hash is for 3.1.2
+## hash is for 3.1.2
 set(GLFW_GIT_UID 30306e54705c3adae9fe082c816a3be71963485c)
 set(GLFW_URI https://github.com/glfw/glfw/archive/${GLFW_GIT_UID}.zip)
 set(GLFW_HASH 20cacb1613da7eeb092f3ac4f6b2b3d0)
 
-# latest uid in git as of 2016-04-01
+#latest uid in git as of 2016-04-01
 set(CLEW_GIT_UID 277db43f6cafe8b27c6f1055f69dc67da4aeb299)
 set(CLEW_URI https://github.com/OpenCLWrangler/clew/archive/${CLEW_GIT_UID}.zip)
 set(CLEW_HASH 2c699d10ed78362e71f56fae2a4c5f98)
 
-# latest uid in git as of 2016-04-01
+#latest uid in git as of 2016-04-01
 set(CUEW_GIT_UID 1744972026de9cf27c8a7dc39cf39cd83d5f922f)
 set(CUEW_URI https://github.com/CudaWrangler/cuew/archive/${CUEW_GIT_UID}.zip)
 set(CUEW_HASH 86760d62978ebfd96cd93f5aa1abaf4a)
 
-set(OPENSUBDIV_VERSION v3_4_0_RC2)
+set(OPENSUBDIV_VERSION v3_1_1)
-set(OPENSUBDIV_Hash f6a10ba9efaa82fde86fe65aad346319)
+set(OPENSUBDIV_Hash 25a9a6a94136b0eb85ce69e9c8cb6ab3)
-set(OPENSUBDIV_URI https://github.com/PixarAnimationStudios/OpenSubdiv/archive/${OPENSUBDIV_VERSION}.tar.gz)
+set(OPENSUBDIV_URI https://github.com/PixarAnimationStudios/OpenSubdiv/archive/${OPENSUBDIV_VERSION}.zip)
 
-set(SDL_VERSION 2.0.8)
+set(SDL_VERSION 2.0.4)
 set(SDL_URI https://www.libsdl.org/release/SDL2-${SDL_VERSION}.tar.gz)
-set(SDL_HASH 3800d705cef742c6a634f202c37f263f)
+set(SDL_HASH 44fc4a023349933e7f5d7a582f7b886e)
 
-set(OPENCOLLADA_VERSION v1.6.68)
+set(OPENCOLLADA_VERSION v1.6.51)
 set(OPENCOLLADA_URI https://github.com/KhronosGroup/OpenCOLLADA/archive/${OPENCOLLADA_VERSION}.tar.gz)
-set(OPENCOLLADA_HASH ee7dae874019fea7be11613d07567493)
+set(OPENCOLLADA_HASH 23db5087faed4bc4cc1dfe456c0d4701)
 
-set(OPENCOLORIO_VERSION 1.1.0)
+set(OPENCOLORIO_URI https://github.com/imageworks/OpenColorIO/archive/6de971097c7f552300f669ed69ca0b6cf5a70843.zip)
-set(OPENCOLORIO_URI https://github.com/imageworks/OpenColorIO/archive/v${OPENCOLORIO_VERSION}.tar.gz)
+set(OPENCOLORIO_HASH c9de0fd98f26ce6f2e08d617ca68b8e4)
-set(OPENCOLORIO_HASH 802d8f5b1d1fe316ec5f76511aa611b8)
 
-set(LLVM_VERSION 9.0.1)
+set(LLVM_VERSION 3.4.2)
-set(LLVM_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz)
+set(LLVM_URI http://releases.llvm.org/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.gz)
-set(LLVM_HASH 31eb9ce73dd2a0f8dcab8319fb03f8fc)
+set(LLVM_HASH a20669f75967440de949ac3b1bad439c)
 
-set(CLANG_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/clang-${LLVM_VERSION}.src.tar.xz)
+set(CLANG_URI http://releases.llvm.org/${LLVM_VERSION}/cfe-${LLVM_VERSION}.src.tar.gz)
-set(CLANG_HASH 13468e4a44940efef1b75e8641752f90)
+set(CLANG_HASH 87945973b7c73038871c5f849a818588)
 
-set(OPENMP_URI https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/openmp-${LLVM_VERSION}.src.tar.xz)
+set(OPENIMAGEIO_VERSION 1.7.15)
-set(OPENMP_HASH 6eade16057edbdecb3c4eef9daa2bfcf)
+set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/Release-${OPENIMAGEIO_VERSION}.zip)
+set(OPENIMAGEIO_HASH_178 e156e3669af0e1373142ab5e8f13de66)
+set(OPENIMAGEIO_HASH_179 4121cb0e0433bda6a7ef32c8628a149f)
+set(OPENIMAGEIO_HASH_1713 42a662775b834161ba88c6abdb299360)
+set(OPENIMAGEIO_HASH_1715 e2ece0f62c013d64c478f82265988b0b)
+set(OPENIMAGEIO_HASH ${OPENIMAGEIO_HASH_1715})
 
-set(OPENIMAGEIO_VERSION 1.8.13)
-set(OPENIMAGEIO_URI https://github.com/OpenImageIO/oiio/archive/Release-${OPENIMAGEIO_VERSION}.tar.gz)
-set(OPENIMAGEIO_HASH f5526c3c9878029ee900d84856683f93)
 
-set(TIFF_VERSION 4.0.9)
+set(TIFF_VERSION 4.0.6)
 set(TIFF_URI http://download.osgeo.org/libtiff/tiff-${TIFF_VERSION}.tar.gz)
-set(TIFF_HASH 54bad211279cc93eb4fca31ba9bfdc79)
+set(TIFF_HASH d1d2e940dea0b5ad435f21f03d96dd72)
 
-set(OSL_VERSION 1.10.9)
+set(FLEXBISON_VERSION 2.5.5)
-set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.tar.gz)
+set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison//win_flex_bison-2.5.5.zip)
-set(OSL_HASH a94f1e8506f7e8f5e993653de5c5fa00)
+set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce)
 
-set(PYTHON_VERSION 3.7.4)
+set(OSL_VERSION 1.7.5)
-set(PYTHON_SHORT_VERSION 3.7)
+set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.zip)
-set(PYTHON_SHORT_VERSION_NO_DOTS 37)
+set(OSL_HASH 6924dd5d453159e7b6eb106a08c358cf)
+
+set(PYTHON_VERSION 3.6.2)
+set(PYTHON_SHORT_VERSION 3.6)
+set(PYTHON_SHORT_VERSION_NO_DOTS 36)
 set(PYTHON_URI https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz)
-set(PYTHON_HASH d33e4aae66097051c2eca45ee3604803)
+set(PYTHON_HASH 2c68846471994897278364fc18730dd9)
 
-set(TBB_VERSION 2019_U9)
+if(UNIX AND NOT APPLE)
-set(TBB_URI https://github.com/oneapi-src/oneTBB/archive/${TBB_VERSION}.tar.gz)
+	# Needed to be compatible with GCC 7, other platforms can upgrade later
-set(TBB_HASH 26263622e9187212ec240dcf01b66207)
+	set(TBB_VERSION 2017_U7)
+	set(TBB_URI https://github.com/01org/tbb/archive/${TBB_VERSION}.tar.gz)
+	set(TBB_HASH 364f2a4b80e978f38a69cbf7c466b898)
+else()
+	set(TBB_VERSION 44_20160128)
+	set(TBB_URI https://www.threadingbuildingblocks.org/sites/default/files/software_releases/source/tbb${TBB_VERSION}oss_src_0.tgz)
+	set(TBB_HASH 9d8a4cdf43496f1b3f7c473a5248e5cc)
+endif()
 
-set(OPENVDB_VERSION 7.0.0)
+set(OPENVDB_VERSION 3.1.0)
 set(OPENVDB_URI https://github.com/dreamworksanimation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz)
-set(OPENVDB_HASH fd6c4f168282f7e0e494d290cd531fa8)
+set(OPENVDB_HASH 30a7e9571a03ab7bcf1a39fb62aa436f)
 
-set(IDNA_VERSION 2.8)
+set(IDNA_VERSION 2.6)
-set(CHARDET_VERSION 3.0.4)
+set(CHARDET_VERSION 3.0.2)
-set(URLLIB3_VERSION 1.25.3)
+set(URLLIB3_VERSION 1.22)
-set(CERTIFI_VERSION 2019.6.16)
+set(CERTIFI_VERSION 2017.7.27.1)
-set(REQUESTS_VERSION 2.22.0)
+set(REQUESTS_VERSION 2.18.4)
 
-set(NUMPY_VERSION v1.17.0)
+set(NUMPY_VERSION v1.13.1)
-set(NUMPY_SHORT_VERSION 1.17)
+set(NUMPY_SHORT_VERSION 1.13)
-set(NUMPY_URI https://files.pythonhosted.org/packages/da/32/1b8f2bb5fb50e4db68543eb85ce37b9fa6660cd05b58bddfafafa7ed62da/numpy-1.17.0.zip)
+set(NUMPY_URI https://pypi.python.org/packages/c0/3a/40967d9f5675fbb097ffec170f59c2ba19fc96373e73ad47c2cae9a30aed/numpy-1.13.1.zip)
-set(NUMPY_HASH aed49b31bcb44ec73b8155be78566135)
+set(NUMPY_HASH 2c3c0f4edf720c3a7b525dacc825b9ae)
 
-set(LAME_VERSION 3.100)
+set(LAME_VERSION 3.99.5)
-set(LAME_URI http://downloads.sourceforge.net/project/lame/lame/3.100/lame-${LAME_VERSION}.tar.gz)
+set(LAME_URI http://downloads.sourceforge.net/project/lame/lame/3.99/lame-${LAME_VERSION}.tar.gz)
-set(LAME_HASH 83e260acbe4389b54fe08e0bdbf7cddb)
+set(LAME_HASH 84835b313d4a8b68f5349816d33e07ce)
 
-set(OGG_VERSION 1.3.3)
+set(OGG_VERSION 1.3.2)
 set(OGG_URI http://downloads.xiph.org/releases/ogg/libogg-${OGG_VERSION}.tar.gz)
-set(OGG_HASH c2e8a485110b97550f453226ec644ebac6cb29d1caef2902c007edab4308d985)
+set(OGG_HASH e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692)
 
-set(VORBIS_VERSION 1.3.6)
+set(VORBIS_VERSION 1.3.5)
 set(VORBIS_URI http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS_VERSION}.tar.gz)
-set(VORBIS_HASH 6ed40e0241089a42c48604dc00e362beee00036af2d8b3f46338031c9e0351cb)
+set(VORBIS_HASH 6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce)
 
 set(THEORA_VERSION 1.1.1)
 set(THEORA_URI http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2)
 set(THEORA_HASH b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc)
 
-set(FLAC_VERSION 1.3.2)
+set(FLAC_VERSION 1.3.1)
 set(FLAC_URI http://downloads.xiph.org/releases/flac/flac-${FLAC_VERSION}.tar.xz)
-set(FLAC_HASH 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f)
+set(FLAC_HASH 4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c)
 
-set(VPX_VERSION 1.7.0)
+set(VPX_VERSION 1.5.0)
-set(VPX_URI https://github.com/webmproject/libvpx/archive/v${VPX_VERSION}/libvpx-v${VPX_VERSION}.tar.gz)
+set(VPX_URI http://storage.googleapis.com/downloads.webmproject.org/releases/webm/libvpx-${VPX_VERSION}.tar.bz2)
-set(VPX_HASH 1fec931eb5c94279ad219a5b6e0202358e94a93a90cfb1603578c326abfc1238)
+set(VPX_HASH 306d67908625675f8e188d37a81fbfafdf5068b09d9aa52702b6fbe601c76797)
 
-set(OPUS_VERSION 1.3.1)
+set(ORC_VERSION 0.4.25)
-set(OPUS_URI https://archive.mozilla.org/pub/opus/opus-${OPUS_VERSION}.tar.gz)
+set(ORC_URI https://gstreamer.freedesktop.org/src/orc/orc-${ORC_VERSION}.tar.xz)
-set(OPUS_HASH 65b58e1e25b2a114157014736a3d9dfeaad8d41be1c8179866f144a2fb44ff9d)
+set(ORC_HASH c1b1d54a58f26d483f0b3881538984789fe5d5460ab8fab74a1cacbd3d1c53d1)
 
-set(X264_URI http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20180811-2245-stable.tar.bz2)
+set(SCHROEDINGER_VERSION 1.0.11)
-set(X264_HASH ae8a868a0e236a348b35d79f3ee80294b169d1195408b689f9851383661ed7aa)
+set(SCHROEDINGER_URI https://download.videolan.org/contrib/schroedinger/schroedinger-${SCHROEDINGER_VERSION}.tar.gz)
+set(SCHROEDINGER_HASH 1e572a0735b92aca5746c4528f9bebd35aa0ccf8619b22fa2756137a8cc9f912)
 
-set(XVIDCORE_VERSION 1.3.5)
+set(X264_URI http://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20160401-2245-stable.tar.bz2)
+set(X264_HASH 1e9a7b835e80313aade53a9b6ff353e099de3856bf5f30a4d8dfc91281f786f5)
+
+set(XVIDCORE_VERSION 1.3.4)
 set(XVIDCORE_URI http://downloads.xvid.org/downloads/xvidcore-${XVIDCORE_VERSION}.tar.gz)
-set(XVIDCORE_HASH 165ba6a2a447a8375f7b06db5a3c91810181f2898166e7c8137401d7fc894cf0)
+set(XVIDCORE_HASH 4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f)
 
-# This has to be in sync with the version in blenders /extern folder.
+#this has to be in sync with the version in blenders /extern folder
-set(OPENJPEG_VERSION 2.3.0)
+set(OPENJPEG_VERSION 1.5.2)
-set(OPENJPEG_SHORT_VERSION 2.3)
+set(OPENJPEG_SHORT_VERSION 1.5)
-# Use slightly newer commit after release which includes a cmake fix
+set(OPENJPEG_URI https://github.com/uclouvain/openjpeg/archive/version.${OPENJPEG_VERSION}.tar.gz)
-set(OPENJPEG_URI https://github.com/uclouvain/openjpeg/archive/66297f07a43.zip)
+set(OPENJPEG_HASH 3734e95edd0bef6e056815591755efd822228dc3cd866894e00a2c929026b16d)
-set(OPENJPEG_HASH 8242b18d908c7c42174e4231a741cfa7ce7c26b6ed5c9644feb9df7b3054310b)
 
-set(FAAD_VERSION 2-2.8.8)
+set(FAAD_VERSION 2-2.7)
-set(FAAD_URI http://downloads.sourceforge.net/faac/faad${FAAD_VERSION}.tar.gz)
+set(FAAD_URI http://downloads.sourceforge.net/faac/faad${FAAD_VERSION}.tar.bz2)
-set(FAAD_HASH 28f6116efdbe9378269f8a6221767d1f)
+set(FAAD_HASH 4c332fa23febc0e4648064685a3d4332)
 
-set(FFMPEG_VERSION 4.0.2)
+set(FFMPEG_VERSION 3.2.1)
 set(FFMPEG_URI http://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2)
-set(FFMPEG_HASH 5576e8a22f80b6a336db39808f427cfb)
+set(FFMPEG_HASH cede174178e61f882844f5870c35ce72)
 
-set(FFTW_VERSION 3.3.8)
+set(FFTW_VERSION 3.3.4)
 set(FFTW_URI http://www.fftw.org/fftw-${FFTW_VERSION}.tar.gz)
-set(FFTW_HASH 8aac833c943d8e90d51b697b27d4384d)
+set(FFTW_HASH 2edab8c06b24feeb3b82bbb3ebf3e7b3)
 
-set(ICONV_VERSION 1.15)
+set(ICONV_VERSION 1.14)
 set(ICONV_URI http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICONV_VERSION}.tar.gz)
-set(ICONV_HASH ace8b5f2db42f7b3b3057585e80d9808)
+set(ICONV_HASH e34509b1623cec449dfeb73d7ce9c6c6)
 
 set(LAPACK_VERSION 3.6.0)
 set(LAPACK_URI http://www.netlib.org/lapack/lapack-${LAPACK_VERSION}.tgz)
@@ -230,17 +232,17 @@ set(SNDFILE_VERSION 1.0.28)
 set(SNDFILE_URI http://www.mega-nerd.com/libsndfile/files/libsndfile-${SNDFILE_VERSION}.tar.gz)
 set(SNDFILE_HASH 646b5f98ce89ac60cdb060fcd398247c)
 
-# set(HIDAPI_VERSION 0.8.0-rc1)
+#set(HIDAPI_VERSION 0.8.0-rc1)
-# set(HIDAPI_URI https://github.com/signal11/hidapi/archive/hidapi-${HIDAPI_VERSION}.tar.gz)
+#set(HIDAPI_URI https://github.com/signal11/hidapi/archive/hidapi-${HIDAPI_VERSION}.tar.gz)
-# set(HIDAPI_HASH 069f9dd746edc37b6b6d0e3656f47199)
+#set(HIDAPI_HASH 069f9dd746edc37b6b6d0e3656f47199)
 
 set(HIDAPI_UID 89a6c75dc6f45ecabd4ddfbd2bf5ba6ad8ba38b5)
 set(HIDAPI_URI https://github.com/TheOnlyJoey/hidapi/archive/${HIDAPI_UID}.zip)
 set(HIDAPI_HASH b6e22f6b514f8bcf594989f20ffc46fb)
 
-set(WEBP_VERSION 0.6.1)
+set(WEBP_VERSION 0.5.1)
 set(WEBP_URI https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz)
-set(WEBP_HASH b49ce9c3e3e9acae4d91bca44bb85a72)
+set(WEBP_HASH 3d7db92ebba5b4f679413d25c6040881)
 
 set(SPNAV_VERSION 0.2.3)
 set(SPNAV_URI http://downloads.sourceforge.net/project/spacenav/spacenav%20library%20%28SDK%29/libspnav%20${SPNAV_VERSION}/libspnav-${SPNAV_VERSION}.tar.gz)
@@ -251,74 +253,5 @@ set(JEMALLOC_URI https://github.com/jemalloc/jemalloc/releases/download/${JEMALL
 set(JEMALLOC_HASH 507f7b6b882d868730d644510491d18f)
 
 set(XML2_VERSION 2.9.4)
-set(XML2_URI http://xmlsoft.org/sources/libxml2-${XML2_VERSION}.tar.gz)
+set(XML2_URI ftp://xmlsoft.org/libxml2/libxml2-${XML2_VERSION}.tar.gz)
 set(XML2_HASH ae249165c173b1ff386ee8ad676815f5)
-
-set(TINYXML_VERSION 2_6_2)
-set(TINYXML_VERSION_DOTS 2.6.2)
-set(TINYXML_URI https://nchc.dl.sourceforge.net/project/tinyxml/tinyxml/${TINYXML_VERSION_DOTS}/tinyxml_${TINYXML_VERSION}.tar.gz)
-set(TINYXML_HASH c1b864c96804a10526540c664ade67f0)
-
-set(YAMLCPP_VERSION 0.6.3)
-set(YAMLCPP_URI https://codeload.github.com/jbeder/yaml-cpp/tar.gz/yaml-cpp-${YAMLCPP_VERSION})
-set(YAMLCPP_HASH b45bf1089a382e81f6b661062c10d0c2)
-
-set(LCMS_VERSION 2.9)
-set(LCMS_URI https://nchc.dl.sourceforge.net/project/lcms/lcms/${LCMS_VERSION}/lcms2-${LCMS_VERSION}.tar.gz)
-set(LCMS_HASH 8de1b7724f578d2995c8fdfa35c3ad0e)
-
-set(PUGIXML_VERSION 1.9)
-set(PUGIXML_URI https://github.com/zeux/pugixml/archive/v1.9.tar.gz)
-set(PUGIXML_HASH 9346ca1dce2c48f1748c12fdac41a714)
-
-set(FLEXBISON_VERSION 2.5.5)
-set(FLEXBISON_URI http://prdownloads.sourceforge.net/winflexbison//win_flex_bison-2.5.5.zip)
-set(FLEXBISON_HASH d87a3938194520d904013abef3df10ce)
-
-# Libraries to keep Python modules static on Linux.
-
-# NOTE: bzip.org domain does no longer belong to BZip 2 project, so we download
-# sources from Debian packaging.
-set(BZIP2_VERSION 1.0.6)
-set(BZIP2_URI http://http.debian.net/debian/pool/main/b/bzip2/bzip2_${BZIP2_VERSION}.orig.tar.bz2)
-set(BZIP2_HASH d70a9ccd8bdf47e302d96c69fecd54925f45d9c7b966bb4ef5f56b770960afa7)
-
-set(FFI_VERSION 3.2.1)
-set(FFI_URI https://sourceware.org/pub/libffi/libffi-${FFI_VERSION}.tar.gz)
-set(FFI_HASH d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37)
-
-set(LZMA_VERSION 5.2.4)
-set(LZMA_URI https://tukaani.org/xz/xz-${LZMA_VERSION}.tar.bz2)
-set(LZMA_HASH 3313fd2a95f43d88e44264e6b015e7d03053e681860b0d5d3f9baca79c57b7bf)
-
-set(SSL_VERSION 1.1.0i)
-set(SSL_URI https://www.openssl.org/source/openssl-${SSL_VERSION}.tar.gz)
-set(SSL_HASH ebbfc844a8c8cc0ea5dc10b86c9ce97f401837f3fa08c17b2cdadc118253cf99)
-
-set(SQLITE_VERSION 3.24.0)
-set(SQLITE_URI https://www.sqlite.org/2018/sqlite-src-3240000.zip)
-set(SQLITE_HASH fb558c49ee21a837713c4f1e7e413309aabdd9c7)
-
-set(EMBREE_VERSION 3.8.0)
-set(EMBREE_URI https://github.com/embree/embree/archive/v${EMBREE_VERSION}.zip)
-set(EMBREE_HASH ac504d5426945fe25dec1267e0c39d52)
-
-set(USD_VERSION 19.11)
-set(USD_URI https://github.com/PixarAnimationStudios/USD/archive/v${USD_VERSION}.tar.gz)
-set(USD_HASH 79ff176167b3fe85f4953abd6cc5e0cc)
-
-set(OIDN_VERSION 1.0.0)
-set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.zip)
-set(OIDN_HASH 19fe67b0164e8f020ac8a4f520defe60)
-
-set(LIBGLU_VERSION 9.0.1)
-set(LIBGLU_URI ftp://ftp.freedesktop.org/pub/mesa/glu/glu-${LIBGLU_VERSION}.tar.xz)
-set(LIBGLU_HASH 151aef599b8259efe9acd599c96ea2a3)
-
-set(MESA_VERSION 18.3.1)
-set(MESA_URI ftp://ftp.freedesktop.org/pub/mesa//mesa-${MESA_VERSION}.tar.xz)
-set(MESA_HASH d60828056d77bfdbae0970f9b15fb1be)
-
-set(XR_OPENXR_SDK_VERSION 1.0.6)
-set(XR_OPENXR_SDK_URI https://github.com/KhronosGroup/OpenXR-SDK/archive/release-${XR_OPENXR_SDK_VERSION}.tar.gz)
-set(XR_OPENXR_SDK_HASH 21daea7c3bfec365298d779a0e19caa1)

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()

build_files/build_environment/cmake/vpx.cmake

@@ -17,46 +17,44 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(WIN32)
-  if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
-    set(VPX_EXTRA_FLAGS --target=x86_64-win64-gcc --disable-multithread)
+		set(VPX_EXTRA_FLAGS --target=x86_64-win64-gcc)
-  else()
+	else()
-    set(VPX_EXTRA_FLAGS --target=x86-win32-gcc --disable-multithread)
+		set(VPX_EXTRA_FLAGS --target=x86-win32-gcc)
-  endif()
+	endif()
 else()
-  if(APPLE)
+	if(APPLE)
-    set(VPX_EXTRA_FLAGS --target=x86_64-darwin13-gcc)
+		set(VPX_EXTRA_FLAGS --target=x86_64-darwin13-gcc)
-  else()
+	else()
-    set(VPX_EXTRA_FLAGS --target=generic-gnu)
+		set(VPX_EXTRA_FLAGS --target=generic-gnu)
-  endif()
+	endif()
 endif()
 
 ExternalProject_Add(external_vpx
-  URL ${VPX_URI}
+	URL ${VPX_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH SHA256=${VPX_HASH}
+	URL_HASH SHA256=${VPX_HASH}
-  PREFIX ${BUILD_DIR}/vpx
+	PREFIX ${BUILD_DIR}/vpx
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} &&
-    cd ${BUILD_DIR}/vpx/src/external_vpx/ &&
+		cd ${BUILD_DIR}/vpx/src/external_vpx/ &&
-    ${CONFIGURE_COMMAND_NO_TARGET} --prefix=${LIBDIR}/vpx
+		${CONFIGURE_COMMAND_NO_TARGET} --prefix=${LIBDIR}/vpx
-      --disable-shared
+			--disable-shared
-      --enable-static
+			--enable-static
-      --disable-install-bins
+			--disable-install-bins
-      --disable-install-srcs
+			--disable-install-srcs
-      --disable-sse4_1
+			--disable-sse4_1
-      --disable-sse3
+			--disable-sse3
-      --disable-ssse3
+			--disable-ssse3
-      --disable-avx
+			--disable-avx
-      --disable-avx2
+			--disable-avx2
-      --disable-unit-tests
+			--disable-unit-tests
-      --disable-examples
+			--disable-examples
-      --enable-vp8
+			${VPX_EXTRA_FLAGS}
-      --enable-vp9
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && make -j${MAKE_THREADS}
-      ${VPX_EXTRA_FLAGS}
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && make install
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && make -j${MAKE_THREADS}
+	INSTALL_DIR ${LIBDIR}/vpx
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/vpx/src/external_vpx/ && make install
-  INSTALL_DIR ${LIBDIR}/vpx
 )
 
 if(MSVC)
-  set_target_properties(external_vpx PROPERTIES FOLDER Mingw)
+	set_target_properties(external_vpx PROPERTIES FOLDER Mingw)
 endif()

build_files/build_environment/cmake/webp.cmake

@@ -20,31 +20,31 @@
 # library itself does not depend on them, so should give no problems.
 
 set(WEBP_EXTRA_ARGS
-  -DWEBP_HAVE_SSE2=ON
+	-DWEBP_HAVE_SSE2=ON
-  -DWEBP_HAVE_SSE41=OFF
+	-DWEBP_HAVE_SSE41=OFF
-  -DWEBP_HAVE_AVX2=OFF
+	-DWEBP_HAVE_AVX2=OFF
 )
 
 if(WIN32)
-  set(WEBP_BUILD_DIR ${BUILD_MODE}/)
+	set(WEBP_BUILD_DIR ${BUILD_MODE}/)
 else()
-  set(WEBP_BUILD_DIR)
+	set(WEBP_BUILD_DIR)
 endif()
 
 ExternalProject_Add(external_webp
-  URL ${WEBP_URI}
+	URL ${WEBP_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${WEBP_HASH}
+	URL_HASH MD5=${WEBP_HASH}
-  PREFIX ${BUILD_DIR}/webp
+	PREFIX ${BUILD_DIR}/webp
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/webp -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${WEBP_EXTRA_ARGS}
+	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/webp -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${WEBP_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/webp
+	INSTALL_COMMAND COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/webp/src/external_webp-build/${WEBP_BUILD_DIR}${LIBPREFIX}webp${LIBEXT} ${LIBDIR}/webp/lib/${LIBPREFIX}webp${LIBEXT} &&
+		${CMAKE_COMMAND} -E copy ${BUILD_DIR}/webp/src/external_webp/src/webp/decode.h ${LIBDIR}/webp/include/webp/decode.h &&
+		${CMAKE_COMMAND} -E copy ${BUILD_DIR}/webp/src/external_webp/src/webp/encode.h ${LIBDIR}/webp/include/webp/encode.h &&
+		${CMAKE_COMMAND} -E copy ${BUILD_DIR}/webp/src/external_webp/src/webp/demux.h ${LIBDIR}/webp/include/webp/demux.h &&
+		${CMAKE_COMMAND} -E copy ${BUILD_DIR}/webp/src/external_webp/src/webp/extras.h ${LIBDIR}/webp/include/webp/extras.h &&
+		${CMAKE_COMMAND} -E copy ${BUILD_DIR}/webp/src/external_webp/src/webp/format_constants.h ${LIBDIR}/webp/include/webp/format_constants.h &&
+		${CMAKE_COMMAND} -E copy ${BUILD_DIR}/webp/src/external_webp/src/webp/mux.h ${LIBDIR}/webp/include/webp/mux.h &&
+		${CMAKE_COMMAND} -E copy ${BUILD_DIR}/webp/src/external_webp/src/webp/mux_types.h ${LIBDIR}/webp/include/webp/mux_types.h &&
+		${CMAKE_COMMAND} -E copy ${BUILD_DIR}/webp/src/external_webp/src/webp/types.h ${LIBDIR}/webp/include/webp/types.h
+	INSTALL_DIR ${LIBDIR}/webp
 )
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_webp after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/webp ${HARVEST_TARGET}/webp
-      DEPENDEES install
-    )
-  endif()
-endif()

build_files/build_environment/cmake/x264.cmake

@@ -17,29 +17,24 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(WIN32)
-  set(X264_EXTRA_ARGS --enable-win32thread --cross-prefix=${MINGW_HOST}- --host=${MINGW_HOST})
+	set(X264_EXTRA_ARGS --enable-win32thread --cross-prefix=${MINGW_HOST}- --host=${MINGW_HOST})
-  set(X264_PATCH_CMD ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/x264/src/external_x264 < ${PATCH_DIR}/x264.diff)
-else()
-  set(X264_PATCH_CMD echo .)
 endif()
 
-
 ExternalProject_Add(external_x264
-  URL ${X264_URI}
+	URL ${X264_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH SHA256=${X264_HASH}
+	URL_HASH SHA256=${X264_HASH}
-  PREFIX ${BUILD_DIR}/x264
+	PREFIX ${BUILD_DIR}/x264
-  PATCH_COMMAND ${X264_PATCH_CMD}
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/x264
-  CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/x264
+		--enable-static
-    --enable-static
+		--enable-pic
-    --enable-pic
+		--disable-lavf
-    --disable-lavf
+		${X264_EXTRA_ARGS}
-    ${X264_EXTRA_ARGS}
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && make -j${MAKE_THREADS}
-  BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && make -j${MAKE_THREADS}
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && make install
-  INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && make install
+	INSTALL_DIR ${LIBDIR}/x264
-  INSTALL_DIR ${LIBDIR}/x264
 )
 
 if(MSVC)
-  set_target_properties(external_x264 PROPERTIES FOLDER Mingw)
+	set_target_properties(external_x264 PROPERTIES FOLDER Mingw)
 endif()

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
 )

build_files/build_environment/cmake/xr_openxr.cmake

@@ -1,60 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-
-# Keep flags in sync with install_deps.sh ones in compile_XR_OpenXR_SDK()
-set(XR_OPENXR_SDK_EXTRA_ARGS
-  -DBUILD_FORCE_GENERATION=OFF
-  -DBUILD_LOADER=ON
-  -DDYNAMIC_LOADER=OFF
-)
-
-if(UNIX AND NOT APPLE)
-  list(APPEND XR_OPENXR_SDK_EXTRA_ARGS
-    -DBUILD_WITH_WAYLAND_HEADERS=OFF
-    -DBUILD_WITH_XCB_HEADERS=OFF
-    -DBUILD_WITH_XLIB_HEADERS=ON
-    -DBUILD_WITH_SYSTEM_JSONCPP=OFF
-    -DCMAKE_CXX_FLAGS=-DDISABLE_STD_FILESYSTEM=1
-  )
-endif()
-
-ExternalProject_Add(external_xr_openxr_sdk
-  URL ${XR_OPENXR_SDK_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${XR_OPENXR_SDK_HASH}
-  PREFIX ${BUILD_DIR}/xr_openxr_sdk
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/xr_openxr_sdk ${DEFAULT_CMAKE_FLAGS} ${XR_OPENXR_SDK_EXTRA_ARGS}
-  INSTALL_DIR ${LIBDIR}/xr_openxr_sdk
-)
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_xr_openxr_sdk after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/xr_openxr_sdk/include/openxr ${HARVEST_TARGET}/xr_openxr_sdk/include/openxr
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/xr_openxr_sdk/lib ${HARVEST_TARGET}/xr_openxr_sdk/lib
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_xr_openxr_sdk after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/xr_openxr_sdk/lib/openxr_loader.lib ${HARVEST_TARGET}/xr_openxr_sdk/lib/openxr_loader_d.lib
-      DEPENDEES install
-    )
-  endif()
-endif()

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()

build_files/build_environment/cmake/yamlcpp.cmake

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

build_files/build_environment/cmake/zlib.cmake

@@ -17,31 +17,17 @@
 # ***** END GPL LICENSE BLOCK *****
 
 ExternalProject_Add(external_zlib
-  URL ${ZLIB_URI}
+	URL ${ZLIB_URI}
-  URL_HASH MD5=${ZLIB_HASH}
+	URL_HASH MD5=${ZLIB_HASH}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
+	DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  PREFIX ${BUILD_DIR}/zlib
+	PREFIX ${BUILD_DIR}/zlib
-  CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib ${DEFAULT_CMAKE_FLAGS}
+	CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_INSTALL_PREFIX=${LIBDIR}/zlib ${DEFAULT_CMAKE_FLAGS}
-  INSTALL_DIR ${LIBDIR}/zlib
+	INSTALL_DIR ${LIBDIR}/zlib
 )
 
-if(WIN32)
+if(BUILD_MODE STREQUAL Debug)
-  if(BUILD_MODE STREQUAL Release)
+	ExternalProject_Add_Step(external_zlib after_install
-    ExternalProject_Add_Step(external_zlib after_install
+		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstaticd${LIBEXT} ${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstatic${LIBEXT} ${HARVEST_TARGET}/zlib/lib/libz_st${LIBEXT}
+		DEPENDEES install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zlib/include/ ${HARVEST_TARGET}/zlib/include/
+	)
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_zlib after_install
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstaticd${LIBEXT} ${HARVEST_TARGET}/zlib/lib/libz_st_d${LIBEXT}
-    DEPENDEES install
-    )
-  endif()
-else()
-  ExternalProject_Add_Step(external_zlib after_install
-    COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/libz.a ${LIBDIR}/zlib/lib/libz_pic.a
-    DEPENDEES install
-  )
 endif()

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()

build_files/build_environment/dependencies.dot

@@ -1,100 +0,0 @@
-strict graph {
-graph[autosize = false, size = "25.7,8.3!", resolution = 300, overlap = false, splines = false, outputorder=edgesfirst ];
-	node [style=filled fillcolor=white];
-	external_alembic -- external_boost;
-	external_alembic -- external_zlib;
-	external_alembic -- external_openexr;
-	external_blosc -- external_zlib;
-	external_blosc -- external_pthreads;
-	external_boost -- Make_Python_Environment;
-	external_clang -- ll;
-	external_ffmpeg -- external_zlib;
-	external_ffmpeg -- external_faad;
-	external_ffmpeg -- external_openjpeg;
-	external_ffmpeg -- external_xvidcore;
-	external_ffmpeg -- external_x264;
-	external_ffmpeg -- external_vpx;
-	external_ffmpeg -- external_theora;
-	external_ffmpeg -- external_vorbis;
-	external_ffmpeg -- external_ogg;
-	external_ffmpeg -- external_lame;
-	external_ffmpeg -- external_zlib_mingw;
-	external_numpy -- Make_Python_Environment;
-	external_opencollada -- external_xml2;
-	external_opencolorio -- external_boost;
-	external_opencolorio -- external_tinyxml;
-	external_opencolorio -- external_yamlcpp;
-	external_openexr -- external_zlib;
-	external_openimageio -- external_png;
-	external_openimageio -- external_zlib;
-	external_openimageio -- external_openexr;
-	external_openimageio -- external_openexr;
-	external_openimageio -- external_jpeg;
-	external_openimageio -- external_boost;
-	external_openimageio -- external_tiff;
-	external_openimageio -- external_opencolorio;
-	external_openimageio -- external_openjpeg;
-	external_openimageio -- external_webp;
-	external_openimageio -- external_opencolorio_extra;
-	external_openmp -- external_clang;
-	external_opensubdiv -- external_glew;
-	external_opensubdiv -- external_glfw;
-	external_opensubdiv -- external_clew;
-	external_opensubdiv -- external_cuew;
-	external_opensubdiv -- external_tbb;
-	openvdb -- external_tbb;
-	openvdb -- external_boost;
-	openvdb -- external_openexr;
-	openvdb -- external_openexr;
-	openvdb -- external_zlib;
-	openvdb -- external_blosc;
-	external_osl -- external_boost;
-	external_osl -- ll;
-	external_osl -- external_clang;
-	external_osl -- external_openexr;
-	external_osl -- external_openexr;
-	external_osl -- external_zlib;
-	external_osl -- external_flexbison;
-	external_osl -- external_openimageio;
-	external_osl -- external_pugixml;
-	external_png -- external_zlib;
-	external_python_site_packages -- Make_Python_Environment;
-	external_sndfile -- external_ogg;
-	external_sndfile -- external_vorbis;
-	external_sndfile -- external_flac;
-	external_theora -- external_vorbis;
-	external_theora -- external_ogg;
-	external_tiff -- external_zlib;
-	external_vorbis -- external_ogg;
-	blender-- external_ffmpeg;
-	blender-- external_alembic;
-	blender-- external_openjpeg;
-	blender-- external_opencolorio;
-	blender-- external_openexr;
-	blender-- external_opensubdiv;
-	blender-- openvdb;
-	blender-- external_osl;
-	blender-- external_boost;
-	blender-- external_jpeg;
-	blender-- external_png;
-	blender-- external_python;
-	blender-- external_sndfile;
-	blender-- external_iconv;
-	blender-- external_fftw3;
-	external_python-- external_python_site_packages;
-	external_python_site_packages-- requests;
-	external_python_site_packages-- idna;
-	external_python_site_packages-- chardet;
-	external_python_site_packages-- urllib3;
-	external_python_site_packages-- certifi;
-	external_python-- external_numpy;
-	external_usd-- external_boost;
-	external_usd-- external_tbb;
-	blender-- external_opencollada;
-	blender-- external_sdl;
-	blender-- external_freetype;
-	blender-- external_pthreads;
-	blender-- external_zlib;
-	blender-- external_openal;
-    blender-- external_usd;
-}

build_files/build_environment/patches/.gitattributes

@@ -1,2 +0,0 @@
-# Files contains mixed line endings, patch needs to preserve them to apply.
-opencollada.diff binary

build_files/build_environment/patches/alembic.diff

@@ -0,0 +1,35 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3e09c57..26565ae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -116,7 +116,7 @@ IF (NOT ${ALEMBIC_LIB_USES_TR1} AND NOT ${ALEMBIC_LIB_USES_BOOST})
+     INCLUDE(CheckCXXCompilerFlag)
+     CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
+     CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
+-    IF (COMPILER_SUPPORTS_CXX1X)
++    IF (COMPILER_SUPPORTS_CXX11)
+         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+     ELSEIF (COMPILER_SUPPORTS_CXX0X)
+         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+--- a/lib/Alembic/AbcCoreOgawa/StreamManager.cpp
++++ b/lib/Alembic/AbcCoreOgawa/StreamManager.cpp
+@@ -47,7 +47,18 @@
+ #define COMPARE_EXCHANGE( V, COMP, EXCH ) V.compare_exchange_weak( COMP, EXCH, std::memory_order_seq_cst, std::memory_order_seq_cst )
+ // Windows
+ #elif defined( _MSC_VER )
+-#define COMPARE_EXCHANGE( V, COMP, EXCH ) InterlockedCompareExhange64( &V, EXCH, COMP ) == COMP
++#define COMPARE_EXCHANGE( V, COMP, EXCH ) InterlockedCompareExchange64( &V, EXCH, COMP ) == COMP
++int ffsll(long	long value)
++{
++	if (!value)
++		return 0;
++
++	for (int bit = 0; bit < 63; bit++)
++	{
++		if (value & (1 << bit))
++			return bit + 1;
++	}
++}
+ // gcc 4.8 and above not using C++11
+ #elif defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ >= 8
+ #define COMPARE_EXCHANGE( V, COMP, EXCH ) __atomic_compare_exchange_n( &V, &COMP, EXCH, false, __ATOMIC_SEQ_CST, __ATOMIC_SEQ_CST )

build_files/build_environment/patches/blosc.diff

@@ -10,84 +10,24 @@ diff -Naur src/blosc/CMakeLists.txt external_blosc/blosc/CMakeLists.txt
      endif(NOT Threads_FOUND)
  else(WIN32)
      find_package(Threads REQUIRED)
-diff -Naur src/CMakeLists.txt external_blosc/CMakeLists.txt
+diff -Naur src/blosc/blosc.c external_blosc/blosc/blosc.c
---- src/CMakeLists.txt	2016-02-03 10:26:28 -0700
+--- src/blosc/blosc.c	2016-02-03 10:26:28 -0700
-+++ external_blosc/CMakeLists.txt	2017-03-03 09:03:31 -0700
++++ external_blosc/blosc/blosc.c	2017-03-03 09:01:50 -0700
-@@ -17,8 +17,8 @@
+@@ -49,12 +49,12 @@
- #       do not include support for the Snappy library
- #   DEACTIVATE_ZLIB: default OFF
- #       do not include support for the Zlib library
--#   PREFER_EXTERNAL_COMPLIBS: default ON
--#       when found, use the installed compression libs instead of included sources
-+#   PREFER_EXTERNAL_ZLIB: default ON
-+#       when found, use the installed zlib instead of included sources
- #   TEST_INCLUDE_BENCH_SINGLE_1: default ON
- #       add a test that runs the benchmark program passing "single" with 1 thread
- #       as first parameter
-@@ -80,29 +80,23 @@
-     "Do not include support for the SNAPPY library." OFF)
- option(DEACTIVATE_ZLIB
-     "Do not include support for the ZLIB library." OFF)
--option(PREFER_EXTERNAL_COMPLIBS
--    "When found, use the installed compression libs instead of included sources." ON)
-+option(PREFER_EXTERNAL_ZLIB
-+    "When found, use the installed zlib instead of included sources." ON)
- 
- set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
- 
--if(NOT PREFER_EXTERNAL_COMPLIBS)
-+if(NOT PREFER_EXTERNAL_ZLIB)
-     message(STATUS "Finding external libraries disabled.  Using internal sources.")
--endif(NOT PREFER_EXTERNAL_COMPLIBS)
-+endif(NOT PREFER_EXTERNAL_ZLIB)
- 
- 
- if(NOT DEACTIVATE_LZ4)
--    if(PREFER_EXTERNAL_COMPLIBS)
--        find_package(LZ4)
--    endif(PREFER_EXTERNAL_COMPLIBS)
-     # HAVE_LZ4 will be set to true because even if the library is
-     # not found, we will use the included sources for it
-     set(HAVE_LZ4 TRUE)
- endif(NOT DEACTIVATE_LZ4)
- 
- if(NOT DEACTIVATE_SNAPPY)
--    if(PREFER_EXTERNAL_COMPLIBS)
--        find_package(Snappy)
--    endif(PREFER_EXTERNAL_COMPLIBS)
-     # HAVE_SNAPPY will be set to true because even if the library is not found,
-     # we will use the included sources for it
-     set(HAVE_SNAPPY TRUE)
-@@ -110,13 +104,13 @@
- 
- if(NOT DEACTIVATE_ZLIB)
-     # import the ZLIB_ROOT environment variable to help finding the zlib library
--    if(PREFER_EXTERNAL_COMPLIBS)
-+    if(PREFER_EXTERNAL_ZLIB)
-         set(ZLIB_ROOT $ENV{ZLIB_ROOT})
-         find_package( ZLIB )
-         if (NOT ZLIB_FOUND )
-             message(STATUS "No zlib found.  Using internal sources.")
-         endif (NOT ZLIB_FOUND )
--    endif(PREFER_EXTERNAL_COMPLIBS)
-+    endif(PREFER_EXTERNAL_ZLIB)
-     # HAVE_ZLIB will be set to true because even if the library is not found,
-     # we will use the included sources for it
-     set(HAVE_ZLIB TRUE)
-diff -Naur external_blosc.orig/blosc/blosc.c external_blosc/blosc/blosc.c
---- external_blosc.orig/blosc/blosc.c   2018-07-30 04:56:38 -0600
-+++ external_blosc/blosc/blosc.c        2018-08-11 15:27:26 -0600
-@@ -41,12 +41,7 @@
    #include <inttypes.h>
  #endif  /* _WIN32 */
-
+ 
--#if defined(_WIN32)
+-#if defined(_WIN32) && !defined(__GNUC__)
 -  #include "win32/pthread.h"
 -  #include "win32/pthread.c"
 -#else
--  #include <pthread.h>
++//#if defined(_WIN32) && !defined(__GNUC__)
++//  #include "win32/pthread.h"
++  //#include "win32/pthread.c"
++//#else
+   #include <pthread.h>
 -#endif
-+#include <pthread.h>
++//#endif
-
+ 
-
+ /* If C11 is supported, use it's built-in aligned allocation. */
- /* Some useful units */
+ #if __STDC_VERSION__ >= 201112L

build_files/build_environment/patches/boost.diff

@@ -0,0 +1,37 @@
+--- a/boost/config/compiler/visualc.hpp       2015-12-08 11:55:19 -0700
++++ b/boost/config/compiler/visualc.hpp    2018-03-17 10:29:52 -0600
+@@ -287,12 +287,3 @@
+ #  define BOOST_COMPILER "Microsoft Visual C++ version " BOOST_STRINGIZE(BOOST_COMPILER_VERSION)
+ #endif
+
+-//
+-// last known and checked version is 19.00.23026 (VC++ 2015 RTM):
+-#if (_MSC_VER > 1900)
+-#  if defined(BOOST_ASSERT_CONFIG)
+-#     error "Unknown compiler version - please run the configure tests and report the results"
+-#  else
+-#     pragma message("Unknown compiler version - please run the configure tests and report the results")
+-#  endif
+-#endif
+--- a/boost/type_traits/has_nothrow_assign.hpp	2015-12-13 05:49:42 -0700
++++ b/boost/type_traits/has_nothrow_assign.hpp	2018-05-27 11:11:02 -0600
+@@ -24,7 +24,7 @@
+ #include <boost/type_traits/remove_reference.hpp>
+ #endif
+ #endif
+-#if defined(__GNUC__) || defined(__SUNPRO_CC)
++#if defined(__GNUC__) || defined(__SUNPRO_CC) || defined(__clang__)
+ #include <boost/type_traits/is_const.hpp>
+ #include <boost/type_traits/is_volatile.hpp>
+ #include <boost/type_traits/is_assignable.hpp>
+--- a/boost/type_traits/has_nothrow_constructor.hpp	2015-12-13 05:49:42 -0700
++++ b/boost/type_traits/has_nothrow_constructor.hpp	2018-05-27 11:11:02 -0600
+@@ -17,7 +17,7 @@
+ #if defined(BOOST_MSVC) || defined(BOOST_INTEL)
+ #include <boost/type_traits/has_trivial_constructor.hpp>
+ #endif
+-#if defined(__GNUC__ ) || defined(__SUNPRO_CC)
++#if defined(__GNUC__ ) || defined(__SUNPRO_CC) || defined(__clang__)
+ #include <boost/type_traits/is_default_constructible.hpp>
+ #endif
+ 

build_files/build_environment/patches/clang.diff

@@ -0,0 +1,127 @@
+--- cfe/trunk/lib/Serialization/ASTWriter.cpp
++++ cfe/trunk/lib/Serialization/ASTWriter.cpp
+@@ -56,14 +56,14 @@
+ using namespace clang::serialization;
+ 
+ template <typename T, typename Allocator>
+-static StringRef bytes(const std::vector<T, Allocator> &v) {
++static StringRef data(const std::vector<T, Allocator> &v) {
+   if (v.empty()) return StringRef();
+   return StringRef(reinterpret_cast<const char*>(&v[0]),
+                          sizeof(T) * v.size());
+ }
+ 
+ template <typename T>
+-static StringRef bytes(const SmallVectorImpl<T> &v) {
++static StringRef data(const SmallVectorImpl<T> &v) {
+   return StringRef(reinterpret_cast<const char*>(v.data()),
+                          sizeof(T) * v.size());
+ }
+@@ -1385,7 +1385,7 @@
+   Record.push_back(INPUT_FILE_OFFSETS);
+   Record.push_back(InputFileOffsets.size());
+   Record.push_back(UserFilesNum);
+-  Stream.EmitRecordWithBlob(OffsetsAbbrevCode, Record, bytes(InputFileOffsets));
++  Stream.EmitRecordWithBlob(OffsetsAbbrevCode, Record, data(InputFileOffsets));
+ }
+ 
+ //===----------------------------------------------------------------------===//
+@@ -1771,7 +1771,7 @@
+   Record.push_back(SOURCE_LOCATION_OFFSETS);
+   Record.push_back(SLocEntryOffsets.size());
+   Record.push_back(SourceMgr.getNextLocalOffset() - 1); // skip dummy
+-  Stream.EmitRecordWithBlob(SLocOffsetsAbbrev, Record, bytes(SLocEntryOffsets));
++  Stream.EmitRecordWithBlob(SLocOffsetsAbbrev, Record, data(SLocEntryOffsets));
+ 
+   // Write the source location entry preloads array, telling the AST
+   // reader which source locations entries it should load eagerly.
+@@ -2087,7 +2087,7 @@
+   Record.push_back(MacroOffsets.size());
+   Record.push_back(FirstMacroID - NUM_PREDEF_MACRO_IDS);
+   Stream.EmitRecordWithBlob(MacroOffsetAbbrev, Record,
+-                            bytes(MacroOffsets));
++                            data(MacroOffsets));
+ }
+ 
+ void ASTWriter::WritePreprocessorDetail(PreprocessingRecord &PPRec) {
+@@ -2185,7 +2185,7 @@
+     Record.push_back(PPD_ENTITIES_OFFSETS);
+     Record.push_back(FirstPreprocessorEntityID - NUM_PREDEF_PP_ENTITY_IDS);
+     Stream.EmitRecordWithBlob(PPEOffsetAbbrev, Record,
+-                              bytes(PreprocessedEntityOffsets));
++                              data(PreprocessedEntityOffsets));
+   }
+ }
+ 
+@@ -2548,7 +2548,7 @@
+   Record.push_back(CXX_BASE_SPECIFIER_OFFSETS);
+   Record.push_back(CXXBaseSpecifiersOffsets.size());
+   Stream.EmitRecordWithBlob(BaseSpecifierOffsetAbbrev, Record,
+-                            bytes(CXXBaseSpecifiersOffsets));
++                            data(CXXBaseSpecifiersOffsets));
+ }
+ 
+ //===----------------------------------------------------------------------===//
+@@ -2623,7 +2623,7 @@
+     Decls.push_back(std::make_pair((*D)->getKind(), GetDeclRef(*D)));
+ 
+   ++NumLexicalDeclContexts;
+-  Stream.EmitRecordWithBlob(DeclContextLexicalAbbrev, Record, bytes(Decls));
++  Stream.EmitRecordWithBlob(DeclContextLexicalAbbrev, Record, data(Decls));
+   return Offset;
+ }
+ 
+@@ -2642,7 +2642,7 @@
+   Record.push_back(TYPE_OFFSET);
+   Record.push_back(TypeOffsets.size());
+   Record.push_back(FirstTypeID - NUM_PREDEF_TYPE_IDS);
+-  Stream.EmitRecordWithBlob(TypeOffsetAbbrev, Record, bytes(TypeOffsets));
++  Stream.EmitRecordWithBlob(TypeOffsetAbbrev, Record, data(TypeOffsets));
+ 
+   // Write the declaration offsets array
+   Abbrev = new BitCodeAbbrev();
+@@ -2655,7 +2655,7 @@
+   Record.push_back(DECL_OFFSET);
+   Record.push_back(DeclOffsets.size());
+   Record.push_back(FirstDeclID - NUM_PREDEF_DECL_IDS);
+-  Stream.EmitRecordWithBlob(DeclOffsetAbbrev, Record, bytes(DeclOffsets));
++  Stream.EmitRecordWithBlob(DeclOffsetAbbrev, Record, data(DeclOffsets));
+ }
+ 
+ void ASTWriter::WriteFileDeclIDsMap() {
+@@ -2680,7 +2680,7 @@
+   unsigned AbbrevCode = Stream.EmitAbbrev(Abbrev);
+   Record.push_back(FILE_SORTED_DECLS);
+   Record.push_back(FileSortedIDs.size());
+-  Stream.EmitRecordWithBlob(AbbrevCode, Record, bytes(FileSortedIDs));
++  Stream.EmitRecordWithBlob(AbbrevCode, Record, data(FileSortedIDs));
+ }
+ 
+ void ASTWriter::WriteComments() {
+@@ -2893,7 +2893,7 @@
+     Record.push_back(SelectorOffsets.size());
+     Record.push_back(FirstSelectorID - NUM_PREDEF_SELECTOR_IDS);
+     Stream.EmitRecordWithBlob(SelectorOffsetAbbrev, Record,
+-                              bytes(SelectorOffsets));
++                              data(SelectorOffsets));
+   }
+ }
+ 
+@@ -3253,7 +3253,7 @@
+   Record.push_back(IdentifierOffsets.size());
+   Record.push_back(FirstIdentID - NUM_PREDEF_IDENT_IDS);
+   Stream.EmitRecordWithBlob(IdentifierOffsetAbbrev, Record,
+-                            bytes(IdentifierOffsets));
++                            data(IdentifierOffsets));
+ }
+ 
+ //===----------------------------------------------------------------------===//
+@@ -4046,7 +4046,7 @@
+   Record.clear();
+   Record.push_back(TU_UPDATE_LEXICAL);
+   Stream.EmitRecordWithBlob(TuUpdateLexicalAbbrev, Record,
+-                            bytes(NewGlobalDecls));
++                            data(NewGlobalDecls));
+   
+   // And a visible updates block for the translation unit.
+   Abv = new llvm::BitCodeAbbrev();

build_files/build_environment/patches/cmake/modules/FindBlosc.cmake

@@ -29,6 +29,9 @@ ENDIF()
 
 SET(_blosc_SEARCH_DIRS
   ${BLOSC_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
   /opt/lib/blosc
 )
 

build_files/build_environment/patches/cmake/modules/FindCppUnit.cmake

@@ -29,6 +29,9 @@ ENDIF()
 
 SET(_cppunit_SEARCH_DIRS
   ${CPPUNIT_ROOT_DIR}
+  /usr/local
+  /sw # Fink
+  /opt/local # DarwinPorts
   /opt/lib/cppunit
 )