GerbilSoft/rom-properties
1
Fork 0
mirror of https://github.com/GerbilSoft/rom-properties.git synced 2025-06-18 11:35:38 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

appveyor.yml: Use cURL from Git's path.

Browse Source 
This should fix NASM installation.

References:
- https://github.com/facebookincubator/create-react-app/pull/1868
- d9d9fe46c5
This commit is contained in:
David Korth 2017-04-09 12:07:26 -04:00
parent 27fbc1cc31
commit 6f60b84b8e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
appveyor.cmd
View File

@ -1,6 +1,6 @@
@ECHO OFF
IF "%PLATFORM%" == "x64" (
cmake . -G "Visual Studio 14 2015 Win64" -DCMAKE_GENERATOR_TOOLSET=v140_xp -DENABLE_JPEG=OFF -DBUILD_TESTING=ON
cmake . -G "Visual Studio 14 2015 Win64" -DCMAKE_GENERATOR_TOOLSET=v140_xp -DENABLE_JPEG=ON -DBUILD_TESTING=ON
) ELSE (
cmake . -G "Visual Studio 14 2015" -DCMAKE_GENERATOR_TOOLSET=v140_xp -DENABLE_JPEG=OFF -DBUILD_TESTING=ON
cmake . -G "Visual Studio 14 2015" -DCMAKE_GENERATOR_TOOLSET=v140_xp -DENABLE_JPEG=ON -DBUILD_TESTING=ON
)

7
appveyor.yml
View File

@ -34,10 +34,11 @@ environment:
NASM_URL: http://www.nasm.us/pub/nasm/releasebuilds/2.12.02/win64/nasm-2.12.02-installer-x64.exe
# Install NASM, then run CMake.
# FIXME: NASM installation isn't working; CMake ends up running first.
before_build:
# - appveyor DownloadFile "%NASM_URL%" -FileName nasminst.exe
# - start /wait nasminst /S
# TODO: Remove after https://github.com/appveyor/ci/issues/1426 is fixed
- set PATH=C:\Program Files\Git\mingw64\bin;%PATH%
- curl -L -o nasminst.exe "%NASM_URL%"
- start /wait nasminst /S
- cd %APPVEYOR_BUILD_FOLDER%
- appveyor.cmd