diff --git a/3rdparty/portmidi/pm_linux/pmlinuxalsa.c b/3rdparty/portmidi/pm_linux/pmlinuxalsa.c index e76560d2d82..9ca2cf72adf 100644 --- a/3rdparty/portmidi/pm_linux/pmlinuxalsa.c +++ b/3rdparty/portmidi/pm_linux/pmlinuxalsa.c @@ -15,10 +15,17 @@ #include "string.h" #include "porttime.h" #include "pmlinux.h" -#include "osdcomm.h" - #include +typedef unsigned int UINT32; +__extension__ typedef unsigned long long UINT64; + +#ifdef PTR64 +typedef UINT64 FPTR; +#else +typedef UINT32 FPTR; +#endif + /* I used many print statements to debug this code. I left them in the * source, and you can turn them on by changing false to true below: */ diff --git a/3rdparty/portmidi/pm_win/pmwinmm.c b/3rdparty/portmidi/pm_win/pmwinmm.c index 2b4f82911f4..4f31cdaca3c 100644 --- a/3rdparty/portmidi/pm_win/pmwinmm.c +++ b/3rdparty/portmidi/pm_win/pmwinmm.c @@ -19,7 +19,24 @@ #include "pmwinmm.h" #include #include "porttime.h" -#include "osdcomm.h" + +#ifndef _WINDOWS_H +typedef unsigned int UINT32; +#endif + +#ifndef _WINDOWS_H +#ifdef _MSC_VER +typedef unsigned __int64 UINT64; +#else +__extension__ typedef unsigned long long UINT64; +#endif +#endif + +#ifdef PTR64 +typedef UINT64 FPTR; +#else +typedef UINT32 FPTR; +#endif /* asserts used to verify portMidi code logic is sound; later may want something more graceful */ diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 1a6398b9092..3fef7c5ea23 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -500,7 +500,6 @@ project "portmidi" kind "StaticLib" includedirs { - MAME_DIR .. "src/osd", MAME_DIR .. "3rdparty/portmidi/pm_common", MAME_DIR .. "3rdparty/portmidi/porttime", }