diff options
Diffstat (limited to 'scripts/src/3rdparty.lua')
-rwxr-xr-x | scripts/src/3rdparty.lua | 155 |
1 files changed, 94 insertions, 61 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 64a8e3b7ab6..b08e847a9ae 100755 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -22,21 +22,24 @@ project "expat" -- fake out the enough of expat_config.h to get by -- could possibly add more defines here for specific targets defines { + "HAVE_CXX11", "HAVE_MEMMOVE", "HAVE_STDINT_H", + "HAVE_STDIO_H", "HAVE_STDLIB_H", "HAVE_STRING_H", "PACKAGE=\"expat\"", - "PACKAGE_BUGREPORT=\"expat-bugs@libexpat.org\"", + "PACKAGE_BUGREPORT=\"https://github.com/libexpat/libexpat/issues\"", "PACKAGE_NAME=\"expat\"", - "PACKAGE_STRING=\"expat 2.2.10\"", + "PACKAGE_STRING=\"expat-2.7.1\"", "PACKAGE_TARNAME=\"expat\"", "PACKAGE_URL=\"\"", - "PACKAGE_VERSION=\"2.2.10\"", + "PACKAGE_VERSION=\"2.7.1\"", "STDC_HEADERS", - "VERSION=\"2.2.10\"", + "VERSION=\"2.7.1\"", "XML_CONTEXT_BYTES=1024", "XML_DTD", + "XML_GE=1", "XML_NS", } if _OPTIONS["BIGENDIAN"]=="1" then @@ -49,6 +52,11 @@ else "BYTEORDER=1234", } end +if _OPTIONS["targetos"]=="windows" then + defines { + "__USE_MINGW_ANSI_STDIO=0", + } +end if _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="freebsd" then defines { "HAVE_ARC4RANDOM", @@ -88,7 +96,7 @@ if _OPTIONS["gcc"]~=nil then else buildoptions_c { - "-Wno-maybe-uninitialized", -- expat in GCC 11.1 + "-Wno-error=maybe-uninitialized", -- expat in GCC 11.1 } end end @@ -285,6 +293,7 @@ project "softfloat3" MAME_DIR .. "3rdparty/softfloat3/source", MAME_DIR .. "3rdparty/softfloat3/source/include", MAME_DIR .. "3rdparty/softfloat3/source/8086", + MAME_DIR .. "3rdparty/softfloat3/bochs_ext" } configuration { "gmake or ninja" } @@ -313,6 +322,11 @@ end "SOFTFLOAT_FAST_INT64" } +if _OPTIONS["BIGENDIAN"]~="1" then + defines { + "LITTLEENDIAN=1" + } +end files { MAME_DIR .. "3rdparty/softfloat3/source/s_eq128.c", MAME_DIR .. "3rdparty/softfloat3/source/s_le128.c", @@ -615,6 +629,13 @@ end MAME_DIR .. "3rdparty/softfloat3/source/f128M_eq_signaling.c", MAME_DIR .. "3rdparty/softfloat3/source/f128M_le_quiet.c", MAME_DIR .. "3rdparty/softfloat3/source/f128M_lt_quiet.c", + MAME_DIR .. "3rdparty/softfloat3/bochs_ext/f2xm1.c", + MAME_DIR .. "3rdparty/softfloat3/bochs_ext/fpatan.c", + MAME_DIR .. "3rdparty/softfloat3/bochs_ext/fprem.c", + MAME_DIR .. "3rdparty/softfloat3/bochs_ext/fsincos.c", + MAME_DIR .. "3rdparty/softfloat3/bochs_ext/fyl2x.c", + MAME_DIR .. "3rdparty/softfloat3/bochs_ext/poly.c", + MAME_DIR .. "3rdparty/softfloat3/bochs_ext/extF80_scale.c", } @@ -707,6 +728,7 @@ project "flac" configuration { "vs*" } buildoptions { + "/wd4057", -- warning C4057: 'operator': 'identifier1' differs in indirection to slightly different base types from 'identifier2' "/wd4127", -- warning C4127: conditional expression is constant "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter @@ -853,6 +875,7 @@ project "7z" configuration { "gmake or ninja" } buildoptions_c { "-Wno-error=undef", + "-Wno-error=strict-prototypes", } if _OPTIONS["gcc"]~=nil then if string.find(_OPTIONS["gcc"], "clang") then @@ -955,6 +978,7 @@ project "lua" configuration { "vs*" } buildoptions { + "/wd4101", -- warning C4101: 'identifier': unreferenced local variable "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data "/wd4702", -- warning C4702: unreachable code "/wd4310", -- warning C4310: cast truncates constant value @@ -1046,6 +1070,7 @@ project "lualibs" configuration { "vs*" } buildoptions { + "/wd4101", -- warning C4101: 'identifier': unreferenced local variable "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data "/wd4055", -- warning C4055: 'type cast': from data pointer 'void *' to function pointer 'xxx' "/wd4152", -- warning C4152: nonstandard extension, function/data pointer conversion in expression @@ -1163,14 +1188,16 @@ end defines { "PMALSA=1", } - configuration { } - if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") and str_to_version(_OPTIONS["gcc_version"]) >= 150000 then + configuration { "gmake or ninja" } buildoptions_c { - "-Wno-strict-prototypes", + "-Wno-unknown-pragmas", + "-Wno-unused-but-set-variable", + "-Wno-unused-function", + "-Wno-unused-variable", } - end + configuration { } files { MAME_DIR .. "3rdparty/portmidi/pm_common/portmidi.c", @@ -1207,7 +1234,6 @@ end MAME_DIR .. "3rdparty/portmidi/pm_mac/pmmacosxcm.c", MAME_DIR .. "3rdparty/portmidi/pm_mac/finddefault.c", MAME_DIR .. "3rdparty/portmidi/pm_mac/readbinaryplist.c", - MAME_DIR .. "3rdparty/portmidi/pm_mac/osxsupport.m", MAME_DIR .. "3rdparty/portmidi/porttime/ptmacosx_mach.c", } end @@ -1370,12 +1396,24 @@ project "bimg" "BX_CONFIG_DEBUG=0", } - configuration { "x64", "mingw*", "not arm64" } - defines { - "ASTCENC_AVX=0", - "ASTCENC_SSE=20", - } - configuration { } + if _OPTIONS["gcc"]~=nil and not string.find(_OPTIONS["gcc"], "clang") then + -- This is a gross hack. For some reason GitHub Actions MinGW GCC seems to define SSE feature macros for features that are not enabled. + local archopts = (_OPTIONS["ARCHOPTS"] or "") .. " " .. (_OPTIONS["ARCHOPTS_CXX"] or "") + local ssever = "20" + if string.find(archopts, "-msse4.2") then + ssever = "42" + elseif string.find(archopts, "-msse4.1") then + ssever = "41" + elseif string.find(archopts, "-msse3") then + ssever = "30" + end + configuration { "x64", "mingw*", "not arm64" } + defines { + "ASTCENC_AVX=0", + "ASTCENC_SSE=" .. ssever, + } + configuration { } + end configuration { "x32" } defines { @@ -1486,7 +1524,7 @@ end MAME_DIR .. "3rdparty/bx/include/compat/freebsd", } - configuration { "linux*" } + configuration { "linux*", "not mingw*" } includedirs { MAME_DIR .. "3rdparty/bgfx/3rdparty/directx-headers/include/wsl/stubs", MAME_DIR .. "3rdparty/bx/include/compat/linux", @@ -1498,6 +1536,7 @@ end "-Wno-unused-but-set-variable", "-Wno-unused-function", "-Wno-unused-variable", + "-Wno-tautological-compare", } configuration { } @@ -1558,13 +1597,8 @@ end defines { "WL_EGL_PLATFORM=1", } - end - end - - if _OPTIONS["targetos"]=="macosx" and _OPTIONS["gcc"]~=nil then - if string.find(_OPTIONS["gcc"], "clang") and (version < 80000) then - defines { - "TARGET_OS_OSX=1", + buildoptions { + backtick(pkgconfigcmd() .. " --cflags wayland-egl-backend"), } end end @@ -1913,7 +1947,7 @@ project "ymfm" -- asmjit library -------------------------------------------------- -if not _OPTIONS["FORCE_DRC_C_BACKEND"] then +if (not _OPTIONS["FORCE_DRC_C_BACKEND"]) and ((_OPTIONS["PLATFORM"] == "x86") or (_OPTIONS["PLATFORM"] == "arm64")) then project "asmjit" uuid "4539757c-6e99-4bae-b3d0-b342a7c49539" kind "StaticLib" @@ -1926,23 +1960,13 @@ project "asmjit" end configuration { } - - if _OPTIONS["targetos"]=="macosx" and _OPTIONS["gcc"]~=nil then - if string.find(_OPTIONS["gcc"], "clang") and (version < 80000) then - defines { - "TARGET_OS_OSX=1", - } - end - end + defines { + "ASMJIT_STATIC", + } files { MAME_DIR .. "3rdparty/asmjit/src/asmjit/a64.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/asmjit-scope-begin.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/asmjit-scope-end.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/asmjit.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/core.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64archtraits_p.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64assembler.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64assembler.h", @@ -1950,28 +1974,32 @@ project "asmjit" MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64builder.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64compiler.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64compiler.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64emithelper.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64emithelper_p.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64emithelper.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64emitter.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64formatter.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64formatter_p.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64func.cpp", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64formatter.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64func_p.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64func.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64globals.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64instapi.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64instapi_p.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64instapi.cpp", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64instdb_p.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64instdb.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64instdb.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64instdb_p.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64operand.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64operand.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64rapass.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64rapass_p.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64utils.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/armformatter.cpp", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/a64rapass.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/armformatter_p.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/armformatter.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/armglobals.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/armoperand.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/arm/armutils.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/asmjit-scope-begin.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/asmjit-scope-end.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/asmjit.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/core.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/api-build_p.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/api-config.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/archcommons.h", @@ -1979,13 +2007,14 @@ project "asmjit" MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/archtraits.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/assembler.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/assembler.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/builder_p.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/builder.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/builder.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/codebuffer.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/codeholder.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/codeholder.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/codewriter.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/codewriter_p.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/codewriter.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/compiler.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/compiler.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/compilerdefs.h", @@ -1993,27 +2022,29 @@ project "asmjit" MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/constpool.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/cpuinfo.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/cpuinfo.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emithelper.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emithelper_p.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emithelper.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emitter.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emitter.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emitterutils.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emitterutils_p.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/emitterutils.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/environment.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/environment.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/errorhandler.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/errorhandler.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/formatter_p.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/formatter.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/formatter.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/formatter_p.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/func.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/func.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/funcargscontext.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/funcargscontext_p.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/funcargscontext.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/globals.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/globals.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/inst.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/inst.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/instdb_p.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/instdb.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/jitallocator.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/jitallocator.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/jitruntime.cpp", @@ -2023,20 +2054,21 @@ project "asmjit" MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/misc_p.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/operand.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/operand.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/osutils_p.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/osutils.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/osutils.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/osutils_p.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/raassignment_p.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/rabuilders_p.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/radefs_p.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/ralocal.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/ralocal_p.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/rapass.cpp", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/ralocal.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/rapass_p.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/rastack.cpp", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/rapass.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/rastack_p.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/rastack.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/string.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/string.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/support_p.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/support.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/support.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/target.cpp", @@ -2058,6 +2090,7 @@ project "asmjit" MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/zonetree.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/zonevector.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/core/zonevector.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86archtraits_p.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86assembler.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86assembler.h", @@ -2065,23 +2098,23 @@ project "asmjit" MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86builder.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86compiler.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86compiler.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86emithelper.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86emithelper_p.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86emithelper.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86emitter.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86formatter.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86formatter_p.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86func.cpp", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86formatter.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86func_p.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86func.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86globals.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86instapi.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86instapi_p.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86instapi.cpp", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86instdb_p.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86instdb.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86instdb.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86instdb_p.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86opcode_p.h", MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86operand.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86operand.h", - MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86rapass.cpp", MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86rapass_p.h", + MAME_DIR .. "3rdparty/asmjit/src/asmjit/x86/x86rapass.cpp", } end |