From 260a7ddf47b53875cdd7910e79c7da12a34a60a5 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Sun, 23 Oct 2016 12:21:04 -0600 Subject: [PATCH] Update embree to 2.12.0 --- README.md | 4 ++-- appveyor.yml | 8 ++++---- build-linux-64.sh | 4 ++-- build-osx.sh | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index eedf81db..75cc9998 100644 --- a/README.md +++ b/README.md @@ -61,10 +61,10 @@ cd tyrutils-ericw mkdir build cd build -wget https://github.com/embree/embree/releases/download/v2.11.0/embree-2.11.0.x86_64.linux.tar.gz -O embree.tgz +wget https://github.com/embree/embree/releases/download/v2.12.0/embree-2.12.0.x86_64.linux.tar.gz -O embree.tgz tar xf embree.tgz -cmake .. -DCMAKE_BUILD_TYPE=Release -Dembree_DIR="$(pwd)/embree-2.11.0.x86_64.linux/lib/cmake/embree-2.11.0" +cmake .. -DCMAKE_BUILD_TYPE=Release -Dembree_DIR="$(pwd)/embree-2.12.0.x86_64.linux/lib/cmake/embree-2.12.0" make -j8 VERBOSE=1 ``` diff --git a/appveyor.yml b/appveyor.yml index f60f462b..a97a7fb1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,9 +4,9 @@ platform: version: 1.0.{build} install: -- ps: Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v2.11.0/embree-2.11.0.x64.windows.zip' -OutFile 'embree64.zip' +- ps: Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v2.12.0/embree-2.12.0.x64.windows.zip' -OutFile 'embree64.zip' - ps: 7z x embree64.zip -oc:\ -- ps: Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v2.11.0/embree-2.11.0.win32.windows.zip' -OutFile 'embree.zip' +- ps: Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v2.12.0/embree-2.12.0.win32.windows.zip' -OutFile 'embree.zip' - ps: 7z x embree.zip -oc:\ build_script: - ps: >- @@ -17,9 +17,9 @@ build_script: cd cmakebuild If ($env:Platform -Match "x64") { - cmake .. -T v120_xp -Dembree_DIR="c:/embree-2.11.0.x64.windows/lib/cmake/embree-2.11.0" -DCMAKE_GENERATOR_PLATFORM=x64 + cmake .. -T v120_xp -Dembree_DIR="c:/embree-2.12.0.x64.windows/lib/cmake/embree-2.12.0" -DCMAKE_GENERATOR_PLATFORM=x64 } Else { - cmake .. -T v120_xp -Dembree_DIR="c:/embree-2.11.0.win32.windows/lib/cmake/embree-2.11.0" + cmake .. -T v120_xp -Dembree_DIR="c:/embree-2.12.0.win32.windows/lib/cmake/embree-2.12.0" } msbuild check.vcxproj /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" diff --git a/build-linux-64.sh b/build-linux-64.sh index 1e20703e..16ffd4d9 100755 --- a/build-linux-64.sh +++ b/build-linux-64.sh @@ -7,9 +7,9 @@ fi mkdir build cd build -wget https://github.com/embree/embree/releases/download/v2.11.0/embree-2.11.0.x86_64.linux.tar.gz -O embree.tgz +wget https://github.com/embree/embree/releases/download/v2.12.0/embree-2.12.0.x86_64.linux.tar.gz -O embree.tgz tar xf embree.tgz -cmake .. -DCMAKE_BUILD_TYPE=Release -Dembree_DIR="$(pwd)/embree-2.11.0.x86_64.linux/lib/cmake/embree-2.11.0" +cmake .. -DCMAKE_BUILD_TYPE=Release -Dembree_DIR="$(pwd)/embree-2.12.0.x86_64.linux/lib/cmake/embree-2.12.0" make -j8 VERBOSE=1 cpack diff --git a/build-osx.sh b/build-osx.sh index f2d1b3d3..50ff5c88 100755 --- a/build-osx.sh +++ b/build-osx.sh @@ -1,7 +1,7 @@ #!/bin/bash BUILD_DIR=build-osx -EMBREE_TGZ="https://github.com/embree/embree/releases/download/v2.11.0/embree-2.11.0.x86_64.macosx.tar.gz" +EMBREE_TGZ="https://github.com/embree/embree/releases/download/v2.12.0/embree-2.12.0.x86_64.macosx.tar.gz" EMBREE_TGZ_NAME=$(basename "$EMBREE_TGZ") EMBREE_DIR_NAME=$(basename "$EMBREE_TGZ" ".tar.gz") EMBREE_WITH_VERSION=$(basename "$EMBREE_TGZ" ".x86_64.macosx.tar.gz")