mirror of https://github.com/stella-emu/stella.git
Move Linux builds to use C++17 by default.
This commit is contained in:
parent
9ac459bf71
commit
fe2b4d630e
|
@ -30,6 +30,8 @@
|
||||||
|
|
||||||
* Fixed autofire bug for trackball controllers.
|
* Fixed autofire bug for trackball controllers.
|
||||||
|
|
||||||
|
* Codebase now uses C++17 features.
|
||||||
|
|
||||||
-Have fun!
|
-Have fun!
|
||||||
|
|
||||||
|
|
||||||
|
|
4
Makefile
4
Makefile
|
@ -48,11 +48,11 @@ endif
|
||||||
CXXFLAGS+= -Wall -Wextra -Wno-unused-parameter
|
CXXFLAGS+= -Wall -Wextra -Wno-unused-parameter
|
||||||
|
|
||||||
ifdef HAVE_GCC
|
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
|
endif
|
||||||
|
|
||||||
ifdef HAVE_CLANG
|
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
|
endif
|
||||||
|
|
||||||
ifdef CLANG_WARNINGS
|
ifdef CLANG_WARNINGS
|
||||||
|
|
|
@ -385,7 +385,7 @@ else
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for compiler in $compilers; do
|
for compiler in $compilers; do
|
||||||
if test_compiler "$compiler -std=c++14"; then
|
if test_compiler "$compiler -std=c++17"; then
|
||||||
CXX=$compiler
|
CXX=$compiler
|
||||||
echo $CXX
|
echo $CXX
|
||||||
break
|
break
|
||||||
|
|
|
@ -260,7 +260,7 @@
|
||||||
<h2><b><a name="Features">Features</a></b></h2>
|
<h2><b><a name="Features">Features</a></b></h2>
|
||||||
|
|
||||||
<ul>
|
<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
|
<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
|
<a href="https://github.com/6502ts/6502.ts">6502.ts</a> by
|
||||||
Christian Speckner</li>
|
Christian Speckner</li>
|
||||||
|
@ -350,7 +350,7 @@
|
||||||
<li>OpenGL capable video card</li>
|
<li>OpenGL capable video card</li>
|
||||||
<li>Other architectures (MIPS, PPC, PPC64, etc.) have been confirmed to work,
|
<li>Other architectures (MIPS, PPC, PPC64, etc.) have been confirmed to work,
|
||||||
but aren't as well tested as i386/x86_64</li>
|
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>
|
</ul>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
|
|
|
@ -43,7 +43,7 @@ TARGET_NAME = stella
|
||||||
|
|
||||||
|
|
||||||
ifeq (,$(findstring msvc,$(platform)))
|
ifeq (,$(findstring msvc,$(platform)))
|
||||||
CXXFLAGS += -std=c++14 -fno-rtti
|
CXXFLAGS += -std=c++17 -fno-rtti
|
||||||
LIBS := -lm
|
LIBS := -lm
|
||||||
else
|
else
|
||||||
LIBS :=
|
LIBS :=
|
||||||
|
@ -282,8 +282,8 @@ else ifneq (,$(filter $(platform), ngc wii wiiu))
|
||||||
else ifeq ($(platform), emscripten)
|
else ifeq ($(platform), emscripten)
|
||||||
TARGET := $(TARGET_NAME)_libretro_$(platform).bc
|
TARGET := $(TARGET_NAME)_libretro_$(platform).bc
|
||||||
STATIC_LINKING = 1
|
STATIC_LINKING = 1
|
||||||
CXXFLAGS += $(PTHREAD_FLAGS) -std=c++14
|
CXXFLAGS += $(PTHREAD_FLAGS) -std=c++17
|
||||||
LDFLAGS += $(PTHREAD_FLAGS) -std=c++14
|
LDFLAGS += $(PTHREAD_FLAGS) -std=c++17
|
||||||
|
|
||||||
# Genode
|
# Genode
|
||||||
else ifeq ($(platform), genode)
|
else ifeq ($(platform), genode)
|
||||||
|
|
|
@ -14,6 +14,6 @@ endif
|
||||||
include $(CLEAR_VARS)
|
include $(CLEAR_VARS)
|
||||||
LOCAL_MODULE := retro
|
LOCAL_MODULE := retro
|
||||||
LOCAL_SRC_FILES := $(SOURCES_CXX) $(SOURCES_C)
|
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
|
LOCAL_LDFLAGS := -Wl,-version-script=$(CORE_DIR)/libretro/link.T
|
||||||
include $(BUILD_SHARED_LIBRARY)
|
include $(BUILD_SHARED_LIBRARY)
|
||||||
|
|
Loading…
Reference in New Issue