From ab2f437661e9385a54c1f7417f2398165ad54b07 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 12 Jul 2020 17:00:01 -0400 Subject: [PATCH] C++17 requires g++ 7 --- INSTALL.md | 6 +++--- Makefile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 59c99af..3796047 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -33,7 +33,7 @@ If the pre-built release already works for you, you don't have to build it yours ### Install dependencies -You need at least g++ 4.9 for `` support. +You need at least g++ 7 for C++11 `` and C++17 `` support. #### Ubuntu/Debian @@ -53,12 +53,12 @@ sudo dnf install make g++ git unzip sudo dnf install zlib-devel libpng-devel libXpm-devel libX11-devel libXft-devel libXinerama-devel fontconfig-devel libXext-devel libXrender-devel libXfixes-devel ``` -### Install and build Polished Map +### Install and build Polished Map++ Run the following commands: ```bash -# Clone Polished Map +# Clone Polished Map++ git clone --branch plusplus https://github.com/Rangi42/polished-map.git cd polished-map diff --git a/Makefile b/Makefile index b32fd44..bdc329b 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ tmpdir = tmp debugdir = tmp/debug bindir = bin -CXXFLAGS = -std=c++11 -I$(srcdir) -I$(resdir) $(shell fltk-config --use-images --cxxflags) +CXXFLAGS = -std=c++17 -I$(srcdir) -I$(resdir) $(shell fltk-config --use-images --cxxflags) LDFLAGS = $(shell fltk-config --use-images --ldflags) $(shell pkg-config --libs libpng xpm) RELEASEFLAGS = -DNDEBUG -O3 -flto -march=native