From 1d37415a4a05375c48e52d016a86536acf91f126 Mon Sep 17 00:00:00 2001 From: "R. Belmont" Date: Mon, 6 Dec 2010 14:39:18 +0000 Subject: [PATCH] Fixed BSD compile [ElBarto] --- src/emu/debug/debugcpu.c | 4 +++- src/osd/sdl/sdl.mak | 8 ++++++++ src/osd/sdl/sdlprefix.h | 10 ++++++++-- src/osd/sdl/sdlptty_unix.c | 12 +++++++++++- 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/emu/debug/debugcpu.c b/src/emu/debug/debugcpu.c index 2729703e2a4..d78b6e986fb 100644 --- a/src/emu/debug/debugcpu.c +++ b/src/emu/debug/debugcpu.c @@ -51,7 +51,9 @@ #include "xmlfile.h" #include #include - +#ifdef SDLMAME_FREEBSD +# undef tolower +#endif /*************************************************************************** diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak index cb2ffae503b..0b4119d4382 100644 --- a/src/osd/sdl/sdl.mak +++ b/src/osd/sdl/sdl.mak @@ -140,6 +140,7 @@ ifeq ($(TARGETOS),freebsd) BASE_TARGETOS = unix SYNC_IMPLEMENTATION = tc DEFS += -DNO_AFFINITY_NP +LIBS += -lutil # /usr/local/include is not considered a system include directory # on FreeBSD. GL.h resides there and throws warnings CCOMFLAGS += -isystem /usr/local/include @@ -151,6 +152,13 @@ endif ifeq ($(TARGETOS),openbsd) BASE_TARGETOS = unix SYNC_IMPLEMENTATION = ntc +LIBS += -lutil +endif + +ifeq ($(TARGETOS),netbsd) +BASE_TARGETOS = unix +SYNC_IMPLEMENTATION = ntc +LIBS += -lutil endif ifeq ($(TARGETOS),solaris) diff --git a/src/osd/sdl/sdlprefix.h b/src/osd/sdl/sdlprefix.h index b16d3f4d3c4..e753824bb15 100644 --- a/src/osd/sdl/sdlprefix.h +++ b/src/osd/sdl/sdlprefix.h @@ -45,8 +45,14 @@ #elif defined(__linux__) #define SDLMAME_LINUX 1 -#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__) -#define SDLMAME_BSD 1 +#elif defined(__FreeBSD__) +#define SDLMAME_FREEBSD 1 +#elif defined(__DragonFly__) +#define SDLMAME_DRAGONFLY 1 +#elif defined(__OpenBSD__) +#define SDLMAME_OPENBSD 1 +#elif defined(__NetBSD__) +#define SDLMAME_NETBSD 1 #endif // fix for Ubuntu 8.10 diff --git a/src/osd/sdl/sdlptty_unix.c b/src/osd/sdl/sdlptty_unix.c index 60a7494a748..a54c9f5f139 100644 --- a/src/osd/sdl/sdlptty_unix.c +++ b/src/osd/sdl/sdlptty_unix.c @@ -14,7 +14,17 @@ #include #include #include -#include +#if defined(SDLMAME_FREEBSD) || defined(SDLMAME_DRAGONFLY) +# include +# include +#elif defined(SDLMAME_NETBSD) +# include +#elif defined(SDLMAME_OPENBSD) +# include +# include +#elif defined(SDLMAME_LINUX) +# include +#endif #include "sdlfile.h"