Index: head/emulators/mame/Makefile =================================================================== --- head/emulators/mame/Makefile (revision 500512) +++ head/emulators/mame/Makefile (revision 500513) @@ -1,123 +1,125 @@ # Created by: alepulver # $FreeBSD$ PORTNAME?= mame -PORTVERSION= 0.200 -PORTREVISION= 3 +PORTVERSION= 0.209 CATEGORIES= emulators MAINTAINER= ports@FreeBSD.org COMMENT= Multi Arcade Machine Emulator LICENSE= GPLv2 ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= not yet ported to any arch other than x86 LIB_DEPENDS= libFLAC.so:audio/flac \ libexpat.so:textproc/expat2 \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 RUN_DEPENDS= liberation-fonts-ttf>=0:x11-fonts/liberation-fonts-ttf -USES= compiler:c++14-lang gmake jpeg pkgconfig python:2.7,build qt:5 shebangfix +USES= compiler:c++14-lang gl gmake jpeg pkgconfig \ + python:2.7,build qt:5 sdl shebangfix USE_GITHUB= yes GH_ACCOUNT= mamedev GH_PROJECT= mame # explicit (master port) GH_TAGNAME= mame${PORTVERSION:S/.//} OPTIONS_DEFINE= DEBUG DOCS EXAMPLES SHEBANG_FILES= src/devices/cpu/m6502/m6502make.py \ src/devices/cpu/m6809/m6809make.py \ src/devices/cpu/mcs96/mcs96make.py \ src/devices/cpu/tms57002/tmsmake.py USE_XORG= x11 xext xi xinerama xrender USE_GL= gl USE_SDL= sdl2 ttf2 USE_QT= buildtools core gui qmake_build widgets MTARGET?= mame MSUBTARGET?= mame CFLAGS+= -I${LOCALBASE}/include MAKE_ENV= NOWERROR=1 USE_NETWORK=1 \ LD="${CXX}" PYTHON="${PYTHON_CMD}" \ OPT_FLAGS="${CXXFLAGS}" GCC_LDFLAGS="${LDFLAGS}" \ TARGET="${MTARGET}" SUBTARGET="${MSUBTARGET}" FULLNAME="mame" SDL_NETWORK="pcap" MAKE_ARGS= TARGETOS=freebsd VERBOSE=1 TOOLS=1 MAKEFILE= makefile GENIE= ${WRKSRC}/3rdparty/genie PORTDOCS= * PORTEXAMPLES= ${MSUBTARGET}.ini SUB_FILES= pkg-message target.ini SUB_LIST= MTARGET=${MTARGET} MSUBTARGET=${MSUBTARGET} DEBUG_MAKE_ENV= DEBUG=1 .include .if ${ARCH} == amd64 MAKE_ARGS+= PTR64=1 EMULATOR= ${MSUBTARGET}64 .else EMULATOR= ${MSUBTARGET} .endif PLIST_SUB+= EMULATOR=${EMULATOR} post-patch: @${RM} ${WRKSRC}/3rdparty/bx/include/compat/freebsd/dirent.h @${RM} ${WRKSRC}/3rdparty/bx/include/compat/freebsd/signal.h @${MV} ${GENIE}/build/gmake.freebsd ${GENIE}/build/gmake.bsd @${REINPLACE_CMD} -e \ 's|^\(CC \)|#\1| ; \ s|^\(CXX \)|#\1| ; \ s|^\(CXX:\)|#\1| ; \ s|^\(LD \)|#\1| ; \ s|^\(PYTHON \)|#\1| ; \ s| .(ARCH)|| ; \ s|FreeBSD|${OPSYS}|g' \ ${WRKSRC}/makefile \ ${WRKSRC}/src/devices/cpu/m68000/makefile \ ${GENIE}/build/gmake.bsd/genie.make @${REINPLACE_CMD} -e 's|gcc|cc|; s|g++|c++|' \ ${GENIE}/src/tools/gcc.lua \ ${GENIE}/src/tools/snc.lua \ ${GENIE}/tests/test_gmake_cpp.lua @${REINPLACE_CMD} -e 's|= \"gcc|= \"cc|; s|= \"g++|= \"c++|' \ -e "s|'CXX =|'#CXX =|; s|'CC =|'#CC =|; s| .(ARCH)| |g" \ ${GENIE}/src/host/scripts.c # we can't fix two types of python shebangs, so do these manually @${REINPLACE_CMD} -i "" -e "s|/usr/bin/env python|${PYTHON_CMD}|" \ ${WRKSRC}/scripts/build/png*.py @${REINPLACE_CMD} -e 's|"python"|"${PYTHON_CMD}"|' \ ${WRKSRC}/scripts/genie.lua @${GREP} -rl '"png.h"' ${WRKSRC}/src | ${XARGS} ${REINPLACE_CMD} \ -e 's|"png.h"|"localpng.h"|' + @${REINPLACE_CMD} -e 's|"util/png.h"|"util/localpng.h"|' \ + ${WRKSRC}/src/frontend/mame/ui/icorender.cpp @${MV} ${WRKSRC}/src/lib/util/png.h ${WRKSRC}/src/lib/util/localpng.h do-install: @${MKDIR} ${STAGEDIR}${DATADIR} \ ${STAGEDIR}${DOCSDIR} \ ${STAGEDIR}${EXAMPLESDIR} \ ${STAGEDIR}${PREFIX}/libexec/${MSUBTARGET} ${INSTALL_PROGRAM} ${WRKSRC}/${EMULATOR} ${STAGEDIR}${PREFIX}/bin .if ${MSUBTARGET:Mmame} (cd ${WRKSRC} && \ ${INSTALL_PROGRAM} chdman jedutil ldresample ldverify \ romcmp unidasm \ ${STAGEDIR}${PREFIX}/libexec/mame) .endif .if ${MSUBTARGET:Mmess} (cd ${WRKSRC} && ${INSTALL_PROGRAM} castool chdman floptool imgtool jedutil \ ldresample ldverify nltool nlwav pngcmp regrep romcmp split src2html \ srcclean unidasm \ ${STAGEDIR}${PREFIX}/libexec/mess) .endif (cd ${WRKSRC} && ${COPYTREE_SHARE} artwork ${STAGEDIR}${DATADIR}) (cd ${WRKSRC} && ${COPYTREE_SHARE} hash ${STAGEDIR}${DATADIR}) (cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR}) ${INSTALL_DATA} ${WRKDIR}/target.ini \ ${STAGEDIR}${EXAMPLESDIR}/${MSUBTARGET}.ini .include Index: head/emulators/mame/distinfo =================================================================== --- head/emulators/mame/distinfo (revision 500512) +++ head/emulators/mame/distinfo (revision 500513) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533314360 -SHA256 (mamedev-mame-0.200-mame0200_GH0.tar.gz) = a6c43323e120f55b32c072726bdda357aa221a599070989b6e3406ee4e3983fe -SIZE (mamedev-mame-0.200-mame0200_GH0.tar.gz) = 127378126 +TIMESTAMP = 1556369525 +SHA256 (mamedev-mame-0.209-mame0209_GH0.tar.gz) = 9442e88bd87cfe407eb093a2ecb42a3850cabe31cd52c4efdef1bf7f584a8eab +SIZE (mamedev-mame-0.209-mame0209_GH0.tar.gz) = 146403114 Index: head/emulators/mame/files/patch-src__osd__eminline.h =================================================================== --- head/emulators/mame/files/patch-src__osd__eminline.h (revision 500512) +++ head/emulators/mame/files/patch-src__osd__eminline.h (nonexistent) @@ -1,11 +0,0 @@ ---- src/osd/eminline.h.orig 2018-02-27 15:59:06 UTC -+++ src/osd/eminline.h -@@ -21,7 +21,7 @@ - - #if defined(__GNUC__) - --#if defined(__i386__) || defined(__x86_64__) -+#if defined(__i386__) || defined(__x86_64__) || defined(__amd64__) - #include "eigccx86.h" - #elif defined(__ppc__) || defined (__PPC__) || defined(__ppc64__) || defined(__PPC64__) - #include "eigccppc.h" Property changes on: head/emulators/mame/files/patch-src__osd__eminline.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/mame/files/patch-scripts_toolchain.lua =================================================================== --- head/emulators/mame/files/patch-scripts_toolchain.lua (revision 500512) +++ head/emulators/mame/files/patch-scripts_toolchain.lua (nonexistent) @@ -1,21 +0,0 @@ ---- scripts/toolchain.lua.orig 2018-02-27 15:59:06 UTC -+++ scripts/toolchain.lua -@@ -23,6 +23,7 @@ newoption { - { "android-x64", "Android - x64" }, - { "asmjs", "Emscripten/asm.js" }, - { "freebsd", "FreeBSD" }, -+ { "freebsd-clang", "FreeBSD (Clang)" }, - { "linux-gcc", "Linux (GCC compiler)" }, - { "linux-clang", "Linux (Clang compiler)" }, - { "ios-arm", "iOS - ARM" }, -@@ -168,6 +169,10 @@ function toolchain(_buildDir, _subDir) - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-freebsd") - end - -+ if "freebsd-clang" == _OPTIONS["gcc"] then -+ location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-freebsd-clang") -+ end -+ - if "netbsd" == _OPTIONS["gcc"] then - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-netbsd") - end Property changes on: head/emulators/mame/files/patch-scripts_toolchain.lua ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/mame/files/patch-src__osd__eigccx86.h =================================================================== --- head/emulators/mame/files/patch-src__osd__eigccx86.h (revision 500512) +++ head/emulators/mame/files/patch-src__osd__eigccx86.h (nonexistent) @@ -1,110 +0,0 @@ ---- src/osd/eigccx86.h.orig 2018-02-27 15:59:06 UTC -+++ src/osd/eigccx86.h -@@ -31,7 +31,7 @@ - multiply and return the full 64 bit result - -------------------------------------------------*/ - --#ifndef __x86_64__ -+#if !defined(__amd64__) && !defined(__x86_64__) - #define mul_32x32 _mul_32x32 - inline int64_t ATTR_CONST ATTR_FORCE_INLINE - _mul_32x32(int32_t a, int32_t b) -@@ -55,7 +55,7 @@ _mul_32x32(int32_t a, int32_t b) - result - -------------------------------------------------*/ - --#ifndef __x86_64__ -+#if !defined(__amd64__) && !defined(__x86_64__) - #define mulu_32x32 _mulu_32x32 - inline uint64_t ATTR_CONST ATTR_FORCE_INLINE - _mulu_32x32(uint32_t a, uint32_t b) -@@ -126,7 +126,7 @@ _mulu_32x32_hi(uint32_t a, uint32_t b) - result to 32 bits - -------------------------------------------------*/ - --#ifndef __x86_64__ -+#if !defined(__amd64__) && !defined(__x86_64__) - #define mul_32x32_shift _mul_32x32_shift - inline int32_t ATTR_CONST ATTR_FORCE_INLINE - _mul_32x32_shift(int32_t a, int32_t b, uint8_t shift) -@@ -156,7 +156,7 @@ _mul_32x32_shift(int32_t a, int32_t b, u - result to 32 bits - -------------------------------------------------*/ - --#ifndef __x86_64__ -+#if !defined(__amd64__) && !defined(__x86_64__) - #define mulu_32x32_shift _mulu_32x32_shift - inline uint32_t ATTR_CONST ATTR_FORCE_INLINE - _mulu_32x32_shift(uint32_t a, uint32_t b, uint8_t shift) -@@ -184,7 +184,7 @@ _mulu_32x32_shift(uint32_t a, uint32_t b - divide and return the 32 bit quotient - -------------------------------------------------*/ - --#ifndef __x86_64__ -+#if !defined(__amd64__) && !defined(__x86_64__) - #define div_64x32 _div_64x32 - inline int32_t ATTR_CONST ATTR_FORCE_INLINE - _div_64x32(int64_t a, int32_t b) -@@ -211,7 +211,7 @@ _div_64x32(int64_t a, int32_t b) - divide and return the 32 bit quotient - -------------------------------------------------*/ - --#ifndef __x86_64__ -+#if !defined(__amd64__) && !defined(__x86_64__) - #define divu_64x32 _divu_64x32 - inline uint32_t ATTR_CONST ATTR_FORCE_INLINE - _divu_64x32(uint64_t a, uint32_t b) -@@ -244,7 +244,7 @@ inline int32_t ATTR_FORCE_INLINE - _div_64x32_rem(int64_t dividend, int32_t divisor, int32_t *remainder) - { - int32_t quotient; --#ifndef __x86_64__ -+#if !defined(__amd64__) && !defined(__x86_64__) - - // Throws arithmetic exception if result doesn't fit in 32 bits - __asm__ ( -@@ -287,7 +287,7 @@ inline uint32_t ATTR_FORCE_INLINE - _divu_64x32_rem(uint64_t dividend, uint32_t divisor, uint32_t *remainder) - { - uint32_t quotient; --#ifndef __x86_64__ -+#if !defined(__amd64__) && !defined(__x86_64__) - - // Throws arithmetic exception if result doesn't fit in 32 bits - __asm__ ( -@@ -325,7 +325,7 @@ _divu_64x32_rem(uint64_t dividend, uint3 - division, and returning the 32 bit quotient - -------------------------------------------------*/ - --#ifndef __x86_64__ -+#if !defined(__amd64__) && !defined(__x86_64__) - #define div_32x32_shift _div_32x32_shift - inline int32_t ATTR_CONST ATTR_FORCE_INLINE - _div_32x32_shift(int32_t a, int32_t b, uint8_t shift) -@@ -357,7 +357,7 @@ _div_32x32_shift(int32_t a, int32_t b, u - division, and returning the 32 bit quotient - -------------------------------------------------*/ - --#ifndef __x86_64__ -+#if !defined(__amd64__) && !defined(__x86_64__) - #define divu_32x32_shift _divu_32x32_shift - inline uint32_t ATTR_CONST ATTR_FORCE_INLINE - _divu_32x32_shift(uint32_t a, uint32_t b, uint8_t shift) -@@ -388,7 +388,7 @@ _divu_32x32_shift(uint32_t a, uint32_t b - divide and return the 32 bit remainder - -------------------------------------------------*/ - --#ifndef __x86_64__ -+#if !defined(__amd64__) && !defined(__x86_64__) - #define mod_64x32 _mod_64x32 - inline int32_t ATTR_CONST ATTR_FORCE_INLINE - _mod_64x32(int64_t a, int32_t b) -@@ -415,7 +415,7 @@ _mod_64x32(int64_t a, int32_t b) - divide and return the 32 bit remainder - -------------------------------------------------*/ - --#ifndef __x86_64__ -+#if !defined(__amd64__) && !defined(__x86_64__) - #define modu_64x32 _modu_64x32 - inline uint32_t ATTR_CONST ATTR_FORCE_INLINE - _modu_64x32(uint64_t a, uint32_t b) Property changes on: head/emulators/mame/files/patch-src__osd__eigccx86.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/mame/files/patch-asio-libc++7 =================================================================== --- head/emulators/mame/files/patch-asio-libc++7 (revision 500512) +++ head/emulators/mame/files/patch-asio-libc++7 (nonexistent) @@ -1,15 +0,0 @@ -https://github.com/boostorg/asio/commit/b5b17a67f0aa29f5156324d5e8a73dd8669a5a51 - ---- 3rdparty/asio/include/asio/detail/config.hpp.orig 2018-07-24 19:45:05 UTC -+++ 3rdparty/asio/include/asio/detail/config.hpp -@@ -708,8 +708,9 @@ - # if !defined(ASIO_DISABLE_STD_STRING_VIEW) - # if defined(__clang__) - # if (__cplusplus >= 201103) --# if __has_include() -+# if __has_include() - # define ASIO_HAS_STD_STRING_VIEW 1 -+# elif __has_include() - # define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1 - # endif // __has_include() - # endif // (__cplusplus >= 201103) Property changes on: head/emulators/mame/files/patch-asio-libc++7 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/mame/files/patch-src_lib_netlist_plib_pparser.cpp =================================================================== --- head/emulators/mame/files/patch-src_lib_netlist_plib_pparser.cpp (revision 500512) +++ head/emulators/mame/files/patch-src_lib_netlist_plib_pparser.cpp (nonexistent) @@ -1,102 +0,0 @@ ---- src/lib/netlist/plib/pparser.cpp.orig 2018-02-27 15:59:06 UTC -+++ src/lib/netlist/plib/pparser.cpp -@@ -34,22 +34,22 @@ pstring ptokenizer::currentline_str() - - void ptokenizer::skipeol() - { -- pstring::code_t c = getc(); -+ pstring::code_t c = mame_getc(); - while (c) - { - if (c == 10) - { -- c = getc(); -+ c = mame_getc(); - if (c != 13) -- ungetc(c); -+ mame_ungetc(c); - return; - } -- c = getc(); -+ c = mame_getc(); - } - } - - --pstring::code_t ptokenizer::getc() -+pstring::code_t ptokenizer::mame_getc() - { - if (m_unget != 0) - { -@@ -70,7 +70,7 @@ pstring::code_t ptokenizer::getc() - return c; - } - --void ptokenizer::ungetc(pstring::code_t c) -+void ptokenizer::mame_ungetc(pstring::code_t c) - { - m_unget = c; - } -@@ -182,10 +182,10 @@ ptokenizer::token_t ptokenizer::get_toke - ptokenizer::token_t ptokenizer::get_token_internal() - { - /* skip ws */ -- pstring::code_t c = getc(); -+ pstring::code_t c = mame_getc(); - while (m_whitespace.find(c) != pstring::npos) - { -- c = getc(); -+ c = mame_getc(); - if (eof()) - { - return token_t(ENDOFFILE); -@@ -205,9 +205,9 @@ ptokenizer::token_t ptokenizer::get_toke - else if (m_number_chars.find(c) == pstring::npos) - break; - tokstr += c; -- c = getc(); -+ c = mame_getc(); - } -- ungetc(c); -+ mame_ungetc(c); - return token_t(ret, tokstr); - } - else if (m_identifier_chars.find(c) != pstring::npos) -@@ -217,9 +217,9 @@ ptokenizer::token_t ptokenizer::get_toke - while (m_identifier_chars.find(c) != pstring::npos) - { - tokstr += c; -- c = getc(); -+ c = mame_getc(); - } -- ungetc(c); -+ mame_ungetc(c); - auto id = m_tokens.find(tokstr); - if (id != m_tokens.end()) - return token_t(id->second, tokstr); -@@ -229,11 +229,11 @@ ptokenizer::token_t ptokenizer::get_toke - else if (c == m_string) - { - pstring tokstr = ""; -- c = getc(); -+ c = mame_getc(); - while (c != m_string) - { - tokstr += c; -- c = getc(); -+ c = mame_getc(); - } - return token_t(STRING, tokstr); - } -@@ -251,9 +251,9 @@ ptokenizer::token_t ptokenizer::get_toke - if (id != m_tokens.end()) - return token_t(id->second, tokstr); - } -- c = getc(); -+ c = mame_getc(); - } -- ungetc(c); -+ mame_ungetc(c); - auto id = m_tokens.find(tokstr); - if (id != m_tokens.end()) - return token_t(id->second, tokstr); Property changes on: head/emulators/mame/files/patch-src_lib_netlist_plib_pparser.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/mame/files/patch-src_lib_netlist_plib_pparser.h =================================================================== --- head/emulators/mame/files/patch-src_lib_netlist_plib_pparser.h (revision 500512) +++ head/emulators/mame/files/patch-src_lib_netlist_plib_pparser.h (nonexistent) @@ -1,13 +0,0 @@ ---- src/lib/netlist/plib/pparser.h.orig 2018-02-27 15:59:06 UTC -+++ src/lib/netlist/plib/pparser.h -@@ -118,8 +118,8 @@ protected: - private: - void skipeol(); - -- pstring::code_t getc(); -- void ungetc(pstring::code_t c); -+ pstring::code_t mame_getc(); -+ void mame_ungetc(pstring::code_t c); - - bool eof() { return m_strm.eof(); } - Property changes on: head/emulators/mame/files/patch-src_lib_netlist_plib_pparser.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/mame/files/patch-3rdparty_asio_include_asio_detail_config.hpp =================================================================== --- head/emulators/mame/files/patch-3rdparty_asio_include_asio_detail_config.hpp (nonexistent) +++ head/emulators/mame/files/patch-3rdparty_asio_include_asio_detail_config.hpp (revision 500513) @@ -0,0 +1,18 @@ +--- 3rdparty/asio/include/asio/detail/config.hpp.orig 2019-04-24 05:00:38 UTC ++++ 3rdparty/asio/include/asio/detail/config.hpp +@@ -713,14 +713,12 @@ + # define ASIO_HAS_STD_STRING_VIEW 1 + # endif + # endif +-# if !defined(ASIO_HAS_STD_STRING_VIEW) && __has_include() ++# if !defined(ASIO_HAS_STD_STRING_VIEW) && __has_include() + # define ASIO_HAS_STD_STRING_VIEW 1 + # if defined(__APPLE__) + # if ((__clang_major__ < 10) || ((__clang_major__ == 10) && (__clang_minor__ == 0) && (__clang_patchlevel__ < 1))) + # define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1 + # endif // clang < 10.0.1 +-# else // for non-Xcode Clang +-# define ASIO_HAS_STD_EXPERIMENTAL_STRING_VIEW 1 + # endif + # endif // __has_include() + # endif // (__cplusplus >= 201103) Property changes on: head/emulators/mame/files/patch-3rdparty_asio_include_asio_detail_config.hpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/mame/files/patch-3rdparty_bx_include_bx_platform.h =================================================================== --- head/emulators/mame/files/patch-3rdparty_bx_include_bx_platform.h (revision 500512) +++ head/emulators/mame/files/patch-3rdparty_bx_include_bx_platform.h (revision 500513) @@ -1,39 +1,39 @@ ---- 3rdparty/bx/include/bx/platform.h.orig 2018-02-27 15:59:06 UTC +--- 3rdparty/bx/include/bx/platform.h.orig 2019-04-24 05:00:38 UTC +++ 3rdparty/bx/include/bx/platform.h @@ -35,6 +35,7 @@ #define BX_CRT_MINGW 0 #define BX_CRT_MSVC 0 #define BX_CRT_NEWLIB 0 +#define BX_CRT_BSD 0 #ifndef BX_CRT_MUSL # define BX_CRT_MUSL 0 -@@ -236,6 +237,9 @@ +@@ -232,6 +233,9 @@ # elif defined(__apple_build_version__) || defined(__ORBIS__) || defined(__EMSCRIPTEN__) || defined(__llvm__) # undef BX_CRT_LIBCXX # define BX_CRT_LIBCXX 1 +# elif BX_PLATFORM_BSD +# undef BX_CRT_BSD +# define BX_CRT_BSD 1 # endif // # if !BX_CRT_BIONIC \ -@@ -244,7 +248,8 @@ +@@ -240,7 +244,8 @@ && !BX_CRT_MINGW \ && !BX_CRT_MSVC \ && !BX_CRT_MUSL \ - && !BX_CRT_NEWLIB + && !BX_CRT_NEWLIB \ + && !BX_CRT_BSD # undef BX_CRT_NONE # define BX_CRT_NONE 1 # endif // BX_CRT_* -@@ -379,6 +384,8 @@ +@@ -371,6 +376,8 @@ # define BX_CRT_NAME "Newlib" #elif BX_CRT_MUSL # define BX_CRT_NAME "musl libc" +#elif BX_CRT_BSD +# define BX_CRT_NAME "BSD" #elif BX_CRT_NONE # define BX_CRT_NAME "None" #else Index: head/emulators/mame/files/patch-3rdparty_bx_src_mutex.cpp =================================================================== --- head/emulators/mame/files/patch-3rdparty_bx_src_mutex.cpp (revision 500512) +++ head/emulators/mame/files/patch-3rdparty_bx_src_mutex.cpp (revision 500513) @@ -1,10 +1,10 @@ ---- 3rdparty/bx/src/mutex.cpp.orig 2018-02-27 15:59:06 UTC +--- 3rdparty/bx/src/mutex.cpp.orig 2019-04-24 05:00:38 UTC +++ 3rdparty/bx/src/mutex.cpp -@@ -13,6 +13,7 @@ +@@ -16,6 +16,7 @@ || BX_PLATFORM_IOS \ || BX_PLATFORM_OSX \ || BX_PLATFORM_PS4 \ + || BX_PLATFORM_BSD \ || BX_PLATFORM_RPI # include #elif BX_PLATFORM_WINDOWS \ Index: head/emulators/mame/files/patch-3rdparty_bx_src_thread.cpp =================================================================== --- head/emulators/mame/files/patch-3rdparty_bx_src_thread.cpp (revision 500512) +++ head/emulators/mame/files/patch-3rdparty_bx_src_thread.cpp (revision 500513) @@ -1,10 +1,10 @@ ---- 3rdparty/bx/src/thread.cpp.orig 2018-02-27 15:59:06 UTC +--- 3rdparty/bx/src/thread.cpp.orig 2019-04-24 05:00:38 UTC +++ 3rdparty/bx/src/thread.cpp -@@ -11,6 +11,7 @@ +@@ -15,6 +15,7 @@ || BX_PLATFORM_IOS \ || BX_PLATFORM_OSX \ || BX_PLATFORM_PS4 \ + || BX_PLATFORM_BSD \ || BX_PLATFORM_RPI # include # if defined(__FreeBSD__) Index: head/emulators/mame/files/patch-makefile =================================================================== --- head/emulators/mame/files/patch-makefile (revision 500512) +++ head/emulators/mame/files/patch-makefile (revision 500513) @@ -1,50 +1,92 @@ ---- makefile.orig 2018-02-27 15:59:06 UTC +--- makefile.orig 2019-04-24 05:00:38 UTC +++ makefile -@@ -183,19 +183,19 @@ GENIEOS := solaris +@@ -194,19 +194,19 @@ GENIEOS := solaris endif ifeq ($(firstword $(filter FreeBSD,$(UNAME))),FreeBSD) OS := freebsd -GENIEOS := freebsd +GENIEOS := bsd endif ifeq ($(firstword $(filter GNU/kFreeBSD,$(UNAME))),GNU/kFreeBSD) OS := freebsd -GENIEOS := freebsd +GENIEOS := bsd endif ifeq ($(firstword $(filter NetBSD,$(UNAME))),NetBSD) OS := netbsd -GENIEOS := freebsd +GENIEOS := bsd endif ifeq ($(firstword $(filter OpenBSD,$(UNAME))),OpenBSD) OS := openbsd -GENIEOS := freebsd +GENIEOS := bsd endif ifeq ($(firstword $(filter Darwin,$(UNAME))),Darwin) OS := macosx -@@ -1377,6 +1377,23 @@ freebsd_x86: generate $(PROJECTDIR)/$(MA - $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd config=$(CONFIG)32 +@@ -395,13 +395,13 @@ endif + endif # BIGENDIAN + ifndef PYTHON_EXECUTABLE +-PYTHON := python ++#PYTHON := python + else +-PYTHON := $(PYTHON_EXECUTABLE) ++#PYTHON := $(PYTHON_EXECUTABLE) + endif +-CC := $(SILENT)gcc +-LD := $(SILENT)g++ +-CXX:= $(SILENT)g++ ++#CC := $(SILENT)gcc ++#LD := $(SILENT)g++ ++#CXX:= $(SILENT)g++ + #------------------------------------------------- + # specify OSD layer: windows, sdl, etc. +@@ -531,19 +531,19 @@ endif + ifdef OVERRIDE_CC + PARAMS += --CC='$(OVERRIDE_CC)' + ifndef CROSS_BUILD +-CC := $(OVERRIDE_CC) ++#CC := $(OVERRIDE_CC) + endif + endif + ifdef OVERRIDE_CXX + PARAMS += --CXX='$(OVERRIDE_CXX)' + ifndef CROSS_BUILD +-CXX := $(OVERRIDE_CXX) ++#CXX := $(OVERRIDE_CXX) + endif + endif + ifdef OVERRIDE_LD + PARAMS += --LD='$(OVERRIDE_LD)' + ifndef CROSS_BUILD +-LD := $(OVERRIDE_LD) ++#LD := $(OVERRIDE_LD) + endif + endif + +@@ -1400,6 +1400,23 @@ freebsd: freebsd_x86 + freebsd_x86: generate $(PROJECTDIR)/$(MAKETYPE)-freebsd/Makefile + $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd config=$(CONFIG)32 precompile + $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd config=$(CONFIG)32 ++ ++#------------------------------------------------- +# gmake-freebsd-clang +#------------------------------------------------- + +$(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile: makefile $(SCRIPTS) $(GENIE) + $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=freebsd-clang --gcc_version=$(CLANG_VERSION) $(MAKETYPE) + +.PHONY: freebsd_x64_clang +freebsd_x64_clang: generate $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile + $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)64 precompile + $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)64 + +.PHONY: freebsd_x86_clang +freebsd_x86_clang: generate $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang/Makefile + $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)32 precompile + $(SILENT) $(MAKE) -C $(PROJECTDIR)/$(MAKETYPE)-freebsd-clang config=$(CONFIG)32 -+ -+#------------------------------------------------- - # gmake-netbsd - #------------------------------------------------- + #------------------------------------------------- + # gmake-freebsd-clang Index: head/emulators/mame/files/patch-src_osd_eigccx86.h =================================================================== --- head/emulators/mame/files/patch-src_osd_eigccx86.h (nonexistent) +++ head/emulators/mame/files/patch-src_osd_eigccx86.h (revision 500513) @@ -0,0 +1,110 @@ +--- src/osd/eigccx86.h.orig 2019-04-24 05:00:38 UTC ++++ src/osd/eigccx86.h +@@ -31,7 +31,7 @@ + multiply and return the full 64 bit result + -------------------------------------------------*/ + +-#ifndef __x86_64__ ++#if !defined(__amd64__) && !defined(__x86_64__) + #define mul_32x32 _mul_32x32 + inline int64_t ATTR_CONST ATTR_FORCE_INLINE + _mul_32x32(int32_t a, int32_t b) +@@ -55,7 +55,7 @@ _mul_32x32(int32_t a, int32_t b) + result + -------------------------------------------------*/ + +-#ifndef __x86_64__ ++#if !defined(__amd64__) && !defined(__x86_64__) + #define mulu_32x32 _mulu_32x32 + inline uint64_t ATTR_CONST ATTR_FORCE_INLINE + _mulu_32x32(uint32_t a, uint32_t b) +@@ -126,7 +126,7 @@ _mulu_32x32_hi(uint32_t a, uint32_t b) + result to 32 bits + -------------------------------------------------*/ + +-#ifndef __x86_64__ ++#if !defined(__amd64__) && !defined(__x86_64__) + #define mul_32x32_shift _mul_32x32_shift + inline int32_t ATTR_CONST ATTR_FORCE_INLINE + _mul_32x32_shift(int32_t a, int32_t b, uint8_t shift) +@@ -156,7 +156,7 @@ _mul_32x32_shift(int32_t a, int32_t b, uint8_t shift) + result to 32 bits + -------------------------------------------------*/ + +-#ifndef __x86_64__ ++#if !defined(__amd64__) && !defined(__x86_64__) + #define mulu_32x32_shift _mulu_32x32_shift + inline uint32_t ATTR_CONST ATTR_FORCE_INLINE + _mulu_32x32_shift(uint32_t a, uint32_t b, uint8_t shift) +@@ -184,7 +184,7 @@ _mulu_32x32_shift(uint32_t a, uint32_t b, uint8_t shif + divide and return the 32 bit quotient + -------------------------------------------------*/ + +-#ifndef __x86_64__ ++#if !defined(__amd64__) && !defined(__x86_64__) + #define div_64x32 _div_64x32 + inline int32_t ATTR_CONST ATTR_FORCE_INLINE + _div_64x32(int64_t a, int32_t b) +@@ -211,7 +211,7 @@ _div_64x32(int64_t a, int32_t b) + divide and return the 32 bit quotient + -------------------------------------------------*/ + +-#ifndef __x86_64__ ++#if !defined(__amd64__) && !defined(__x86_64__) + #define divu_64x32 _divu_64x32 + inline uint32_t ATTR_CONST ATTR_FORCE_INLINE + _divu_64x32(uint64_t a, uint32_t b) +@@ -244,7 +244,7 @@ inline int32_t ATTR_FORCE_INLINE + _div_64x32_rem(int64_t dividend, int32_t divisor, int32_t *remainder) + { + int32_t quotient; +-#ifndef __x86_64__ ++#if !defined(__amd64__) && !defined(__x86_64__) + + // Throws arithmetic exception if result doesn't fit in 32 bits + __asm__ ( +@@ -287,7 +287,7 @@ inline uint32_t ATTR_FORCE_INLINE + _divu_64x32_rem(uint64_t dividend, uint32_t divisor, uint32_t *remainder) + { + uint32_t quotient; +-#ifndef __x86_64__ ++#if !defined(__amd64__) && !defined(__x86_64__) + + // Throws arithmetic exception if result doesn't fit in 32 bits + __asm__ ( +@@ -325,7 +325,7 @@ _divu_64x32_rem(uint64_t dividend, uint32_t divisor, u + division, and returning the 32 bit quotient + -------------------------------------------------*/ + +-#ifndef __x86_64__ ++#if !defined(__amd64__) && !defined(__x86_64__) + #define div_32x32_shift _div_32x32_shift + inline int32_t ATTR_CONST ATTR_FORCE_INLINE + _div_32x32_shift(int32_t a, int32_t b, uint8_t shift) +@@ -357,7 +357,7 @@ _div_32x32_shift(int32_t a, int32_t b, uint8_t shift) + division, and returning the 32 bit quotient + -------------------------------------------------*/ + +-#ifndef __x86_64__ ++#if !defined(__amd64__) && !defined(__x86_64__) + #define divu_32x32_shift _divu_32x32_shift + inline uint32_t ATTR_CONST ATTR_FORCE_INLINE + _divu_32x32_shift(uint32_t a, uint32_t b, uint8_t shift) +@@ -388,7 +388,7 @@ _divu_32x32_shift(uint32_t a, uint32_t b, uint8_t shif + divide and return the 32 bit remainder + -------------------------------------------------*/ + +-#ifndef __x86_64__ ++#if !defined(__amd64__) && !defined(__x86_64__) + #define mod_64x32 _mod_64x32 + inline int32_t ATTR_CONST ATTR_FORCE_INLINE + _mod_64x32(int64_t a, int32_t b) +@@ -415,7 +415,7 @@ _mod_64x32(int64_t a, int32_t b) + divide and return the 32 bit remainder + -------------------------------------------------*/ + +-#ifndef __x86_64__ ++#if !defined(__amd64__) && !defined(__x86_64__) + #define modu_64x32 _modu_64x32 + inline uint32_t ATTR_CONST ATTR_FORCE_INLINE + _modu_64x32(uint64_t a, uint32_t b) Property changes on: head/emulators/mame/files/patch-src_osd_eigccx86.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/mame/files/patch-src_osd_eminline.h =================================================================== --- head/emulators/mame/files/patch-src_osd_eminline.h (nonexistent) +++ head/emulators/mame/files/patch-src_osd_eminline.h (revision 500513) @@ -0,0 +1,11 @@ +--- src/osd/eminline.h.orig 2018-02-27 15:59:06 UTC ++++ src/osd/eminline.h +@@ -21,7 +21,7 @@ + + #if defined(__GNUC__) + +-#if defined(__i386__) || defined(__x86_64__) ++#if defined(__i386__) || defined(__x86_64__) || defined(__amd64__) + #include "eigccx86.h" + #elif defined(__ppc__) || defined (__PPC__) || defined(__ppc64__) || defined(__PPC64__) + #include "eigccppc.h" Property changes on: head/emulators/mame/files/patch-src_osd_eminline.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/emulators/mame/files/patch-src_osd_modules_file_posixptty.cpp =================================================================== --- head/emulators/mame/files/patch-src_osd_modules_file_posixptty.cpp (revision 500512) +++ head/emulators/mame/files/patch-src_osd_modules_file_posixptty.cpp (revision 500513) @@ -1,11 +1,11 @@ ---- src/osd/modules/file/posixptty.cpp.orig 2018-02-27 15:59:06 UTC +--- src/osd/modules/file/posixptty.cpp.orig 2019-04-24 05:00:38 UTC +++ src/osd/modules/file/posixptty.cpp @@ -19,7 +19,7 @@ #include #include -#if defined(__FreeBSD_kernel__) || defined(__DragonFly__) +#if defined(__FreeBSD__) || defined(__DragonFly__) #include #include - #elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(__ANDROID__) + #elif defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) Index: head/emulators/mame/pkg-plist =================================================================== --- head/emulators/mame/pkg-plist (revision 500512) +++ head/emulators/mame/pkg-plist (revision 500513) @@ -1,542 +1,585 @@ bin/%%EMULATOR%% libexec/mame/chdman libexec/mame/jedutil libexec/mame/ldresample libexec/mame/ldverify libexec/mame/romcmp libexec/mame/unidasm %%DATADIR%%/artwork/LICENSE %%DATADIR%%/artwork/README.md %%DATADIR%%/artwork/aperture-grille.png %%DATADIR%%/artwork/aperture.png %%DATADIR%%/artwork/aperture1x2rb.png %%DATADIR%%/artwork/aperture1x3rb.png %%DATADIR%%/artwork/aperture2x4bg.png %%DATADIR%%/artwork/aperture2x4rb.png %%DATADIR%%/artwork/aperture4x6.png %%DATADIR%%/artwork/bgfx/border_blur/default.lay %%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_2_bgr.png %%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_1_4_rgb.png %%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_2_4_rgb.png %%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_2_5_bgr.png %%DATADIR%%/artwork/bgfx/chains/crt-geom/aperture_3_6_rgb.png %%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_1_2x1_bgr.png %%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_1_4x1_rgb.png %%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_2_4x1_rgb.png %%DATADIR%%/artwork/bgfx/chains/crt-geom/delta_2_4x2_rgb.png %%DATADIR%%/artwork/bgfx/chains/crt-geom/none.png %%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_2_4x4_rgb.png %%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_2_5x4_bgr.png %%DATADIR%%/artwork/bgfx/chains/crt-geom/slot_3_7x6_rgb.png %%DATADIR%%/artwork/bgfx/chains/hq2x.png %%DATADIR%%/artwork/bgfx/chains/hq3x.png %%DATADIR%%/artwork/bgfx/chains/hq4x.png %%DATADIR%%/artwork/dir.txt %%DATADIR%%/artwork/monochrome-chessboard.png %%DATADIR%%/artwork/monochrome-matrix.png %%DATADIR%%/artwork/scanlines.png %%DATADIR%%/artwork/shadow-mask.png %%DATADIR%%/artwork/slot-mask-aligned.png %%DATADIR%%/artwork/slot-mask.png %%DATADIR%%/artwork/white.png %%DATADIR%%/hash/32x.xml %%DATADIR%%/hash/3do_m2.xml %%DATADIR%%/hash/LICENSE %%DATADIR%%/hash/README.md %%DATADIR%%/hash/a2600.xml %%DATADIR%%/hash/a2600_cass.xml %%DATADIR%%/hash/a5200.hsi %%DATADIR%%/hash/a5200.xml %%DATADIR%%/hash/a7800.xml %%DATADIR%%/hash/a800.xml %%DATADIR%%/hash/a800_flop.xml %%DATADIR%%/hash/abc1600.xml %%DATADIR%%/hash/abc800.xml %%DATADIR%%/hash/abc800_hdd.xml %%DATADIR%%/hash/abc806.xml %%DATADIR%%/hash/abc80_cass.xml %%DATADIR%%/hash/abc80_flop.xml %%DATADIR%%/hash/acrnsys_flop.xml %%DATADIR%%/hash/acrnsys_rom.xml %%DATADIR%%/hash/adam_cart.xml %%DATADIR%%/hash/adam_cass.xml %%DATADIR%%/hash/adam_flop.xml %%DATADIR%%/hash/advantage.xml %%DATADIR%%/hash/advision.xml %%DATADIR%%/hash/aim65_cart.xml %%DATADIR%%/hash/aleste.xml %%DATADIR%%/hash/alice32.xml %%DATADIR%%/hash/alice90.xml %%DATADIR%%/hash/alphatro_cart.xml %%DATADIR%%/hash/alphatro_flop.xml %%DATADIR%%/hash/altos5.xml %%DATADIR%%/hash/amiga_a1000.xml %%DATADIR%%/hash/amiga_a3000.xml %%DATADIR%%/hash/amiga_apps.xml %%DATADIR%%/hash/amiga_flop.xml %%DATADIR%%/hash/amiga_hardware.xml %%DATADIR%%/hash/amiga_workbench.xml %%DATADIR%%/hash/amigaaga_flop.xml %%DATADIR%%/hash/amigaecs_flop.xml %%DATADIR%%/hash/amigaocs_flop.xml %%DATADIR%%/hash/ampro.xml %%DATADIR%%/hash/apc.xml %%DATADIR%%/hash/apfimag_cass.xml %%DATADIR%%/hash/apfm1000.xml %%DATADIR%%/hash/apogee.xml %%DATADIR%%/hash/apollo_ctape.xml %%DATADIR%%/hash/apple1.xml -%%DATADIR%%/hash/apple2.xml %%DATADIR%%/hash/apple2_cass.xml +%%DATADIR%%/hash/apple2_flop_clcracked.xml +%%DATADIR%%/hash/apple2_flop_misc.xml +%%DATADIR%%/hash/apple2_flop_orig.xml %%DATADIR%%/hash/apple2gs.xml %%DATADIR%%/hash/apple3.xml %%DATADIR%%/hash/apricot_flop.xml %%DATADIR%%/hash/aquarius.xml +%%DATADIR%%/hash/arb.xml %%DATADIR%%/hash/arcadia.xml %%DATADIR%%/hash/archimedes.xml %%DATADIR%%/hash/astrocde.xml %%DATADIR%%/hash/atom_cass.xml %%DATADIR%%/hash/atom_flop.xml %%DATADIR%%/hash/atom_rom.xml %%DATADIR%%/hash/attache.xml %%DATADIR%%/hash/b2m.xml %%DATADIR%%/hash/bbc_flop_32016.xml %%DATADIR%%/hash/bbc_flop_6502.xml %%DATADIR%%/hash/bbc_flop_65c102.xml %%DATADIR%%/hash/bbc_flop_68000.xml %%DATADIR%%/hash/bbc_flop_80186.xml %%DATADIR%%/hash/bbc_flop_arm.xml %%DATADIR%%/hash/bbc_flop_torch.xml %%DATADIR%%/hash/bbc_flop_z80.xml +%%DATADIR%%/hash/bbc_rom.xml %%DATADIR%%/hash/bbca_cass.xml %%DATADIR%%/hash/bbcb_cass.xml %%DATADIR%%/hash/bbcb_cass_de.xml %%DATADIR%%/hash/bbcb_flop.xml %%DATADIR%%/hash/bbcb_flop_orig.xml %%DATADIR%%/hash/bbcb_flop_us.xml %%DATADIR%%/hash/bbcbc.xml %%DATADIR%%/hash/bbcm_cart.xml %%DATADIR%%/hash/bbcm_cass.xml %%DATADIR%%/hash/bbcm_flop.xml %%DATADIR%%/hash/bbcmc_flop.xml %%DATADIR%%/hash/bk0010.xml %%DATADIR%%/hash/bml3_flop.xml %%DATADIR%%/hash/bw12.xml %%DATADIR%%/hash/bw14.xml %%DATADIR%%/hash/bw2.xml %%DATADIR%%/hash/bx256hp_flop.xml %%DATADIR%%/hash/c128_cart.xml %%DATADIR%%/hash/c128_flop.xml %%DATADIR%%/hash/c128_rom.xml +%%DATADIR%%/hash/c2color_cart.xml %%DATADIR%%/hash/c64_cart.xml %%DATADIR%%/hash/c64_cass.xml %%DATADIR%%/hash/c64_flop.xml %%DATADIR%%/hash/c65_flop.xml %%DATADIR%%/hash/camplynx_cass.xml %%DATADIR%%/hash/camplynx_flop.xml %%DATADIR%%/hash/casloopy.xml %%DATADIR%%/hash/cbm2_cart.xml %%DATADIR%%/hash/cbm2_flop.xml %%DATADIR%%/hash/cbm8096_flop.xml %%DATADIR%%/hash/cbm8296_flop.xml %%DATADIR%%/hash/cc40_cart.xml %%DATADIR%%/hash/cd32.xml %%DATADIR%%/hash/cdi.xml %%DATADIR%%/hash/cdtv.xml %%DATADIR%%/hash/cgenie_cass.xml %%DATADIR%%/hash/cgenie_flop_rom.xml %%DATADIR%%/hash/channelf.xml %%DATADIR%%/hash/chessmstdm.xml +%%DATADIR%%/hash/clickstart_cart.xml %%DATADIR%%/hash/coco_cart.xml %%DATADIR%%/hash/coco_flop.xml %%DATADIR%%/hash/coleco.xml %%DATADIR%%/hash/compclr2_flop.xml %%DATADIR%%/hash/compis.xml %%DATADIR%%/hash/comx35_flop.xml %%DATADIR%%/hash/copera.xml %%DATADIR%%/hash/cpc_cass.xml %%DATADIR%%/hash/cpc_flop.xml %%DATADIR%%/hash/crvision.xml %%DATADIR%%/hash/cx3000tc.xml %%DATADIR%%/hash/dai_cass.xml %%DATADIR%%/hash/database.xml %%DATADIR%%/hash/dc.xml %%DATADIR%%/hash/dgnalpha_flop.xml %%DATADIR%%/hash/dgnbeta_flop.xml %%DATADIR%%/hash/dim68k.xml %%DATADIR%%/hash/dmv.xml %%DATADIR%%/hash/dps1.xml %%DATADIR%%/hash/dragon_cart.xml %%DATADIR%%/hash/dragon_cass.xml %%DATADIR%%/hash/dragon_flex.xml %%DATADIR%%/hash/dragon_flop.xml %%DATADIR%%/hash/dragon_os9.xml %%DATADIR%%/hash/e01_flop.xml %%DATADIR%%/hash/ec1841.xml %%DATADIR%%/hash/einstein.xml +%%DATADIR%%/hash/ekara_japan.xml +%%DATADIR%%/hash/ekara_japan_a.xml +%%DATADIR%%/hash/ekara_japan_bh.xml +%%DATADIR%%/hash/ekara_japan_d.xml +%%DATADIR%%/hash/ekara_japan_en.xml +%%DATADIR%%/hash/ekara_japan_g.xml +%%DATADIR%%/hash/ekara_japan_gk.xml +%%DATADIR%%/hash/ekara_japan_m.xml +%%DATADIR%%/hash/ekara_japan_p.xml +%%DATADIR%%/hash/ekara_japan_s.xml +%%DATADIR%%/hash/ekara_japan_sp.xml +%%DATADIR%%/hash/ekara_japan_web.xml +%%DATADIR%%/hash/ekara_pal.xml +%%DATADIR%%/hash/ekara_us.xml %%DATADIR%%/hash/electron_cart.xml %%DATADIR%%/hash/electron_cass.xml %%DATADIR%%/hash/electron_flop.xml %%DATADIR%%/hash/electron_rom.xml %%DATADIR%%/hash/ep64_cart.xml %%DATADIR%%/hash/ep64_cass.xml %%DATADIR%%/hash/ep64_flop.xml %%DATADIR%%/hash/epson_cpm.xml %%DATADIR%%/hash/ews286_flop.xml %%DATADIR%%/hash/exl100.xml %%DATADIR%%/hash/famicom_cass.xml %%DATADIR%%/hash/famicom_flop.xml +%%DATADIR%%/hash/fidel_sc6.xml %%DATADIR%%/hash/fidel_scc.xml %%DATADIR%%/hash/fm77av.xml %%DATADIR%%/hash/fm7_cass.xml %%DATADIR%%/hash/fm7_disk.xml %%DATADIR%%/hash/fmtowns_cd.xml %%DATADIR%%/hash/fmtowns_flop.xml %%DATADIR%%/hash/g7400.xml %%DATADIR%%/hash/galaxy.xml %%DATADIR%%/hash/gamate.xml %%DATADIR%%/hash/gameboy.xml %%DATADIR%%/hash/gamecom.xml %%DATADIR%%/hash/gamegear.xml %%DATADIR%%/hash/gameking.xml %%DATADIR%%/hash/gameking3.xml %%DATADIR%%/hash/gamepock.xml %%DATADIR%%/hash/gba.xml %%DATADIR%%/hash/gba_ereader.xml %%DATADIR%%/hash/gbcolor.xml %%DATADIR%%/hash/genius.xml +%%DATADIR%%/hash/ggm.xml %%DATADIR%%/hash/gimix.xml %%DATADIR%%/hash/gjmovie.xml %%DATADIR%%/hash/gl2000.xml %%DATADIR%%/hash/gl6000sl.xml %%DATADIR%%/hash/glcolor.xml %%DATADIR%%/hash/gmaster.xml %%DATADIR%%/hash/gp32.xml %%DATADIR%%/hash/guab.xml %%DATADIR%%/hash/gx4000.xml %%DATADIR%%/hash/h21.xml %%DATADIR%%/hash/horizon.xml %%DATADIR%%/hash/hp85_rom.xml %%DATADIR%%/hash/hp9835a_rom.xml %%DATADIR%%/hash/hp9845a_rom.xml %%DATADIR%%/hash/hp9845b_rom.xml %%DATADIR%%/hash/hp9k3xx_flop.xml %%DATADIR%%/hash/hp_ipc.xml %%DATADIR%%/hash/ht68k.xml %%DATADIR%%/hash/hx20_rom.xml %%DATADIR%%/hash/hyperscan.xml %%DATADIR%%/hash/i7000_card.xml %%DATADIR%%/hash/ibm5140.xml %%DATADIR%%/hash/ibm5150.xml %%DATADIR%%/hash/ibm5150_cass.xml %%DATADIR%%/hash/ibm5170.xml %%DATADIR%%/hash/ibm5170_cdrom.xml %%DATADIR%%/hash/ibm6580.xml %%DATADIR%%/hash/ibmpcjr_cart.xml %%DATADIR%%/hash/ibmpcjr_flop.xml +%%DATADIR%%/hash/icanguit.xml +%%DATADIR%%/hash/icanpian.xml +%%DATADIR%%/hash/intellect02.xml %%DATADIR%%/hash/interact.xml %%DATADIR%%/hash/interpro.xml %%DATADIR%%/hash/intv.hsi %%DATADIR%%/hash/intv.xml %%DATADIR%%/hash/intvecs.xml %%DATADIR%%/hash/iq128.xml %%DATADIR%%/hash/iq151_cart.xml %%DATADIR%%/hash/iq151_flop.xml %%DATADIR%%/hash/jaguar.xml +%%DATADIR%%/hash/jakks_gamekey_dp.xml +%%DATADIR%%/hash/jakks_gamekey_dy.xml +%%DATADIR%%/hash/jakks_gamekey_mv.xml +%%DATADIR%%/hash/jakks_gamekey_nk.xml +%%DATADIR%%/hash/jakks_gamekey_nm.xml +%%DATADIR%%/hash/jakks_gamekey_sw.xml +%%DATADIR%%/hash/jpopira_jp.xml %%DATADIR%%/hash/juicebox.xml %%DATADIR%%/hash/jupace_cass.xml %%DATADIR%%/hash/k28m2.xml %%DATADIR%%/hash/kayproii.xml %%DATADIR%%/hash/kc_cart.xml %%DATADIR%%/hash/kc_cass.xml %%DATADIR%%/hash/kc_flop.xml %%DATADIR%%/hash/kim1_cass.xml %%DATADIR%%/hash/korvet_flop.xml %%DATADIR%%/hash/lantutor.xml %%DATADIR%%/hash/laser2001_cart.xml +%%DATADIR%%/hash/leapfrog_leappad_cart.xml +%%DATADIR%%/hash/leapfrog_mfleappad_cart.xml %%DATADIR%%/hash/leapster.xml %%DATADIR%%/hash/lisa.xml %%DATADIR%%/hash/lisa2.xml %%DATADIR%%/hash/lviv.xml %%DATADIR%%/hash/lynx.xml %%DATADIR%%/hash/m20.xml %%DATADIR%%/hash/m5_cart.xml %%DATADIR%%/hash/m5_cass.xml %%DATADIR%%/hash/m5_flop.xml %%DATADIR%%/hash/mac_flop.xml %%DATADIR%%/hash/mac_hdd.xml +%%DATADIR%%/hash/mac_hdflop.xml %%DATADIR%%/hash/mbc200.xml %%DATADIR%%/hash/mbc55x.xml %%DATADIR%%/hash/mc10.xml %%DATADIR%%/hash/mc1000_cass.xml %%DATADIR%%/hash/mc1502_flop.xml %%DATADIR%%/hash/md2_flop.xml %%DATADIR%%/hash/megacd.xml %%DATADIR%%/hash/megacdj.xml %%DATADIR%%/hash/megadriv.xml %%DATADIR%%/hash/megaduck.xml %%DATADIR%%/hash/megapc.xml %%DATADIR%%/hash/megatech.xml %%DATADIR%%/hash/microvision.xml %%DATADIR%%/hash/mikro80.xml %%DATADIR%%/hash/mikrosha_cart.xml %%DATADIR%%/hash/mikrosha_cass.xml %%DATADIR%%/hash/misterx.xml %%DATADIR%%/hash/mm1_flop.xml %%DATADIR%%/hash/mo5_cart.xml %%DATADIR%%/hash/mo5_cass.xml %%DATADIR%%/hash/mo5_flop.xml %%DATADIR%%/hash/mo5_qd.xml %%DATADIR%%/hash/mo6_cass.xml %%DATADIR%%/hash/mo6_flop.xml +%%DATADIR%%/hash/monon_color.xml %%DATADIR%%/hash/mpu1000.xml %%DATADIR%%/hash/mpz80.xml %%DATADIR%%/hash/msx.hsi %%DATADIR%%/hash/msx1_cart.xml %%DATADIR%%/hash/msx1_cass.xml %%DATADIR%%/hash/msx1_flop.xml %%DATADIR%%/hash/msx2.hsi %%DATADIR%%/hash/msx2_cart.xml %%DATADIR%%/hash/msx2_cass.xml %%DATADIR%%/hash/msx2_flop.xml %%DATADIR%%/hash/msx2p_flop.xml %%DATADIR%%/hash/msxr_flop.xml %%DATADIR%%/hash/mtx_cart.xml %%DATADIR%%/hash/mtx_cass.xml +%%DATADIR%%/hash/mtx_flop.xml %%DATADIR%%/hash/mtx_rom.xml %%DATADIR%%/hash/myvision.xml %%DATADIR%%/hash/mz2000_cass.xml %%DATADIR%%/hash/mz2000_flop.xml %%DATADIR%%/hash/mz2500.xml %%DATADIR%%/hash/mz700_cass.xml %%DATADIR%%/hash/mz800_cass.xml %%DATADIR%%/hash/n64.xml %%DATADIR%%/hash/n64dd.xml %%DATADIR%%/hash/nascom_flop.xml +%%DATADIR%%/hash/nascom_snap.xml %%DATADIR%%/hash/nascom_socket.xml %%DATADIR%%/hash/neocd.xml %%DATADIR%%/hash/neogeo.xml %%DATADIR%%/hash/nes.hsi %%DATADIR%%/hash/nes.xml %%DATADIR%%/hash/nes_ade.xml %%DATADIR%%/hash/nes_datach.xml %%DATADIR%%/hash/nes_kstudio.xml %%DATADIR%%/hash/nes_ntbrom.xml %%DATADIR%%/hash/next.xml %%DATADIR%%/hash/ngp.xml %%DATADIR%%/hash/ngpc.xml %%DATADIR%%/hash/nimbus.xml %%DATADIR%%/hash/octopus.xml %%DATADIR%%/hash/odyssey2.xml %%DATADIR%%/hash/ondra.xml %%DATADIR%%/hash/orao.xml %%DATADIR%%/hash/orion_cart.xml %%DATADIR%%/hash/orion_cass.xml %%DATADIR%%/hash/orion_flop.xml %%DATADIR%%/hash/orionpro_flop.xml %%DATADIR%%/hash/osborne1.xml %%DATADIR%%/hash/osborne2.xml %%DATADIR%%/hash/p500_flop.xml %%DATADIR%%/hash/partner_cass.xml %%DATADIR%%/hash/partner_flop.xml %%DATADIR%%/hash/pasogo.xml %%DATADIR%%/hash/pb2000c.xml %%DATADIR%%/hash/pc1000.xml %%DATADIR%%/hash/pc1512_flop.xml %%DATADIR%%/hash/pc1512_hdd.xml %%DATADIR%%/hash/pc1640_flop.xml %%DATADIR%%/hash/pc1640_hdd.xml %%DATADIR%%/hash/pc8201.xml %%DATADIR%%/hash/pc8801_cass.xml %%DATADIR%%/hash/pc8801_flop.xml %%DATADIR%%/hash/pc88va.xml %%DATADIR%%/hash/pc98.xml %%DATADIR%%/hash/pc98_cd.xml %%DATADIR%%/hash/pce.xml %%DATADIR%%/hash/pce_tourvision.xml %%DATADIR%%/hash/pcecd.xml %%DATADIR%%/hash/pcfx.xml %%DATADIR%%/hash/pcw.xml %%DATADIR%%/hash/pcw16.xml +%%DATADIR%%/hash/pcx_flop.xml %%DATADIR%%/hash/pecom_cass.xml %%DATADIR%%/hash/pegasus_cart.xml %%DATADIR%%/hash/pencil2.xml %%DATADIR%%/hash/pentagon_cass.xml %%DATADIR%%/hash/pet_cass.xml %%DATADIR%%/hash/pet_flop.xml %%DATADIR%%/hash/pet_hdd.xml %%DATADIR%%/hash/pet_quik.xml %%DATADIR%%/hash/pet_rom.xml %%DATADIR%%/hash/phc25_cass.xml %%DATADIR%%/hash/picno.xml %%DATADIR%%/hash/pico.xml %%DATADIR%%/hash/pippin.xml %%DATADIR%%/hash/pippin_flop.xml %%DATADIR%%/hash/plus4_cart.xml %%DATADIR%%/hash/plus4_cass.xml %%DATADIR%%/hash/plus4_flop.xml %%DATADIR%%/hash/pmd85_cass.xml %%DATADIR%%/hash/pockchalv2.xml %%DATADIR%%/hash/pockchalw.xml %%DATADIR%%/hash/pofo.xml %%DATADIR%%/hash/poisk1_flop.xml %%DATADIR%%/hash/pokemini.xml %%DATADIR%%/hash/poly_flop.xml %%DATADIR%%/hash/princ.xml %%DATADIR%%/hash/pro128_cart.xml %%DATADIR%%/hash/pro128_cass.xml %%DATADIR%%/hash/pro128_flop.xml %%DATADIR%%/hash/pro128s_flop.xml %%DATADIR%%/hash/prof180.xml %%DATADIR%%/hash/prof80.xml %%DATADIR%%/hash/psi98.xml %%DATADIR%%/hash/psion1.xml %%DATADIR%%/hash/psion2.xml %%DATADIR%%/hash/psx.xml %%DATADIR%%/hash/pt68k2.xml %%DATADIR%%/hash/pv1000.xml %%DATADIR%%/hash/pv2000.xml %%DATADIR%%/hash/px4_cart.xml %%DATADIR%%/hash/px8_cart.xml %%DATADIR%%/hash/pyl601.xml %%DATADIR%%/hash/ql_cart.xml %%DATADIR%%/hash/ql_cass.xml %%DATADIR%%/hash/ql_flop.xml %%DATADIR%%/hash/quizwiz.xml %%DATADIR%%/hash/qx10_flop.xml %%DATADIR%%/hash/r9751.xml %%DATADIR%%/hash/radio86_cart.xml %%DATADIR%%/hash/radio86_cass.xml %%DATADIR%%/hash/rainbow.xml %%DATADIR%%/hash/rwtrntcs.xml %%DATADIR%%/hash/rx78.xml %%DATADIR%%/hash/sage2.xml %%DATADIR%%/hash/samcoupe_cass.xml %%DATADIR%%/hash/samcoupe_flop.xml %%DATADIR%%/hash/sat_cart.xml %%DATADIR%%/hash/sat_vccart.xml %%DATADIR%%/hash/saturn.xml %%DATADIR%%/hash/sawatte.xml %%DATADIR%%/hash/sc3000_cart.xml %%DATADIR%%/hash/sc3000_cass.xml %%DATADIR%%/hash/scv.xml +%%DATADIR%%/hash/sega_beena_cart.xml %%DATADIR%%/hash/segacd.xml %%DATADIR%%/hash/sf7000.xml %%DATADIR%%/hash/sg1000.xml %%DATADIR%%/hash/sgx.xml %%DATADIR%%/hash/sitcom.xml %%DATADIR%%/hash/smc777.xml %%DATADIR%%/hash/smondial2.xml %%DATADIR%%/hash/sms.xml %%DATADIR%%/hash/snes.xml %%DATADIR%%/hash/snes_bspack.xml %%DATADIR%%/hash/snes_strom.xml %%DATADIR%%/hash/snes_vkun.xml %%DATADIR%%/hash/snotec.xml %%DATADIR%%/hash/snread.xml %%DATADIR%%/hash/snspell.xml %%DATADIR%%/hash/socrates.xml %%DATADIR%%/hash/softbox.xml %%DATADIR%%/hash/softwarelist.dtd %%DATADIR%%/hash/sol20_cass.xml %%DATADIR%%/hash/sorcerer_cart.xml %%DATADIR%%/hash/sorcerer_cass.xml %%DATADIR%%/hash/sorcerer_flop.xml %%DATADIR%%/hash/spc1000_cass.xml %%DATADIR%%/hash/spc1500_cass.xml %%DATADIR%%/hash/special_cass.xml %%DATADIR%%/hash/special_flop.xml %%DATADIR%%/hash/specpls3_flop.xml %%DATADIR%%/hash/spectrum_cart.xml %%DATADIR%%/hash/spectrum_cass.xml +%%DATADIR%%/hash/spectrum_flop_opus.xml %%DATADIR%%/hash/squale_cart.xml %%DATADIR%%/hash/st_cart.xml %%DATADIR%%/hash/st_flop.xml %%DATADIR%%/hash/stepone_flop.xml %%DATADIR%%/hash/studio2.xml %%DATADIR%%/hash/stv.xml %%DATADIR%%/hash/super6.xml %%DATADIR%%/hash/super80_cass.xml %%DATADIR%%/hash/superpet_flop.xml %%DATADIR%%/hash/supracan.xml %%DATADIR%%/hash/sv8000.xml %%DATADIR%%/hash/svi318_cart.xml %%DATADIR%%/hash/svi318_cass.xml %%DATADIR%%/hash/svi318_flop.xml %%DATADIR%%/hash/svision.xml %%DATADIR%%/hash/svmu.xml %%DATADIR%%/hash/t1000.xml %%DATADIR%%/hash/tandy200.xml %%DATADIR%%/hash/tandy2k.xml %%DATADIR%%/hash/tandy6k.xml %%DATADIR%%/hash/tc4.xml %%DATADIR%%/hash/tdv2324.xml %%DATADIR%%/hash/tek4052_cart.xml %%DATADIR%%/hash/tg16.xml %%DATADIR%%/hash/ti74_cart.xml %%DATADIR%%/hash/ti95_cart.xml %%DATADIR%%/hash/ti99_cart.xml %%DATADIR%%/hash/tiki100.xml %%DATADIR%%/hash/timex_dock.xml %%DATADIR%%/hash/tntell.xml %%DATADIR%%/hash/to770_cart.xml %%DATADIR%%/hash/to770a_cart.xml %%DATADIR%%/hash/to7_cart.xml %%DATADIR%%/hash/to7_cass.xml %%DATADIR%%/hash/to7_qd.xml %%DATADIR%%/hash/to8_cass.xml %%DATADIR%%/hash/to8_qd.xml %%DATADIR%%/hash/to_flop.xml %%DATADIR%%/hash/trs80m2.xml %%DATADIR%%/hash/trsm100.xml %%DATADIR%%/hash/tutor.xml %%DATADIR%%/hash/tvc_cart.xml %%DATADIR%%/hash/tvc_cass.xml %%DATADIR%%/hash/tvc_flop.xml +%%DATADIR%%/hash/tvgogo.xml %%DATADIR%%/hash/unichamp.xml %%DATADIR%%/hash/ut88.xml %%DATADIR%%/hash/uzebox.xml %%DATADIR%%/hash/v1050_flop.xml %%DATADIR%%/hash/v1050_hdd.xml %%DATADIR%%/hash/vboy.xml %%DATADIR%%/hash/vc4000.xml %%DATADIR%%/hash/vector06_cart.xml %%DATADIR%%/hash/vector06_flop.xml %%DATADIR%%/hash/vectrex.xml %%DATADIR%%/hash/vg5k.xml +%%DATADIR%%/hash/vgmplay.xml %%DATADIR%%/hash/vic10.xml %%DATADIR%%/hash/vic1001_cart.xml %%DATADIR%%/hash/vic1001_cass.xml %%DATADIR%%/hash/vic1001_flop.xml %%DATADIR%%/hash/victor9k_flop.xml %%DATADIR%%/hash/vidbrain.xml %%DATADIR%%/hash/vii.xml %%DATADIR%%/hash/vip.xml %%DATADIR%%/hash/visicom.xml %%DATADIR%%/hash/vixen.xml -%%DATADIR%%/hash/vreader.xml %%DATADIR%%/hash/vsmile_cart.xml %%DATADIR%%/hash/vsmile_cd.xml %%DATADIR%%/hash/vsmileb_cart.xml %%DATADIR%%/hash/vsmilem_cart.xml +%%DATADIR%%/hash/vtech_storio_cart.xml %%DATADIR%%/hash/vz_cass.xml %%DATADIR%%/hash/wangpc.xml %%DATADIR%%/hash/waveterm.xml %%DATADIR%%/hash/wicat.xml %%DATADIR%%/hash/wmbullet.xml %%DATADIR%%/hash/wscolor.xml %%DATADIR%%/hash/wswan.xml %%DATADIR%%/hash/x07_card.xml %%DATADIR%%/hash/x07_cass.xml %%DATADIR%%/hash/x1_cass.xml %%DATADIR%%/hash/x1_flop.xml %%DATADIR%%/hash/x68k_flop.xml %%DATADIR%%/hash/xegs.xml %%DATADIR%%/hash/xerox820.xml %%DATADIR%%/hash/xerox820ii.xml %%DATADIR%%/hash/z80ne_cass.xml %%DATADIR%%/hash/z80ne_flop.xml %%DATADIR%%/hash/z88_cart.xml %%DATADIR%%/hash/zorba.xml %%DATADIR%%/hash/zx80_cass.xml %%DATADIR%%/hash/zx81_cass.xml