diff --git a/appveyor.yml b/appveyor.yml index a894f798..d32f395a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,27 @@ +platform: +- x86 +- x64 + 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: 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: 7z x embree.zip -oc:\ build_script: -- ps: .\build-win32.ps1 +- ps: >- + $env:Path += ";C:\cygwin64\bin" + + mkdir cmakebuild + + 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 + } Else { + cmake .. -T v140_xp -Dembree_DIR="c:/embree-2.10.0.win32.windows/lib/cmake/embree-2.10.0" + } + + msbuild PACKAGE.vcxproj /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" artifacts: -- path: cmakebuild\*.zip +- path: cmakebuild\*.zip \ No newline at end of file diff --git a/build-win32.ps1 b/build-win32.ps1 deleted file mode 100644 index 5936b8a4..00000000 --- a/build-win32.ps1 +++ /dev/null @@ -1,18 +0,0 @@ -#build embree -Invoke-WebRequest 'https://github.com/embree/embree/archive/v2.10.0.zip' -OutFile 'embree.zip' -7z x embree.zip -cd embree-2.10.0 -mkdir build -cd build -cmake .. -T v140_xp -DENABLE_ISPC_SUPPORT=NO -DENABLE_TUTORIALS=NO -DRTCORE_TASKING_SYSTEM=INTERNAL -DCMAKE_INSTALL_PREFIX="$(get-location)" -msbuild INSTALL.vcxproj /p:Configuration=Release -$EmbreeInstallDir = [io.path]::combine($(get-location).Path, "lib\cmake\embree-2.10.0") -cd .. -cd .. - -# build tyrutils -$env:Path += ";C:\cygwin64\bin" # for groff, used for manuals -mkdir cmakebuild -cd cmakebuild -cmake .. -T v140_xp -Dembree_DIR="$EmbreeInstallDir" -msbuild PACKAGE.vcxproj /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"