Update GitLab CI settings.

We shouldn't need to specify static compiler helpers anymore,
and ruby now uses SDL2.0 rather than 1.2.
This commit is contained in:
Tim Allen 2018-05-24 13:10:24 +10:00
parent 5961ea9c03
commit ec4ab1dc11
1 changed files with 7 additions and 7 deletions

View File

@ -5,7 +5,7 @@ image: debian:stable
higan-linux-x86_64-binaries:
script:
- apt-get update && apt-get -y install build-essential libgtk2.0-dev libpulse-dev mesa-common-dev libgtksourceview2.0-dev libcairo2-dev libsdl1.2-dev libxv-dev libao-dev libopenal-dev libudev-dev mkdocs
- apt-get update && apt-get -y install build-essential libgtk2.0-dev libpulse-dev mesa-common-dev libgtksourceview2.0-dev libcairo2-dev libsdl2-dev libxv-dev libao-dev libopenal-dev libudev-dev mkdocs
- make -C genius
- make -C higan target=higan
- LC_ALL=C.UTF-8 mkdocs build
@ -22,7 +22,7 @@ higan-linux-x86_64-binaries:
#bsnes-linux-x86_64-binaries:
# script:
# - apt-get update && apt-get -y install build-essential libgtk2.0-dev libpulse-dev mesa-common-dev libgtksourceview2.0-dev libcairo2-dev libsdl1.2-dev libxv-dev libao-dev libopenal-dev libudev-dev
# - apt-get update && apt-get -y install build-essential libgtk2.0-dev libpulse-dev mesa-common-dev libgtksourceview2.0-dev libcairo2-dev libsdl2-dev libxv-dev libao-dev libopenal-dev libudev-dev
# - make -C higan target=bsnes
# - mkdir bsnes-nightly
# - cp -a higan/out/bsnes bsnes-nightly/bsnes
@ -42,9 +42,9 @@ higan-windows-x86_64-binaries:
- apt-get update && apt-get -y install build-essential mingw-w64 mkdocs
- sed -i -e 's/-lole32/& -static -lpthread/' nall/GNUmakefile
# genius does not currently build on Windows due to lack of a combo edit control in hiro
#- make -C genius platform=windows compiler="x86_64-w64-mingw32-g++ -static-libgcc -static-libstdc++" windres="x86_64-w64-mingw32-windres"
- make -C icarus platform=windows compiler="x86_64-w64-mingw32-g++ -static-libgcc -static-libstdc++" windres="x86_64-w64-mingw32-windres"
- make -C higan target=higan platform=windows compiler="x86_64-w64-mingw32-g++ -static-libgcc -static-libstdc++" windres="x86_64-w64-mingw32-windres"
#- make -C genius platform=windows compiler="x86_64-w64-mingw32-g++" windres="x86_64-w64-mingw32-windres"
- make -C icarus platform=windows compiler="x86_64-w64-mingw32-g++" windres="x86_64-w64-mingw32-windres"
- make -C higan target=higan platform=windows compiler="x86_64-w64-mingw32-g++" windres="x86_64-w64-mingw32-windres"
- LC_ALL=C.UTF-8 mkdocs build
- mkdir higan-nightly
#- cp -a genius/out/genius higan-nightly/genius.exe
@ -69,8 +69,8 @@ higan-windows-x86_64-binaries:
# - apt-get update && apt-get -y install build-essential mingw-w64
# - sed -i -e 's/-lole32/& -static -lpthread/' nall/GNUmakefile
# # genius does not currently build on Windows due to lack of a combo edit control in hiro
# #- make -C genius platform=windows compiler="x86_64-w64-mingw32-g++ -static-libgcc -static-libstdc++" windres="x86_64-w64-mingw32-windres"
# - make -C higan target=bsnes platform=windows compiler="x86_64-w64-mingw32-g++ -static-libgcc -static-libstdc++" windres="x86_64-w64-mingw32-windres"
# #- make -C genius platform=windows compiler="x86_64-w64-mingw32-g++" windres="x86_64-w64-mingw32-windres"
# - make -C higan target=bsnes platform=windows compiler="x86_64-w64-mingw32-g++" windres="x86_64-w64-mingw32-windres"
# - mkdir bsnes-nightly
# - cp -a higan/out/bsnes bsnes-nightly/bsnes.exe
# - cp -a higan/systems/ bsnes-nightly/