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

build: update mac and linux for embree 2.15.0

This commit is contained in:
Eric Wasylishen 2017-04-28 15:26:40 -06:00
parent 333a4c9ffd
commit b096019237
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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.14.0/embree-2.14.0.x86_64.linux.tar.gz -O embree.tgz wget https://github.com/embree/embree/releases/download/v2.15.0/embree-2.15.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.14.0.x86_64.linux/lib/cmake/embree-2.14.0" cmake .. -DCMAKE_BUILD_TYPE=Release -Dembree_DIR="$(pwd)/embree-2.15.0.x86_64.linux/lib/cmake/embree-2.15.0"
make -j8 VERBOSE=1 make -j8 VERBOSE=1
make -j8 VERBOSE=1 testlight make -j8 VERBOSE=1 testlight
cpack cpack

4
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.14.0/embree-2.14.0.x86_64.macosx.tar.gz" EMBREE_TGZ="https://github.com/embree/embree/releases/download/v2.15.0/embree-2.15.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")
@ -15,7 +15,7 @@ mkdir "$BUILD_DIR"
cd "$BUILD_DIR" cd "$BUILD_DIR"
wget "$EMBREE_TGZ" wget "$EMBREE_TGZ"
tar xf "$EMBREE_TGZ_NAME" tar xf "$EMBREE_TGZ_NAME"
EMBREE_CMAKE_DIR="$(pwd)/$EMBREE_DIR_NAME/lib/cmake/$EMBREE_WITH_VERSION" EMBREE_CMAKE_DIR="$(pwd)/$EMBREE_DIR_NAME"
cmake .. -DCMAKE_BUILD_TYPE=Release -Dembree_DIR="$EMBREE_CMAKE_DIR" cmake .. -DCMAKE_BUILD_TYPE=Release -Dembree_DIR="$EMBREE_CMAKE_DIR"
make -j8 make -j8
make -j8 testlight make -j8 testlight

2
light/CMakeLists.txt
View File

@ -81,7 +81,7 @@ if (embree_FOUND)
endif() endif()
file(GLOB EMBREE_DYLIBS_WITH_SYMLINKS "${embree_DIR}/../../*.${SHARED_LIB_EXT}") file(GLOB EMBREE_DYLIBS_WITH_SYMLINKS "${embree_DIR}/bin/*.${SHARED_LIB_EXT}")
# Gather all .dylib's that are not symlinks # Gather all .dylib's that are not symlinks
foreach(EMBREE_DYLIB ${EMBREE_DYLIBS_WITH_SYMLINKS}) foreach(EMBREE_DYLIB ${EMBREE_DYLIBS_WITH_SYMLINKS})