diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-17 20:40:39 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-09-17 20:40:39 +0300 |
| commit | 91e87f5cf28c035eca59ab645747d1d2854571a5 (patch) | |
| tree | 055a8830745e691b6ea857094bb1c6e21212ea2b /build_files | |
| parent | 731d0d8d0f499d8eb8a21ae12d0d5a6c61f1a37a (diff) | |
| parent | 39c18c54136323fbf56e667fdb1f1345c7d0f89b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/build_environment/cmake/options.cmake | 2 | ||||
| -rwxr-xr-x | build_files/build_environment/install_deps.sh | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake index 7bf971208ae..f3125551972 100644 --- a/build_files/build_environment/cmake/options.cmake +++ b/build_files/build_environment/cmake/options.cmake @@ -143,7 +143,7 @@ else() set(PLATFORM_CXXFLAGS "-std=c++11 -fPIC") set(PLATFORM_LDFLAGS) set(PLATFORM_BUILD_TARGET) - set(PLATFORM_CMAKE_FLAGS) + set(PLATFORM_CMAKE_FLAGS -DCMAKE_INSTALL_LIBDIR=lib) endif() if(WITH_OPTIMIZED_DEBUG) diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh index 6c59b1df31d..47ef93527af 100755 --- a/build_files/build_environment/install_deps.sh +++ b/build_files/build_environment/install_deps.sh @@ -743,9 +743,10 @@ OCIO_SOURCE=( "https://github.com/imageworks/OpenColorIO/archive/v$OCIO_VERSION. #~ OCIO_SOURCE_REPO_UID="6de971097c7f552300f669ed69ca0b6cf5a70843" OPENEXR_USE_REPO=false -OPENEXR_SOURCE=( "https://github.com/openexr/openexr/releases/download/v$OPENEXR_VERSION/openexr-$OPENEXR_VERSION.tar.gz" ) +#~ OPENEXR_SOURCE=( "https://github.com/openexr/openexr/releases/download/v$OPENEXR_VERSION/openexr-$OPENEXR_VERSION.tar.gz" ) +OPENEXR_SOURCE_REPO_UID="0ac2ea34c8f3134148a5df4052e40f155b76f6fb" +OPENEXR_SOURCE=( "https://github.com/openexr/openexr/archive/$OPENEXR_SOURCE_REPO_UID.tar.gz" ) #~ OPENEXR_SOURCE_REPO=( "https://github.com/mont29/openexr.git" ) -#~ OPENEXR_SOURCE_REPO_UID="2787aa1cf652d244ed45ae124eb1553f6cff11ee" ILMBASE_SOURCE=( "https://github.com/openexr/openexr/releases/download/v$ILMBASE_VERSION/ilmbase-$ILMBASE_VERSION.tar.gz" ) OIIO_USE_REPO=false |