From bdba212b2a9653734afe6b3b6b4c08fa104980c5 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Thu, 28 Sep 2017 09:13:01 -0400
Subject: [PATCH] Makefile: add support for GCC 7.1 and 7.2
---
.travis.yml | 15 +++++++++++++++
src/Makefile.cfg | 7 +++++++
2 files changed, 22 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index e5dbb58e42..285eebd521 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -100,6 +100,21 @@ matrix:
compiler: gcc-6
env: WFLAGS="-Wno-tautological-compare"
#gcc-6 (Ubuntu 6.1.1-3ubuntu11~14.04.1) 6.1.1 20160511
+ - os: linux
+ addons:
+ apt:
+ sources:
+ - ubuntu-toolchain-r-test
+ packages:
+ - libsdl2-mixer-dev
+ - libpng-dev
+ - libgl1-mesa-dev
+ - libgme-dev
+ - p7zip-full
+ - gcc-7
+ compiler: gcc-7
+ env: WFLAGS="-Wno-tautological-compare"
+ #gcc-7 (Ubuntu 7.2.0-1ubuntu1~14.04) 7.2.0 20170802
- os: linux
compiler: clang
#clang version 3.5.0 (tags/RELEASE_350/final)
diff --git a/src/Makefile.cfg b/src/Makefile.cfg
index 50cc32dd52..7620a3d68a 100644
--- a/src/Makefile.cfg
+++ b/src/Makefile.cfg
@@ -7,6 +7,13 @@
# and other things
#
+ifdef GCC72
+GCC71=1
+endif
+
+ifdef GCC71
+GCC64=1
+endif
ifdef GCC64
GCC64=1
--
GitLab