From b7943546796db5269006838f7734051c52e69048 Mon Sep 17 00:00:00 2001
From: Stephen Anthony <sa666666@gmail.com>
Date: Sat, 28 Nov 2020 10:48:00 -0330
Subject: [PATCH] Move Linux builds to use C++17 by default.

---
 Changes.txt                 | 2 ++
 Makefile                    | 4 ++--
 configure                   | 2 +-
 docs/index.html             | 4 ++--
 src/libretro/Makefile       | 6 +++---
 src/libretro/jni/Android.mk | 2 +-
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Changes.txt b/Changes.txt
index c2767093b..6140d6f59 100644
--- a/Changes.txt
+++ b/Changes.txt
@@ -30,6 +30,8 @@
 
   * Fixed autofire bug for trackball controllers.
 
+  * Codebase now uses C++17 features.
+
 -Have fun!
 
 
diff --git a/Makefile b/Makefile
index 87a2c9847..d9dc607c9 100644
--- a/Makefile
+++ b/Makefile
@@ -48,11 +48,11 @@ endif
 CXXFLAGS+= -Wall -Wextra -Wno-unused-parameter
 
 ifdef HAVE_GCC
-  CXXFLAGS+= -Wno-multichar -Wunused -Woverloaded-virtual -Wnon-virtual-dtor -std=c++14
+  CXXFLAGS+= -Wno-multichar -Wunused -Woverloaded-virtual -Wnon-virtual-dtor -std=c++17
 endif
 
 ifdef HAVE_CLANG
-  CXXFLAGS+= -Wno-multichar -Wunused -Woverloaded-virtual -Wnon-virtual-dtor -std=c++14
+  CXXFLAGS+= -Wno-multichar -Wunused -Woverloaded-virtual -Wnon-virtual-dtor -std=c++17
 endif
 
 ifdef CLANG_WARNINGS
diff --git a/configure b/configure
index 31281ec4c..ad2ebbed7 100755
--- a/configure
+++ b/configure
@@ -385,7 +385,7 @@ else
 	fi
 
 	for compiler in $compilers; do
-		if test_compiler "$compiler -std=c++14"; then
+		if test_compiler "$compiler -std=c++17"; then
 			CXX=$compiler
 			echo $CXX
 			break
diff --git a/docs/index.html b/docs/index.html
index 0c6598b56..369598e23 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -260,7 +260,7 @@
   <h2><b><a name="Features">Features</a></b></h2>
 
   <ul>
-    <li>High speed emulation using optimized C++14 code</li>
+    <li>High speed emulation using optimized C++17 code</li>
     <li>Supports high quality TIA emulation using the cycle-exact TIA core from
       <a href="https://github.com/6502ts/6502.ts">6502.ts</a> by
       Christian Speckner</li>
@@ -350,7 +350,7 @@
     <li>OpenGL capable video card</li>
     <li>Other architectures (MIPS, PPC, PPC64, etc.) have been confirmed to work,
       but aren't as well tested as i386/x86_64</li>
-    <li>GNU g++ v/6 or Clang v/3.9 (with C++14 support) and the make utility are required for compiling the Stella source code</li>
+    <li>GNU g++ v/7 or Clang v/5 (with C++17 support) and the make utility are required for compiling the Stella source code</li>
   </ul>
 
   <p>
diff --git a/src/libretro/Makefile b/src/libretro/Makefile
index 8d17db9db..6f8eb6599 100644
--- a/src/libretro/Makefile
+++ b/src/libretro/Makefile
@@ -43,7 +43,7 @@ TARGET_NAME = stella
 
 
 ifeq (,$(findstring msvc,$(platform)))
-   CXXFLAGS += -std=c++14 -fno-rtti
+   CXXFLAGS += -std=c++17 -fno-rtti
    LIBS := -lm
 else
    LIBS :=
@@ -282,8 +282,8 @@ else ifneq (,$(filter $(platform), ngc wii wiiu))
 else ifeq ($(platform), emscripten)
    TARGET := $(TARGET_NAME)_libretro_$(platform).bc
    STATIC_LINKING = 1
-   CXXFLAGS += $(PTHREAD_FLAGS) -std=c++14
-   LDFLAGS += $(PTHREAD_FLAGS) -std=c++14
+   CXXFLAGS += $(PTHREAD_FLAGS) -std=c++17
+   LDFLAGS += $(PTHREAD_FLAGS) -std=c++17
 
 # Genode
 else ifeq ($(platform), genode)
diff --git a/src/libretro/jni/Android.mk b/src/libretro/jni/Android.mk
index 3115baa53..644f983ae 100644
--- a/src/libretro/jni/Android.mk
+++ b/src/libretro/jni/Android.mk
@@ -14,6 +14,6 @@ endif
 include $(CLEAR_VARS)
 LOCAL_MODULE    := retro
 LOCAL_SRC_FILES := $(SOURCES_CXX) $(SOURCES_C)
-LOCAL_CXXFLAGS  := $(COREFLAGS) -std=c++14
+LOCAL_CXXFLAGS  := $(COREFLAGS) -std=c++17
 LOCAL_LDFLAGS   := -Wl,-version-script=$(CORE_DIR)/libretro/link.T
 include $(BUILD_SHARED_LIBRARY)