Compare commits

...

4 Commits

Author SHA1 Message Date
orbea
8ba7680e89 test 2019-10-16 18:17:21 -07:00
orbea
8c6ff26e12 cmake: Try to fix travis windows builds.
-- The ASM_NASM compiler identification is unknown
-- Found assembler: nasm;yasm
-- Configuring incomplete, errors occurred!
2019-10-16 12:21:29 -07:00
orbea
7370f5967c DO NOT MERGE 2019-10-16 12:21:29 -07:00
orbea
cc2ff47ab4 travis: Test windows. 2019-10-16 07:45:22 -07:00
2 changed files with 11 additions and 18 deletions

View File

@@ -8,23 +8,13 @@ sudo: required
matrix:
fast_finish: true
include:
- env: BUILD_ENV=ubuntu-bionic XVFB_RUN=1
dist: bionic
- env: BUILD_ENV=ubuntu-xenial XVFB_RUN=1
dist: xenial
- env: BUILD_ENV=ubuntu-trusty XVFB_RUN=1
- env: BUILD_ENV=ubuntu-trusty XVFB_RUN=1 CC=clang CXX=clang++
- env: BUILD_ENV=mingw-w64
- env: BUILD_ENV=mingw-w32
- env: BUILD_ENV=libretro
- env: BUILD_ENV=libretro CC=clang CXX=clang++
- env: BUILD_ENV=mac
os: osx
osx_image: xcode10.2
install: export PATH="/usr/local/opt/ccache/libexec:$PATH"
- env: BUILD_ENV=windows
os: windows
before_install:
- |
CMAKE=cmake
case "$BUILD_ENV" in
mingw-w64 )
ARG=MinGW-w64-x86_64
@@ -34,13 +24,16 @@ before_install:
ARG=MinGW-w64-i686
CMAKE=/usr/lib/mxe/usr/bin/i686-w64-mingw32.static-cmake
;;
* )
CMAKE=cmake
windows )
choco install msys2
bash /bin/rebaseall
export MSYSTEM=MINGW64
bash='C:\tools\msys64\usr\bin\bash'
;;
esac
- |
if [ "$BUILD_ENV" != libretro ]; then
./installdeps $ARG
$bash ./installdeps $ARG
DIR=build
else
DIR=src/libretro

View File

@@ -242,7 +242,7 @@ if(AMD64 AND (ENABLE_ASM_CORE OR ENABLE_ASM_SCALERS OR ENABLE_MMX))
endif()
if(ENABLE_ASM_CORE OR ENABLE_ASM_SCALERS)
enable_language(ASM_NASM)
enable_language(ASM)
set(ASM_ENABLED ON)
endif()