olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update to embree 2.14.0

This commit is contained in:
Eric Wasylishen 2017-03-05 17:09:09 -07:00
parent bc5d293072
commit 4c1a12cf67
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -61,10 +61,10 @@ cd tyrutils-ericw
mkdir build mkdir build
cd build cd build
wget https://github.com/embree/embree/releases/download/v2.13.0/embree-2.13.0.x86_64.linux.tar.gz -O embree.tgz wget https://github.com/embree/embree/releases/download/v2.14.0/embree-2.14.0.x86_64.linux.tar.gz -O embree.tgz
tar xf embree.tgz tar xf embree.tgz
cmake .. -DCMAKE_BUILD_TYPE=Release -Dembree_DIR="$(pwd)/embree-2.13.0.x86_64.linux/lib/cmake/embree-2.13.0" cmake .. -DCMAKE_BUILD_TYPE=Release -Dembree_DIR="$(pwd)/embree-2.14.0.x86_64.linux/lib/cmake/embree-2.14.0"
make -j8 VERBOSE=1 make -j8 VERBOSE=1
``` ```

8
appveyor.yml
View File

@ -4,9 +4,9 @@ platform:
version: 1.0.{build} version: 1.0.{build}
install: install:
- ps: Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v2.13.0/embree-2.13.0.x64.windows.zip' -OutFile 'embree64.zip' - ps: Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v2.14.0/embree-2.14.0.x64.windows.zip' -OutFile 'embree64.zip'
- ps: 7z x embree64.zip -oc:\ - ps: 7z x embree64.zip -oc:\
- ps: Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v2.13.0/embree-2.13.0.win32.windows.zip' -OutFile 'embree.zip' - ps: Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v2.14.0/embree-2.14.0.win32.windows.zip' -OutFile 'embree.zip'
- ps: 7z x embree.zip -oc:\ - ps: 7z x embree.zip -oc:\
build_script: build_script:
- ps: >- - ps: >-
@ -17,9 +17,9 @@ build_script:
cd cmakebuild cd cmakebuild
If ($env:Platform -Match "x64") { If ($env:Platform -Match "x64") {
cmake .. -T v120_xp -Dembree_DIR="c:/embree-2.13.0.x64.windows/lib/cmake/embree-2.13.0" -DCMAKE_GENERATOR_PLATFORM=x64 cmake .. -T v120_xp -Dembree_DIR="c:/embree-2.14.0.x64.windows/lib/cmake/embree-2.14.0" -DCMAKE_GENERATOR_PLATFORM=x64
} Else { } Else {
cmake .. -T v120_xp -Dembree_DIR="c:/embree-2.13.0.win32.windows/lib/cmake/embree-2.13.0" cmake .. -T v120_xp -Dembree_DIR="c:/embree-2.14.0.win32.windows/lib/cmake/embree-2.14.0"
} }
msbuild check.vcxproj /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" msbuild check.vcxproj /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"

4
build-linux-64.sh
View File

@ -9,9 +9,9 @@ cmake --version
mkdir build mkdir build
cd build cd build
wget https://github.com/embree/embree/releases/download/v2.13.0/embree-2.13.0.x86_64.linux.tar.gz -O embree.tgz wget https://github.com/embree/embree/releases/download/v2.14.0/embree-2.14.0.x86_64.linux.tar.gz -O embree.tgz
tar xf embree.tgz tar xf embree.tgz
cmake .. -DCMAKE_BUILD_TYPE=Release -Dembree_DIR="$(pwd)/embree-2.13.0.x86_64.linux/lib/cmake/embree-2.13.0" cmake .. -DCMAKE_BUILD_TYPE=Release -Dembree_DIR="$(pwd)/embree-2.14.0.x86_64.linux/lib/cmake/embree-2.14.0"
make -j8 VERBOSE=1 make -j8 VERBOSE=1
cpack cpack

2
build-osx.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
BUILD_DIR=build-osx BUILD_DIR=build-osx
EMBREE_TGZ="https://github.com/embree/embree/releases/download/v2.13.0/embree-2.13.0.x86_64.macosx.tar.gz" EMBREE_TGZ="https://github.com/embree/embree/releases/download/v2.14.0/embree-2.14.0.x86_64.macosx.tar.gz"
EMBREE_TGZ_NAME=$(basename "$EMBREE_TGZ") EMBREE_TGZ_NAME=$(basename "$EMBREE_TGZ")
EMBREE_DIR_NAME=$(basename "$EMBREE_TGZ" ".tar.gz") EMBREE_DIR_NAME=$(basename "$EMBREE_TGZ" ".tar.gz")
EMBREE_WITH_VERSION=$(basename "$EMBREE_TGZ" ".x86_64.macosx.tar.gz") EMBREE_WITH_VERSION=$(basename "$EMBREE_TGZ" ".x86_64.macosx.tar.gz")