Uncomment stuff

This commit is contained in:
Jean-André Santoni 2019-11-20 10:09:24 +07:00
parent 87cc90741d
commit 8da54e2349
No known key found for this signature in database
GPG Key ID: 9D694E373914CC36

View File

@ -12,56 +12,56 @@ dist: xenial
matrix: matrix:
include: include:
# - compiler: mingw-x86 - compiler: mingw-x86
# addons: true addons: true
# env: CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501" env: CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
# - compiler: mingw-x86 - compiler: mingw-x86
# addons: true addons: true
# env: C89_BUILD=1 CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501" env: C89_BUILD=1 CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
# - compiler: mingw-x86 - compiler: mingw-x86
# addons: true addons: true
# env: CXX_BUILD=1 CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501" env: CXX_BUILD=1 CROSS_COMPILE=i686-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
# - compiler: mingw-x64 - compiler: mingw-x64
# addons: true addons: true
# env: CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501" env: CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
# - compiler: mingw-x64 - compiler: mingw-x64
# addons: true addons: true
# env: C89_BUILD=1 CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501" env: C89_BUILD=1 CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
# - compiler: mingw-x64 - compiler: mingw-x64
# addons: true addons: true
# env: CXX_BUILD=1 CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501" env: CXX_BUILD=1 CROSS_COMPILE=x86_64-w64-mingw32- CFLAGS="-D_WIN32_WINNT=0x0501"
# - compiler: gcc - compiler: gcc
# env: CC=gcc-8 CXX=g++-8 env: CC=gcc-8 CXX=g++-8
# - compiler: gcc - compiler: gcc
# env: C89_BUILD=1 CC=gcc-8 CXX=g++-8 env: C89_BUILD=1 CC=gcc-8 CXX=g++-8
# - compiler: gcc - compiler: gcc
# env: CXX_BUILD=1 CC=gcc-8 CXX=g++-8 env: CXX_BUILD=1 CC=gcc-8 CXX=g++-8
# - compiler: gcc - compiler: gcc
# env: DISABLE_MENU=1 CC=gcc-8 CXX=g++-8 env: DISABLE_MENU=1 CC=gcc-8 CXX=g++-8
# - compiler: gcc - compiler: gcc
# env: DISABLE_OVERLAY=1 CC=gcc-8 CXX=g++-8 env: DISABLE_OVERLAY=1 CC=gcc-8 CXX=g++-8
# - compiler: gcc - compiler: gcc
# env: DISABLE_CDROM=1 CC=gcc-8 CXX=g++-8 env: DISABLE_CDROM=1 CC=gcc-8 CXX=g++-8
# - compiler: gcc - compiler: gcc
# env: DISABLE_VIDEO_LAYOUT=1 CC=gcc-8 CXX=g++-8 env: DISABLE_VIDEO_LAYOUT=1 CC=gcc-8 CXX=g++-8
# - compiler: gcc - compiler: gcc
# env: DISABLE_AUDIOMIXER=1 CC=gcc-8 CXX=g++-8 env: DISABLE_AUDIOMIXER=1 CC=gcc-8 CXX=g++-8
# - compiler: gcc - compiler: gcc
# env: ENABLE_GLES=1 CC=gcc-8 CXX=g++-8 env: ENABLE_GLES=1 CC=gcc-8 CXX=g++-8
# - compiler: gcc - compiler: gcc
# env: ENABLE_GLES=1 ENABLE_GLES3=1 CC=gcc-8 CXX=g++-8 env: ENABLE_GLES=1 ENABLE_GLES3=1 CC=gcc-8 CXX=g++-8
# - compiler: clang - compiler: clang
# env: CC=clang-6.0 CXX=clang++-6.0 env: CC=clang-6.0 CXX=clang++-6.0
# - compiler: clang - compiler: clang
# env: C89_BUILD=1 CC=clang-6.0 CXX=clang++-6.0 env: C89_BUILD=1 CC=clang-6.0 CXX=clang++-6.0
# - compiler: clang - compiler: clang
# env: CXX_BUILD=1 CC=clang-6.0 CXX=clang++-6.0 env: CXX_BUILD=1 CC=clang-6.0 CXX=clang++-6.0
# - os: osx - os: osx
# env: CC=clang CXX=clang++ env: CC=clang CXX=clang++
# - os: osx - os: osx
# osx_image: xcode8 osx_image: xcode8
# script: script:
# - xcodebuild -target RetroArch -configuration Release -project pkg/apple/RetroArch.xcodeproj - xcodebuild -target RetroArch -configuration Release -project pkg/apple/RetroArch.xcodeproj
- os: osx - os: osx
osx_image: xcode11.2 osx_image: xcode11.2
script: script:
@ -81,21 +81,21 @@ matrix:
script: bash travis_metal_deploy.sh script: bash travis_metal_deploy.sh
on: on:
branch: master branch: master
# - language: android - language: android
# # Android builds are only supported on Trusty # Android builds are only supported on Trusty
# dist: trusty dist: trusty
# android: android:
# components: components:
# - tools - tools
# - build-tools-28.0.3 - build-tools-28.0.3
# - android-28 - android-28
# install: install:
# - echo y | sdkmanager "ndk-bundle" - echo y | sdkmanager "ndk-bundle"
# before_script: before_script:
# - export ANDROID_NDK_HOME=$ANDROID_HOME/ndk-bundle - export ANDROID_NDK_HOME=$ANDROID_HOME/ndk-bundle
# script: script:
# - cd pkg/android/phoenix - cd pkg/android/phoenix
# - ./gradlew assembleNormalRelease - ./gradlew assembleNormalRelease
before_install: before_install:
- | - |