Skip to content
Snippets Groups Projects
Commit c9e8d34b authored by Monster Iestyn's avatar Monster Iestyn
Browse files

Merge branch 'master' into next

parents 008b0bf5 0051eb70
No related branches found
No related tags found
1 merge request!488Merge in next and don't billboard papersprites in GL
...@@ -36,12 +36,15 @@ jobs: ...@@ -36,12 +36,15 @@ jobs:
- v1-SRB2-APT - v1-SRB2-APT
- run: - run:
name: Install SDK name: Install SDK
command: apt-get -qq -y install git build-essential nasm libpng12-dev:i386 libsdl2-mixer-dev:i386 libgme-dev:i386 gettext ccache wget gcc-multilib upx command: apt-get -qq -y --no-install-recommends install git build-essential nasm libpng12-dev:i386 libsdl2-mixer-dev:i386 libgme-dev:i386 gettext ccache wget gcc-multilib upx
- save_cache: - save_cache:
key: v1-SRB2-APT key: v1-SRB2-APT
paths: paths:
- /var/cache/apt/archives - /var/cache/apt/archives
- checkout - checkout
- run:
name: Compile without network support
command: make -C src LINUX=1 ERRORMODE=1 -k NONET=1
- run: - run:
name: Clean build name: Clean build
command: make -C src LINUX=1 clean command: make -C src LINUX=1 clean
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment