summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2003-07-04 08:30:01 +0000
committerBjörn Stenberg <bjorn@haxx.se>2003-07-04 08:30:01 +0000
commitf6ed970b118d0fc6335396cef1282bff5a9c2b3d (patch)
tree01c33cd0b2247199ea15e766a25806a90d538fe0
parent92b1d85b4818d29202af6afcec1548e21ec6c956 (diff)
downloadrockbox-f6ed970b118d0fc6335396cef1282bff5a9c2b3d.tar.gz
rockbox-f6ed970b118d0fc6335396cef1282bff5a9c2b3d.zip
Added FreeBSD support to uisimulator. Patch by Keith Hubbard
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3811 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--uisimulator/common/sound.h2
-rw-r--r--uisimulator/x11/Makefile12
-rw-r--r--uisimulator/x11/io.c5
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 @@
21#ifndef _SOUND_H 21#ifndef _SOUND_H
22#define _SOUND_H 22#define _SOUND_H
23 23
24#ifdef LINUX 24#ifdef HAVE_OSS
25 25
26/* The "sound device type" */ 26/* The "sound device type" */
27 27
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)
64 LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl -ldl 64 LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl -ldl
65 INCLUDES += -I/usr/X11R6/include 65 INCLUDES += -I/usr/X11R6/include
66 LIBDIRS = -L/usr/X11R6/lib 66 LIBDIRS = -L/usr/X11R6/lib
67 DEFINES += -DLINUX 67 DEFINES += -DHAVE_OSS
68else 68else
69ifeq ($(UNAME),CYGWIN) 69ifeq ($(UNAME),CYGWIN)
70 LDFLAGS = -lSM -lICE -lXt -lX11 -lXmu -lSM -lICE -lX11 70 LDFLAGS = -lSM -lICE -lXt -lX11 -lXmu -lSM -lICE -lX11
71 INCLUDES += -I/usr/X11R6/include 71 INCLUDES += -I/usr/X11R6/include
72 LIBDIRS = -L/usr/X11R6/lib 72 LIBDIRS = -L/usr/X11R6/lib
73 DEFINES += -DLINUX 73 DEFINES += -DHAVE_OSS
74else
75ifeq ($(UNAME),FreeBSD)
76 LIBS = -pthread
77 LDFLAGS = -lX11 -lm -lXt -lXmu
78 INCLUDES += -I/usr/X11R6/include
79 LIBDIRS = -L/usr/X11R6/lib
80 DEFINES += -DHAVE_OSS
74else 81else
75 LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl -ldl 82 LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl -ldl
76 DEFINES += -DBIG_ENDIAN 83 DEFINES += -DBIG_ENDIAN
77 LIBDIRS = 84 LIBDIRS =
78endif 85endif
79endif 86endif
87endif
80 88
81CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall 89CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall
82 90
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 @@
21#include <stdlib.h> 21#include <stdlib.h>
22#include <string.h> 22#include <string.h>
23#include <sys/stat.h> 23#include <sys/stat.h>
24#ifdef __FreeBSD__
25#include <sys/param.h>
26#include <sys/mount.h>
27#else
24#include <sys/vfs.h> 28#include <sys/vfs.h>
29#endif
25#include <dirent.h> 30#include <dirent.h>
26#include <unistd.h> 31#include <unistd.h>
27 32