From d256f069a5aa30bf5ffcfc4b73047ce0f372ea10 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Thu, 15 Oct 2020 04:28:42 +1100 Subject: -3rdparty/expat: Update to 2.2.10." -Fixed tiny build (missing s11c_bg_device) and unused lambda capture in emu/rendlay.cpp. --- scripts/src/3rdparty.lua | 23 +++++++++++++++++++++-- scripts/target/mame/tiny.lua | 10 ++++++---- 2 files changed, 27 insertions(+), 6 deletions(-) (limited to 'scripts') diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 5056334b79e..27383c3a8ed 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -19,18 +19,21 @@ project "expat" kind "StaticLib" -- fake out the enough of expat_config.h to get by + -- could possibly add more defines here for specific targets defines { "HAVE_MEMMOVE", "HAVE_STDINT_H", "HAVE_STDLIB_H", "HAVE_STRING_H", + "PACKAGE=\"expat\"", "PACKAGE_BUGREPORT=\"expat-bugs@libexpat.org\"", "PACKAGE_NAME=\"expat\"", - "PACKAGE_STRING=\"expat 2.1.1\"", + "PACKAGE_STRING=\"expat 2.2.10\"", "PACKAGE_TARNAME=\"expat\"", "PACKAGE_URL=\"\"", - "PACKAGE_VERSION=\"2.1.1\"", + "PACKAGE_VERSION=\"2.2.10\"", "STDC_HEADERS", + "VERSION=\"2.2.10\"", "XML_CONTEXT_BYTES=1024", "XML_DTD", "XML_NS", @@ -45,6 +48,22 @@ else "BYTEORDER=1234", } end +if _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="freebsd" then + defines { + "HAVE_ARC4RANDOM", + } +end +if BASE_TARGETOS=="unix" then + defines { + "HAVE_DLFCN_H", + "HAVE_FCNTL_H", + "HAVE_MMAP", + "HAVE_SYS_STAT_H", + "HAVE_SYS_TYPES_H", + "HAVE_UNISTD_H", + "XML_DEV_URANDOM", + } +end configuration { "vs*" } buildoptions { diff --git a/scripts/target/mame/tiny.lua b/scripts/target/mame/tiny.lua index e02b47c4198..89d3e36284f 100644 --- a/scripts/target/mame/tiny.lua +++ b/scripts/target/mame/tiny.lua @@ -108,15 +108,15 @@ function createProjects_mame_tiny(_target, _subtarget) } files{ - MAME_DIR .. "src/mame/audio/nl_carpolo.h", MAME_DIR .. "src/mame/audio/nl_carpolo.cpp", + MAME_DIR .. "src/mame/audio/nl_carpolo.h", MAME_DIR .. "src/mame/drivers/carpolo.cpp", MAME_DIR .. "src/mame/includes/carpolo.h", MAME_DIR .. "src/mame/machine/carpolo.cpp", MAME_DIR .. "src/mame/video/carpolo.cpp", + MAME_DIR .. "src/mame/audio/circus.cpp", MAME_DIR .. "src/mame/drivers/circus.cpp", MAME_DIR .. "src/mame/includes/circus.h", - MAME_DIR .. "src/mame/audio/circus.cpp", MAME_DIR .. "src/mame/video/circus.cpp", MAME_DIR .. "src/mame/drivers/exidy.cpp", MAME_DIR .. "src/mame/includes/exidy.h", @@ -147,11 +147,13 @@ files{ MAME_DIR .. "src/mame/includes/gridlee.h", MAME_DIR .. "src/mame/audio/gridlee.cpp", MAME_DIR .. "src/mame/video/gridlee.cpp", + MAME_DIR .. "src/mame/audio/s11c_bg.cpp", + MAME_DIR .. "src/mame/audio/s11c_bg.h", + MAME_DIR .. "src/mame/audio/williams.cpp", + MAME_DIR .. "src/mame/audio/williams.h", MAME_DIR .. "src/mame/drivers/williams.cpp", MAME_DIR .. "src/mame/includes/williams.h", MAME_DIR .. "src/mame/machine/williams.cpp", - MAME_DIR .. "src/mame/audio/williams.cpp", - MAME_DIR .. "src/mame/audio/williams.h", MAME_DIR .. "src/mame/video/williams.cpp", MAME_DIR .. "src/mame/drivers/gaelco.cpp", MAME_DIR .. "src/mame/includes/gaelco.h", -- cgit v1.2.3-70-g09d2