Merge branch 'master'

.circleci/config.yml

@@ -0,0 +1,34 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: debian:stretch
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - run: apt-get update -y
+      - run: apt-get install -y cmake g++ libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsodium-dev
+      - run: mkdir build
+      - run: cd build && cmake ..
+      - run: cd build && make -j$(nproc)
+      - store_artifacts: {path: ./build/devilutionx, destination: devilutionx_linux_x86_64}
+  build32:
+    docker:
+      - image: debian:stretch
+    working_directory: ~/repo
+    steps:
+      - checkout
+      - run: dpkg --add-architecture i386
+      - run: apt-get update -y
+      - run: apt-get install -y cmake g++-multilib libsdl2-dev:i386 libsdl2-mixer-dev:i386 libsdl2-ttf-dev:i386 libsodium-dev libsodium-dev:i386
+      - run: mkdir build32
+      - run: cd build32 && cmake -DCMAKE_TOOLCHAIN_FILE=../CMake/32bit.cmake ..
+      - run: cd build32 && make -j$(nproc)
+      - store_artifacts: {path: ./build32/devilutionx, destination: devilutionx_linux_x86}
+
+workflows:
+  version: 2
+  testflow:
+    jobs:
+      - build
+      - build32

README.md

@@ -1,3 +1,4 @@
+[![CircleCI](https://circleci.com/gh/diasurgical/devilutionX.svg?style=svg)](https://circleci.com/gh/diasurgical/devilutionX)
 [![Build Status](https://travis-ci.org/diasurgical/devilutionX.svg?branch=master)](https://travis-ci.org/diasurgical/devilutionX)
 [![Downloads](https://img.shields.io/github/downloads/diasurgical/devilutionX/total.svg)](https://github.com/diasurgical/devilutionX/releases)
 
@@ -19,7 +20,7 @@ Note: Since 64-bit builds are currently not in a playable state, it is advised t
 
 Install the dependencies on your machine:
 ```
-sudo apt-get install cmake libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsodium-dev
+sudo apt-get install cmake g++ libsdl2-dev libsdl2-mixer-dev libsdl2-ttf-dev libsodium-dev
 ```
 
 Now run the following commands: