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

light: update embree to 2.11.0

This commit is contained in:
Eric Wasylishen 2016-09-02 15:03:32 -06:00
parent 9111d8df9f
commit df8f8b264b
3 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
appveyor.yml
View File

@ -4,9 +4,9 @@ platform:
version: 1.0.{build}
install:
- ps: Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v2.10.0/embree-2.10.0.x64.windows.zip' -OutFile 'embree64.zip'
- ps: Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v2.11.0/embree-2.11.0.x64.windows.zip' -OutFile 'embree64.zip'
- ps: 7z x embree64.zip -oc:\
- ps: Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v2.10.0/embree-2.10.0.win32.windows.zip' -OutFile 'embree.zip'
- ps: Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v2.11.0/embree-2.11.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 v140_xp -Dembree_DIR="c:/embree-2.10.0.x64.windows/lib/cmake/embree-2.10.0" -DCMAKE_GENERATOR_PLATFORM=x64
cmake .. -T v140_xp -Dembree_DIR="c:/embree-2.11.0.x64.windows/lib/cmake/embree-2.11.0" -DCMAKE_GENERATOR_PLATFORM=x64
} Else {
cmake .. -T v140_xp -Dembree_DIR="c:/embree-2.10.0.win32.windows/lib/cmake/embree-2.10.0"
cmake .. -T v140_xp -Dembree_DIR="c:/embree-2.11.0.win32.windows/lib/cmake/embree-2.11.0"
}
msbuild check.vcxproj /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"

3
build-osx.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
BUILD_DIR=build-osx
EMBREE_TGZ="https://github.com/embree/embree/releases/download/v2.10.0/embree-2.10.0.x86_64.macosx.tar.gz"
EMBREE_TGZ="https://github.com/embree/embree/releases/download/v2.11.0/embree-2.11.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")
@ -15,7 +15,6 @@ mkdir "$BUILD_DIR"
cd "$BUILD_DIR"
wget "$EMBREE_TGZ"
tar xf "$EMBREE_TGZ_NAME"
patch -p0 < ../patches/embree2.10.0.patch
EMBREE_CMAKE_DIR="$(pwd)/$EMBREE_DIR_NAME/lib/cmake/$EMBREE_WITH_VERSION"
cmake .. -DCMAKE_BUILD_TYPE=Release -Dembree_DIR="$EMBREE_CMAKE_DIR"
make -j8

13
patches/embree2.10.0.patch
View File

@ -1,13 +0,0 @@
--- embree-2.10.0.x86_64.macosx/include/embree2/rtcore.h 2016-05-19 23:54:49.000000000 -0600
+++ embree-2.10.0.x86_64.macosx/include/embree2/rtcore.h 2016-06-28 15:32:56.000000000 -0600
@@ -50,6 +50,10 @@
#define RTCORE_DEPRECATED
#endif
+#if !defined(_WIN32)
+ #define __forceinline inline __attribute__((always_inline))
+#endif
+
/*! Embree API version */
#define RTCORE_VERSION_MAJOR 2
#define RTCORE_VERSION_MINOR 10