NetBSD support
--HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401387
This commit is contained in:
parent
d702fdf4ad
commit
5427ab0258
5 changed files with 10 additions and 15 deletions
14
configure.in
14
configure.in
|
@ -287,7 +287,7 @@ AC_HELP_STRING([--enable-oss], [support the OSS audio API [default=yes]]),
|
|||
|
||||
# OpenBSD needs linking with ossaudio emulation library
|
||||
case "$target" in
|
||||
*-*-openbsd*)
|
||||
*-*-openbsd*|*-*-netbsd*)
|
||||
BUILD_LIBS="$BUILD_LIBS -lossaudio";;
|
||||
esac
|
||||
fi
|
||||
|
@ -1483,7 +1483,7 @@ AC_HELP_STRING([--enable-pthread-sem], [use pthread semaphores [default=yes]]),
|
|||
pthread_lib="-pthread"
|
||||
;;
|
||||
*-*-netbsd*)
|
||||
pthread_cflags="-I/usr/include -D_REENTRANT -D_THREAD_SAFE -D_POSIX_THREAD_SYSCALL_SOFT=1"
|
||||
pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
|
||||
pthread_lib="-L/usr/lib -lpthread"
|
||||
;;
|
||||
*-*-openbsd*)
|
||||
|
@ -1976,7 +1976,7 @@ case "$target" in
|
|||
SOURCES="$SOURCES $srcdir/src/cdrom/freebsd/*.c"
|
||||
have_cdrom=yes
|
||||
;;
|
||||
*netbsd*|*openbsd*)
|
||||
*openbsd*|*netbsd*)
|
||||
AC_DEFINE(SDL_CDROM_OPENBSD)
|
||||
SOURCES="$SOURCES $srcdir/src/cdrom/openbsd/*.c"
|
||||
have_cdrom=yes
|
||||
|
@ -2014,12 +2014,8 @@ case "$target" in
|
|||
fi
|
||||
# Do any final platform setup
|
||||
case $ARCH in
|
||||
netbsd)
|
||||
# NetBSD does not define "unix"
|
||||
BUILD_CFLAGS="$BUILD_CFLAGS -Dunix"
|
||||
;;
|
||||
openbsd)
|
||||
# OpenBSD does not define "unix"
|
||||
openbsd|netbsd)
|
||||
# OpenBSD and NetBSD do not define "unix"
|
||||
BUILD_CFLAGS="$BUILD_CFLAGS -Dunix"
|
||||
;;
|
||||
esac
|
||||
|
|
|
@ -38,10 +38,10 @@
|
|||
#undef uint16_t
|
||||
#undef int32_t
|
||||
#undef uint32_t
|
||||
#undef SDL_HAS_64BIT_TYPE
|
||||
#undef int64_t
|
||||
#undef uint64_t
|
||||
#undef uintptr_t
|
||||
#undef SDL_HAS_64BIT_TYPE
|
||||
|
||||
/* Endianness */
|
||||
#undef SDL_BYTEORDER
|
||||
|
|
|
@ -41,8 +41,6 @@
|
|||
|
||||
#if SDL_THREAD_PTH
|
||||
#include <pth.h>
|
||||
#elif _POSIX_THREAD_SYSCALL_SOFT
|
||||
#include <pthread.h>
|
||||
#endif
|
||||
|
||||
#if SDL_THREADS_DISABLED
|
||||
|
@ -111,9 +109,6 @@ void SDL_Delay (Uint32 ms)
|
|||
do {
|
||||
errno = 0;
|
||||
|
||||
#if _POSIX_THREAD_SYSCALL_SOFT
|
||||
pthread_yield_np();
|
||||
#endif
|
||||
#if HAVE_NANOSLEEP
|
||||
tv.tv_sec = elapsed.tv_sec;
|
||||
tv.tv_nsec = elapsed.tv_nsec;
|
||||
|
|
|
@ -146,6 +146,7 @@ void WSCONS_InitOSKeymap(_THIS)
|
|||
}
|
||||
|
||||
switch (private->kbdType) {
|
||||
#ifdef WSKBD_TYPE_ZAURUS
|
||||
case WSKBD_TYPE_ZAURUS:
|
||||
/* top row */
|
||||
keymap[2] = SDLK_1;
|
||||
|
@ -219,6 +220,7 @@ void WSCONS_InitOSKeymap(_THIS)
|
|||
keymap[77] = SDLK_RIGHT;
|
||||
keymap[80] = SDLK_DOWN;
|
||||
break;
|
||||
#endif /* WSKBD_TYPE_ZAURUS */
|
||||
|
||||
default:
|
||||
WSCONS_ReportError("Unable to map keys for keyboard type %u",
|
||||
|
|
|
@ -191,10 +191,12 @@ int WSCONS_VideoInit(_THIS, SDL_PixelFormat *vformat)
|
|||
private->redMask = 0x0000ff;
|
||||
private->greenMask = 0x00ff00;
|
||||
private->blueMask = 0xff0000;
|
||||
#ifdef WSDISPLAY_TYPE_PXALCD
|
||||
} else if (wstype == WSDISPLAY_TYPE_PXALCD) {
|
||||
private->redMask = 0x1f << 11;
|
||||
private->greenMask = 0x3f << 5;
|
||||
private->blueMask = 0x1f;
|
||||
#endif
|
||||
} else {
|
||||
WSCONS_ReportError("Unknown video hardware");
|
||||
return -1;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue