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: Disable NASM and JPEG, again.

Browse Source 
`appveyor DownloadFile` is triggering CMake for some reason, regardless
of the comments. I'm not sure what to do here.
This commit is contained in:
David Korth 2017-03-21 20:26:23 -04:00
parent baf7fb069a
commit 8e3dfc2e23
2 changed files with 5 additions and 4 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=ON -DBUILD_TESTING=ON
cmake . -G "Visual Studio 14 2015 Win64" -DCMAKE_GENERATOR_TOOLSET=v140_xp -DENABLE_JPEG=OFF -DBUILD_TESTING=ON
) ELSE (
cmake . -G "Visual Studio 14 2015" -DCMAKE_GENERATOR_TOOLSET=v140_xp -DENABLE_JPEG=ON -DBUILD_TESTING=ON
cmake . -G "Visual Studio 14 2015" -DCMAKE_GENERATOR_TOOLSET=v140_xp -DENABLE_JPEG=OFF -DBUILD_TESTING=ON
)

5
appveyor.yml
View File

@ -34,9 +34,10 @@ 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
# - appveyor DownloadFile "%NASM_URL%" -FileName nasminst.exe
# - start /wait nasminst /S
- cd %APPVEYOR_BUILD_FOLDER%
- appveyor.cmd