Revert "build: new windows build script"

This reverts commit a2a5ec9269d1d28084b5b501da7fb17787262773.
This commit is contained in:
Eric Wasylishen 2016-08-06 12:03:46 -07:00
parent 30933856c3
commit 1c94d4b157
2 changed files with 24 additions and 20 deletions

View File

@ -1,5 +1,27 @@
platform:
- x86
- x64
version: 1.0.{build} 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: 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: artifacts:
- path: cmakebuild\*.zip - path: cmakebuild\*.zip

View File

@ -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"