appveyor: use system yasm
This commit is contained in:
parent
d1e76a94d5
commit
bc7809d89f
@ -1,9 +1,5 @@
|
|||||||
export PATH=/c/msys64/mingw$ABI/bin:$PATH
|
export PATH=/c/msys64/mingw$ABI/bin:/c/projects/mpir/bin/:$PATH
|
||||||
cd /c/projects/mpir
|
cd /c/projects/mpir
|
||||||
./configure ABI=$ABI
|
./configure ABI=$ABI --with-system-yasm
|
||||||
make
|
make
|
||||||
if [ "$ABI" = "32" ]
|
|
||||||
then
|
|
||||||
rm yasm/Makefile
|
|
||||||
fi
|
|
||||||
make check
|
make check
|
||||||
|
@ -4,16 +4,16 @@ build:
|
|||||||
|
|
||||||
environment:
|
environment:
|
||||||
matrix:
|
matrix:
|
||||||
|
- COMPILER: MinGW-w64
|
||||||
|
ABI: 32
|
||||||
|
- COMPILER: MinGW-w64
|
||||||
|
ABI: 64
|
||||||
- BUILD_TYPE: Release
|
- BUILD_TYPE: Release
|
||||||
COMPILER: MSVC15
|
COMPILER: MSVC15
|
||||||
PLATFORM: x64
|
PLATFORM: x64
|
||||||
- BUILD_TYPE: Release
|
- BUILD_TYPE: Release
|
||||||
COMPILER: MSVC15
|
COMPILER: MSVC15
|
||||||
PLATFORM: Win32
|
PLATFORM: Win32
|
||||||
- COMPILER: MinGW-w64
|
|
||||||
ABI: 64
|
|
||||||
- COMPILER: MinGW-w64
|
|
||||||
ABI: 32
|
|
||||||
# - BUILD_TYPE: Debug
|
# - BUILD_TYPE: Debug
|
||||||
# COMPILER: MSVC15
|
# COMPILER: MSVC15
|
||||||
# PLATFORM: x64
|
# PLATFORM: x64
|
||||||
@ -22,6 +22,7 @@ environment:
|
|||||||
# PLATFORM: Win32
|
# PLATFORM: Win32
|
||||||
|
|
||||||
build_script:
|
build_script:
|
||||||
|
- if [%COMPILER%]==[MinGW-w64] mkdir bin && cd bin\ && appveyor DownloadFile http://www.tortall.net/projects/yasm/releases/yasm-1.3.0-win64.exe -fileName yasm.exe
|
||||||
- if [%COMPILER%]==[MinGW-w64] C:\msys64\usr\bin\sh.exe --login /c/projects/mpir/.appveyor_msys_build.sh
|
- if [%COMPILER%]==[MinGW-w64] C:\msys64\usr\bin\sh.exe --login /c/projects/mpir/.appveyor_msys_build.sh
|
||||||
- if [%COMPILER%]==[MSVC15] cd build.vc14
|
- if [%COMPILER%]==[MSVC15] cd build.vc14
|
||||||
- if [%COMPILER%]==[MSVC15] msbuild.bat gc lib %PLATFORM% %BUILD_TYPE% +tests
|
- if [%COMPILER%]==[MSVC15] msbuild.bat gc lib %PLATFORM% %BUILD_TYPE% +tests
|
||||||
|
Loading…
Reference in New Issue
Block a user