From f6ed970b118d0fc6335396cef1282bff5a9c2b3d Mon Sep 17 00:00:00 2001 From: Björn Stenberg Date: Fri, 4 Jul 2003 08:30:01 +0000 Subject: Added FreeBSD support to uisimulator. Patch by Keith Hubbard git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3811 a1c6a512-1295-4272-9138-f99709370657 --- uisimulator/common/sound.h | 2 +- uisimulator/x11/Makefile | 12 ++++++++++-- uisimulator/x11/io.c | 5 +++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/uisimulator/common/sound.h b/uisimulator/common/sound.h index cb9afcb187..964e526fb4 100644 --- a/uisimulator/common/sound.h +++ b/uisimulator/common/sound.h @@ -21,7 +21,7 @@ #ifndef _SOUND_H #define _SOUND_H -#ifdef LINUX +#ifdef HAVE_OSS /* The "sound device type" */ diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index 05116edbd9..2ce4606468 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile @@ -64,19 +64,27 @@ ifeq ($(UNAME),Linux) LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl -ldl INCLUDES += -I/usr/X11R6/include LIBDIRS = -L/usr/X11R6/lib - DEFINES += -DLINUX + DEFINES += -DHAVE_OSS else ifeq ($(UNAME),CYGWIN) LDFLAGS = -lSM -lICE -lXt -lX11 -lXmu -lSM -lICE -lX11 INCLUDES += -I/usr/X11R6/include LIBDIRS = -L/usr/X11R6/lib - DEFINES += -DLINUX + DEFINES += -DHAVE_OSS +else +ifeq ($(UNAME),FreeBSD) + LIBS = -pthread + LDFLAGS = -lX11 -lm -lXt -lXmu + INCLUDES += -I/usr/X11R6/include + LIBDIRS = -L/usr/X11R6/lib + DEFINES += -DHAVE_OSS else LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl -ldl DEFINES += -DBIG_ENDIAN LIBDIRS = endif endif +endif CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall diff --git a/uisimulator/x11/io.c b/uisimulator/x11/io.c index 5b3cff7006..6fc82cc6f7 100644 --- a/uisimulator/x11/io.c +++ b/uisimulator/x11/io.c @@ -21,7 +21,12 @@ #include #include #include +#ifdef __FreeBSD__ +#include +#include +#else #include +#endif #include #include -- cgit v1.2.3