diff options
author | 2020-12-30 12:53:32 +1100 | |
---|---|---|
committer | 2020-12-30 12:53:32 +1100 | |
commit | ca19c18de2e943f1a7947e8167533b92cb5259a7 (patch) | |
tree | 690198469b804e8ce2eb9791cf17ff9f655cf1e6 /docs/release/scripts/genie.lua | |
parent | 6c75c1ae77eec4c7350aed7e824fe19d6b38e8bc (diff) |
Release files for 0.227tag227
Diffstat (limited to 'docs/release/scripts/genie.lua')
-rw-r--r-- | docs/release/scripts/genie.lua | 81 |
1 files changed, 35 insertions, 46 deletions
diff --git a/docs/release/scripts/genie.lua b/docs/release/scripts/genie.lua index e02c29ec3e7..c479fe34bfd 100644 --- a/docs/release/scripts/genie.lua +++ b/docs/release/scripts/genie.lua @@ -14,7 +14,7 @@ newoption { premake.check_paths = true premake.make.override = { "TARGET" } -premake.xcode.parameters = { 'CLANG_CXX_LANGUAGE_STANDARD = "c++14"', 'CLANG_CXX_LIBRARY = "libc++"' } +premake.xcode.parameters = { 'CLANG_CXX_LANGUAGE_STANDARD = "c++17"', 'CLANG_CXX_LIBRARY = "libc++"' } MAME_DIR = (path.getabsolute("..") .. "/") --MAME_DIR = string.gsub(MAME_DIR, "(%s)", "\\%1") @@ -483,6 +483,9 @@ configuration { "vs20*" } buildoptions { "/bigobj", } + buildoptions_cpp { + "/std:c++17", + } flags { "ExtraWarnings", } @@ -678,14 +681,21 @@ else "LSB_FIRST", } if _OPTIONS["targetos"]=="macosx" then - configuration { "x64" } + configuration { "arm64" } + buildoptions { + "-arch arm64", + } + linkoptions { + "-arch arm64", + } + configuration { "x64", "not arm64" } buildoptions { "-arch x86_64", } linkoptions { "-arch x86_64", } - configuration { "x32" } + configuration { "x32", "not arm64" } buildoptions { "-arch i386", } @@ -753,23 +763,13 @@ end } local version = str_to_version(_OPTIONS["gcc_version"]) -if string.find(_OPTIONS["gcc"], "clang") and ((version < 30500) or (_OPTIONS["targetos"]=="macosx" and (version <= 60000))) then buildoptions_cpp { - "-std=c++1y", + "-std=c++17", } buildoptions_objcpp { - "-std=c++1y", - } -else - buildoptions_cpp { - "-std=c++14", + "-std=c++17", } - - buildoptions_objcpp { - "-std=c++14", - } -end -- this speeds it up a bit by piping between the preprocessor/compiler/assembler if not ("pnacl" == _OPTIONS["gcc"]) then buildoptions { @@ -996,11 +996,11 @@ end buildoptions { "-Wall", "-Wcast-align", - "-Wundef", "-Wformat-security", + "-Wundef", "-Wwrite-strings", - "-Wno-sign-compare", "-Wno-conversion", + "-Wno-sign-compare", "-Wno-error=deprecated-declarations", } -- warnings only applicable to C compiles @@ -1062,34 +1062,25 @@ end local version = str_to_version(_OPTIONS["gcc_version"]) if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "pnacl") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android") then - if (version < 50000) then - print("Clang version 5.0 or later needed") + if (version < 60000) then + print("Clang version 6.0 or later needed") os.exit(-1) end buildoptions { + "-fdiagnostics-show-note-include-stack", "-Wno-cast-align", - "-Wno-tautological-compare", - "-Wno-unused-value", "-Wno-constant-logical-operand", - "-fdiagnostics-show-note-include-stack", - "-Wno-unknown-warning-option", "-Wno-extern-c-compat", + "-Wno-ignored-qualifiers", + "-Wno-pragma-pack", -- clang 6.0 complains when the packing change lifetime is not contained within a header file. + "-Wno-tautological-compare", "-Wno-unknown-attributes", - "-Wno-ignored-qualifiers" + "-Wno-unknown-warning-option", + "-Wno-unused-value", } - if (version >= 60000) then - buildoptions { - "-Wno-pragma-pack" -- clang 6.0 complains when the packing change lifetime is not contained within a header file. - } - end if ((version >= 100000) and (_OPTIONS["targetos"] ~= 'macosx')) or (version >= 120000) then buildoptions { - "-Wno-xor-used-as-pow " -- clang 10.0 complains that expressions like 10 ^ 7 look like exponention - } - end - if (version < 60000) or ((_OPTIONS["targetos"] == "macosx") and (version <= 90000)) then - buildoptions { - "-Wno-missing-braces" -- std::array brace initialization not fixed until 6.0.0 (https://reviews.llvm.org/rC314838) + "-Wno-xor-used-as-pow", -- clang 10.0 complains that expressions like 10 ^ 7 look like exponention } end else @@ -1097,6 +1088,12 @@ end print("GCC version 7.0 or later needed") os.exit(-1) end + buildoptions_cpp { + "-Wimplicit-fallthrough", + } + buildoptions_objcpp { + "-Wimplicit-fallthrough", + } buildoptions { "-Wno-unused-result", -- needed for fgets,fread on linux -- array bounds checking seems to be buggy in 4.8.1 (try it on video/stvvdp1.c and video/model1.c without -Wno-array-bounds) @@ -1171,7 +1168,7 @@ configuration { "asmjs" } "-s USE_SDL_TTF=2", } buildoptions_cpp { - "-std=c++14", + "-std=c++17", "-s DISABLE_EXCEPTION_CATCHING=2", "-s EXCEPTION_CATCHING_WHITELIST=\"['_ZN15running_machine17start_all_devicesEv','_ZN12cli_frontend7executeEiPPc','_ZN8chd_file11open_commonEb','_ZN8chd_file13read_metadataEjjRNSt3__212basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE','_ZN8chd_file13read_metadataEjjRNSt3__26vectorIhNS0_9allocatorIhEEEE','_ZNK19netlist_mame_device19base_validity_checkER16validity_checker']\"", } @@ -1189,7 +1186,7 @@ configuration { "android*" } "-Wno-incompatible-ms-struct", } buildoptions_cpp { - "-std=c++14", + "-std=c++17", "-Wno-extern-c-compat", "-Wno-tautological-constant-out-of-range-compare", "-Wno-tautological-pointer-compare", @@ -1207,7 +1204,7 @@ configuration { "pnacl" } "-Wno-inline-new-delete", } buildoptions_cpp { - "-std=c++14", + "-std=c++17", } archivesplit_size "20" @@ -1291,14 +1288,6 @@ configuration { "mingw*" } "userenv", } -configuration { "mingw-clang" } - local version = str_to_version(_OPTIONS["gcc_version"]) - if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") and ((version < 30900)) then - linkoptions { - "-pthread", - } - end - configuration { "vsllvm" } defines { "XML_STATIC", |