Skip to content
Snippets Groups Projects
Commit c9cee397 authored by Alam Ed Arias's avatar Alam Ed Arias
Browse files

Merge branch 'master' into next

parents a01a0a3d 4d34841a
Branches
Tags
1 merge request!488Merge in next and don't billboard papersprites in GL
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
.circleci/config.yml
+ 2
− 2
View file @ c9cee397
...@@ -3,7 +3,7 @@ jobs: ...@@ -3,7 +3,7 @@ jobs:
build: build:
working_directory: /root/SRB2 working_directory: /root/SRB2
docker: docker:
- image: debian:jessie - image: debian:stretch
environment: environment:
CC: ccache gcc -m32 CC: ccache gcc -m32
PKG_CONFIG_LIBDIR: /usr/lib/i386-linux-gnu/pkgconfig PKG_CONFIG_LIBDIR: /usr/lib/i386-linux-gnu/pkgconfig
...@@ -36,7 +36,7 @@ jobs: ...@@ -36,7 +36,7 @@ jobs:
- v1-SRB2-APT - v1-SRB2-APT
- run: - run:
name: Install SDK name: Install SDK
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 openssh-client command: apt-get -qq -y --no-install-recommends install git build-essential nasm libpng-dev:i386 libsdl2-mixer-dev:i386 libgme-dev:i386 gettext ccache wget gcc-multilib upx openssh-client
- save_cache: - save_cache:
key: v1-SRB2-APT key: v1-SRB2-APT
paths: paths:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment