diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index c4f1db0..c008f60 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -193,6 +193,7 @@ function toolchain(_buildDir, _libDir) end flags { + "Cpp14", "ExtraWarnings", } @@ -633,9 +634,6 @@ function toolchain(_buildDir, _libDir) "-Wunused-value", "-Wundef", } - buildoptions_cpp { - "-std=c++14", - } linkoptions { "-Wl,--gc-sections", "-static", @@ -722,9 +720,6 @@ function toolchain(_buildDir, _libDir) "-Wundef", -- "-Wuseless-cast", } - buildoptions_cpp { - "-std=c++14", - } links { "rt", "dl", @@ -779,9 +774,6 @@ function toolchain(_buildDir, _libDir) "-Wunused-value", "-Wundef", } - buildoptions_cpp { - "-std=c++14", - } links { "rt", "dl", @@ -798,9 +790,6 @@ function toolchain(_buildDir, _libDir) "-Wunused-value", "-Wundef", } - buildoptions_cpp { - "-std=c++14", - } links { "rt", "dl", @@ -840,9 +829,6 @@ function toolchain(_buildDir, _libDir) "-Wunused-value", "-Wundef", } - buildoptions_cpp { - "-std=c++14", - } linkoptions { "-no-canonical-prefixes", "-Wl,--no-undefined", @@ -860,7 +846,6 @@ function toolchain(_buildDir, _libDir) "__STEAMLINK__=1", -- There is no special prefedined compiler symbol to detect SteamLink, faking it. } buildoptions { - "-std=c++14", "-Wfatal-errors", "-Wunused-value", "-Wundef", @@ -945,9 +930,6 @@ function toolchain(_buildDir, _libDir) "-Wunused-value", "-Wundef", } - buildoptions_cpp { - "-std=c++14", - } configuration { "freebsd" } targetdir (path.join(_buildDir, "freebsd/bin")) @@ -1005,12 +987,6 @@ function toolchain(_buildDir, _libDir) objdir (path.join(_buildDir, "osx_universal/bin")) configuration { "osx" } - buildoptions_cpp { - "-std=c++14", - } - buildoptions_objcpp { - "-std=c++14", - } buildoptions { "-Wfatal-errors", "-msse2", @@ -1023,12 +999,6 @@ function toolchain(_buildDir, _libDir) linkoptions { "-lc++", } - buildoptions_cpp { - "-std=c++14", - } - buildoptions_objcpp { - "-std=c++14", - } buildoptions { "-Wfatal-errors", "-Wunused-value", @@ -1172,9 +1142,6 @@ function toolchain(_buildDir, _libDir) "$(SCE_ORBIS_SDK_DIR)/target/include", "$(SCE_ORBIS_SDK_DIR)/target/include_common", } - buildoptions_cpp { - "-std=c++14", - } configuration { "rpi" } targetdir (path.join(_buildDir, "rpi/bin")) @@ -1191,9 +1158,6 @@ function toolchain(_buildDir, _libDir) "-Wunused-value", "-Wundef", } - buildoptions_cpp { - "-std=c++14", - } includedirs { "/opt/vc/include", "/opt/vc/include/interface/vcos/pthreads", @@ -1223,9 +1187,6 @@ function toolchain(_buildDir, _libDir) "-Wundef", "--sysroot=$(FREEDOM_E_SDK)/work/build/riscv-gnu-toolchain/riscv64-unknown-elf/prefix/riscv64-unknown-elf", } - buildoptions_cpp { - "-std=c++14", - } configuration {} -- reset configuration