Fixes for BeOS and Solaris builds
authorSam Lantinga <slouken@libsdl.org>
Fri, 17 Feb 2006 08:43:23 +0000
changeset 1367e440d5c488c1
parent 1366 34d9df784d84
child 1368 533567cbb576
Fixes for BeOS and Solaris builds
configure.in
include/SDL_config.h
include/SDL_config.h.in
include/SDL_stdinc.h
src/audio/baudio/SDL_beaudio.cc
src/audio/esd/SDL_esdaudio.c
src/main/Makefile.am
src/main/arch.c
src/video/bwindow/SDL_BWin.h
src/video/bwindow/SDL_sysvideo.cc
test/configure.in
     1.1 --- a/configure.in	Thu Feb 16 23:32:39 2006 +0000
     1.2 +++ b/configure.in	Fri Feb 17 08:43:23 2006 +0000
     1.3 @@ -107,7 +107,7 @@
     1.4      if test x$ac_cv_func_strtod = xyes; then
     1.5          AC_DEFINE(HAVE_STRTOD)
     1.6      fi
     1.7 -    AC_CHECK_FUNCS(malloc calloc realloc free getenv putenv unsetenv qsort abs bcopy memset memcpy memmove strlen strcpy strncpy strcat strncat strdup _strrev _strupr _strlwr strchr strrchr strstr itoa _ltoa _uitoa _ultoa strtol _i64toa _ui64toa strtoll atoi atof strcmp strncmp stricmp strcasecmp sscanf snprintf vsnprint sigaction setjmp nanosleep)
     1.8 +    AC_CHECK_FUNCS(malloc calloc realloc free getenv putenv unsetenv qsort abs bcopy memset memcpy memmove strlen strcpy strncpy strcat strncat strdup _strrev _strupr _strlwr strchr strrchr strstr itoa _ltoa _uitoa _ultoa strtol _i64toa _ui64toa strtoll atoi atof strcmp strncmp stricmp strcasecmp sscanf snprintf vsnprintf sigaction setjmp nanosleep)
     1.9  fi
    1.10  
    1.11  if test x$have_inttypes != xyes; then
    1.12 @@ -762,8 +762,10 @@
    1.13                      x11ext_lib='libXext.so'
    1.14                      ;;
    1.15                  *)
    1.16 -                    x11_lib='libX11.so.6'
    1.17 -                    x11ext_lib='libXext.so.6'
    1.18 +                    x11_lib_spec=`echo $X_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libX11.so.*/'`
    1.19 +                    x11_lib=`ls $x11_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
    1.20 +                    x11ext_lib_spec=`echo $X_LIBS | sed 's/.*-L\([[^ ]]*\).*/\1\/libXext.so.*/'`
    1.21 +                    x11ext_lib=`ls $x11ext_lib_spec | sed 's/.*\/\(.*\)/\1/; q'`
    1.22                      ;;
    1.23              esac
    1.24  
    1.25 @@ -786,7 +788,6 @@
    1.26                  X_LIBS="$X_LIBS -lX11 -lXext"
    1.27              fi
    1.28  
    1.29 -
    1.30              AC_DEFINE(SDL_VIDEO_DRIVER_X11)
    1.31              SOURCES="$SOURCES $srcdir/src/video/x11/*.c"
    1.32              BUILD_CFLAGS="$BUILD_CFLAGS $X_CFLAGS"
    1.33 @@ -2184,7 +2185,8 @@
    1.34              SOURCES="$SOURCES $srcdir/src/loadso/beos/*.c"
    1.35              have_loadso=yes
    1.36          fi
    1.37 -        # The BeOS platform requires special libraries
    1.38 +        # The BeOS platform requires special setup.
    1.39 +        SOURCES="$srcdir/src/main/beos/*.cc $SOURCES"
    1.40          BUILD_LIBS="$BUILD_LIBS -lroot -lbe -lmedia -lgame -ldevice -ltextencoding"
    1.41          ;;
    1.42      *-*-darwin* )
     2.1 --- a/include/SDL_config.h	Thu Feb 16 23:32:39 2006 +0000
     2.2 +++ b/include/SDL_config.h	Fri Feb 17 08:43:23 2006 +0000
     2.3 @@ -1,4 +1,3 @@
     2.4 -/* include/SDL_config.h.  Generated by configure.  */
     2.5  /*
     2.6      SDL - Simple DirectMedia Layer
     2.7      Copyright (C) 1997-2006 Sam Lantinga
     2.8 @@ -24,272 +23,17 @@
     2.9  #ifndef _SDL_config_h
    2.10  #define _SDL_config_h
    2.11  
    2.12 -/* This is a set of defines to configure the SDL features */
    2.13 +/* This is the minimal configuration that can be used to build SDL */
    2.14  
    2.15 -/* C language features */
    2.16 -/* #undef const */
    2.17 -/* #undef inline */
    2.18 -/* #undef volatile */
    2.19 +#include <stdarg.h>
    2.20  
    2.21 -/* C datatypes */
    2.22 -/* #undef size_t */
    2.23 -/* #undef int8_t */
    2.24 -/* #undef uint8_t */
    2.25 -/* #undef int16_t */
    2.26 -/* #undef uint16_t */
    2.27 -/* #undef int32_t */
    2.28 -/* #undef uint32_t */
    2.29 -#define SDL_HAS_64BIT_TYPE 1
    2.30 -/* #undef int64_t */
    2.31 -/* #undef uint64_t */
    2.32 -/* #undef uintptr_t */
    2.33 -
    2.34 -/* Endianness */
    2.35 -#define SDL_BYTEORDER 1234
    2.36 -
    2.37 -/* Comment this if you want to build without any C library requirements */
    2.38 -#define HAVE_LIBC 1
    2.39 -#ifdef HAVE_LIBC
    2.40 -
    2.41 -/* Useful headers */
    2.42 -#define HAVE_SYS_TYPES_H 1
    2.43 -#define HAVE_STDIO_H 1
    2.44 -#define STDC_HEADERS 1
    2.45 -#define HAVE_STDLIB_H 1
    2.46 -#define HAVE_STDARG_H 1
    2.47 -#define HAVE_MALLOC_H 1
    2.48 -#define HAVE_MEMORY_H 1
    2.49 -#define HAVE_STRING_H 1
    2.50 -#define HAVE_STRINGS_H 1
    2.51 -#define HAVE_INTTYPES_H 1
    2.52 -#define HAVE_STDINT_H 1
    2.53 -#define HAVE_CTYPE_H 1
    2.54 -#define HAVE_MATH_H 1
    2.55 -#define HAVE_SIGNAL_H 1
    2.56 -/* #undef HAVE_ALTIVEC_H */
    2.57 -
    2.58 -/* C library functions */
    2.59 -#define HAVE_MALLOC 1
    2.60 -#define HAVE_CALLOC 1
    2.61 -#define HAVE_REALLOC 1
    2.62 -#define HAVE_FREE 1
    2.63 -#define HAVE_ALLOCA 1
    2.64 -#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */
    2.65 -#define HAVE_GETENV 1
    2.66 -#define HAVE_PUTENV 1
    2.67 -#define HAVE_UNSETENV 1
    2.68 -#endif
    2.69 -#define HAVE_QSORT 1
    2.70 -#define HAVE_ABS 1
    2.71 -#define HAVE_BCOPY 1
    2.72 -#define HAVE_MEMSET 1
    2.73 -#define HAVE_MEMCPY 1
    2.74 -#define HAVE_MEMMOVE 1
    2.75 -#define HAVE_MEMCMP 1
    2.76 -#define HAVE_STRLEN 1
    2.77 -#define HAVE_STRCPY 1
    2.78 -#define HAVE_STRNCPY 1
    2.79 -#define HAVE_STRCAT 1
    2.80 -#define HAVE_STRNCAT 1
    2.81 -#define HAVE_STRDUP 1
    2.82 -/* #undef HAVE__STRREV */
    2.83 -/* #undef HAVE__STRUPR */
    2.84 -/* #undef HAVE__STRLWR */
    2.85 -/* #undef HAVE_INDEX */
    2.86 -/* #undef HAVE_RINDEX */
    2.87 -#define HAVE_STRCHR 1
    2.88 -#define HAVE_STRRCHR 1
    2.89 -#define HAVE_STRSTR 1
    2.90 -/* #undef HAVE_ITOA */
    2.91 -/* #undef HAVE__LTOA */
    2.92 -/* #undef HAVE__UITOA */
    2.93 -/* #undef HAVE__ULTOA */
    2.94 -#define HAVE_STRTOL 1
    2.95 -/* #undef HAVE__I64TOA */
    2.96 -/* #undef HAVE__UI64TOA */
    2.97 -#define HAVE_STRTOLL 1
    2.98 -#define HAVE_STRTOD 1
    2.99 -#define HAVE_ATOI 1
   2.100 -#define HAVE_ATOF 1
   2.101 -#define HAVE_STRCMP 1
   2.102 -#define HAVE_STRNCMP 1
   2.103 -/* #undef HAVE_STRICMP */
   2.104 -#define HAVE_STRCASECMP 1
   2.105 -#define HAVE_SSCANF 1
   2.106 -#define HAVE_SNPRINTF 1
   2.107 -/* #undef HAVE_VSNPRINTF */
   2.108 -#define HAVE_SIGACTION 1
   2.109 -#define HAVE_SETJMP 1
   2.110 -#define HAVE_NANOSLEEP 1
   2.111 -/* #undef HAVE_CLOCK_GETTIME */
   2.112 -#define HAVE_DLVSYM 1
   2.113 -
   2.114 -#else
   2.115 -/* We may need some replacement for stdarg.h here */
   2.116 -#include <stdarg.h>
   2.117 -#endif /* HAVE_LIBC */
   2.118 -
   2.119 -/* General platform specific identifiers */
   2.120 -/* #undef TARGET_API_MAC_CARBON */
   2.121 -/* #undef TARGET_API_MAC_OSX */
   2.122 -
   2.123 -/* Allow disabling of core subsystems */
   2.124 -/* #undef SDL_AUDIO_DISABLED */
   2.125 -/* #undef SDL_CDROM_DISABLED */
   2.126 -/* #undef SDL_CPUINFO_DISABLED */
   2.127 -/* #undef SDL_EVENTS_DISABLED */
   2.128 -/* #undef SDL_FILE_DISABLED */
   2.129 -/* #undef SDL_JOYSTICK_DISABLED */
   2.130 -/* #undef SDL_LOADSO_DISABLED */
   2.131 -/* #undef SDL_THREADS_DISABLED */
   2.132 -/* #undef SDL_TIMERS_DISABLED */
   2.133 -/* #undef SDL_VIDEO_DISABLED */
   2.134 -
   2.135 -/* Enable various audio drivers */
   2.136 -/* #undef SDL_AUDIO_DRIVER_AHI */
   2.137 -#define SDL_AUDIO_DRIVER_ALSA 1
   2.138 -#define SDL_AUDIO_DRIVER_ALSA_DYNAMIC "libasound.so.2"
   2.139 -/* #undef SDL_AUDIO_DRIVER_ARTS */
   2.140 -/* #undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC */
   2.141 -/* #undef SDL_AUDIO_DRIVER_BAUDIO */
   2.142 -/* #undef SDL_AUDIO_DRIVER_COREAUDIO */
   2.143 -/* #undef SDL_AUDIO_DRIVER_DART */
   2.144 -/* #undef SDL_AUDIO_DRIVER_DC */
   2.145 -#define SDL_AUDIO_DRIVER_DISK 1
   2.146 -/* #undef SDL_AUDIO_DRIVER_DMEDIA */
   2.147 -/* #undef SDL_AUDIO_DRIVER_DRENDERER */
   2.148 -/* #undef SDL_AUDIO_DRIVER_DSOUND */
   2.149 -/* #undef SDL_AUDIO_DRIVER_ESD */
   2.150 -/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */
   2.151 -/* #undef SDL_AUDIO_DRIVER_MINT */
   2.152 -/* #undef SDL_AUDIO_DRIVER_MMEAUDIO */
   2.153 -/* #undef SDL_AUDIO_DRIVER_NAS */
   2.154 -/* #undef SDL_AUDIO_DRIVER_OPENBSD */
   2.155 -#define SDL_AUDIO_DRIVER_OSS 1
   2.156 -/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */
   2.157 -/* #undef SDL_AUDIO_DRIVER_PAUD */
   2.158 -/* #undef SDL_AUDIO_DRIVER_QNXNTO */
   2.159 -/* #undef SDL_AUDIO_DRIVER_SNDMGR */
   2.160 -/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */
   2.161 -/* #undef SDL_AUDIO_DRIVER_WAVEOUT */
   2.162 -
   2.163 -/* Enable various cdrom drivers */
   2.164 -/* #undef SDL_CDROM_AIX */
   2.165 -/* #undef SDL_CDROM_BEOS */
   2.166 -/* #undef SDL_CDROM_BSDI */
   2.167 -/* #undef SDL_CDROM_DC */
   2.168 -/* #undef SDL_CDROM_DUMMY */
   2.169 -/* #undef SDL_CDROM_FREEBSD */
   2.170 -#define SDL_CDROM_LINUX 1
   2.171 -/* #undef SDL_CDROM_MACOS */
   2.172 -/* #undef SDL_CDROM_MACOSX */
   2.173 -/* #undef SDL_CDROM_MINT */
   2.174 -/* #undef SDL_CDROM_OPENBSD */
   2.175 -/* #undef SDL_CDROM_OS2 */
   2.176 -/* #undef SDL_CDROM_OSF */
   2.177 -/* #undef SDL_CDROM_QNX */
   2.178 -/* #undef SDL_CDROM_WIN32 */
   2.179 -
   2.180 -/* Enable various input drivers */
   2.181 -/* #undef SDL_INPUT_TSLIB */
   2.182 -/* #undef SDL_JOYSTICK_AMIGA */
   2.183 -/* #undef SDL_JOYSTICK_BEOS */
   2.184 -/* #undef SDL_JOYSTICK_DC */
   2.185 -/* #undef SDL_JOYSTICK_DUMMY */
   2.186 -/* #undef SDL_JOYSTICK_IOKIT */
   2.187 -#define SDL_JOYSTICK_LINUX 1
   2.188 -/* #undef SDL_JOYSTICK_LINUXEV */
   2.189 -/* #undef SDL_JOYSTICK_MACOS */
   2.190 -/* #undef SDL_JOYSTICK_MINT */
   2.191 -/* #undef SDL_JOYSTICK_OS2 */
   2.192 -/* #undef SDL_JOYSTICK_RISCOS */
   2.193 -/* #undef SDL_JOYSTICK_WINMM */
   2.194 -/* #undef SDL_JOYSTICK_USBHID */
   2.195 -
   2.196 -/* Enable various shared object loading systems */
   2.197 -/* #undef SDL_LOADSO_BEOS */
   2.198 -/* #undef SDL_LOADSO_DLCOMPAT */
   2.199 -#define SDL_LOADSO_DLOPEN 1
   2.200 -/* #undef SDL_LOADSO_LDG */
   2.201 -/* #undef SDL_LOADSO_MACOS */
   2.202 -/* #undef SDL_LOADSO_OS2 */
   2.203 -/* #undef SDL_LOADSO_WIN32 */
   2.204 -
   2.205 -/* Enable various threading systems */
   2.206 -/* #undef SDL_THREAD_AMIGA */
   2.207 -/* #undef SDL_THREAD_BEOS */
   2.208 -/* #undef SDL_THREAD_DC */
   2.209 -/* #undef SDL_THREAD_EPOC */
   2.210 -/* #undef SDL_THREAD_OS2 */
   2.211 -/* #undef SDL_THREAD_PTH */
   2.212 -#define SDL_THREAD_PTHREAD 1
   2.213 -#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1
   2.214 -/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP */
   2.215 -/* #undef SDL_THREAD_SPROC */
   2.216 -/* #undef SDL_THREAD_WIN32 */
   2.217 -
   2.218 -/* Enable various timer systems */
   2.219 -/* #undef SDL_TIMER_AMIGA */
   2.220 -/* #undef SDL_TIMER_BEOS */
   2.221 -/* #undef SDL_TIMER_DC */
   2.222 -/* #undef SDL_TIMER_EPOC */
   2.223 -/* #undef SDL_TIMER_MACOS */
   2.224 -/* #undef SDL_TIMER_MINT */
   2.225 -/* #undef SDL_TIMER_OS2 */
   2.226 -/* #undef SDL_TIMER_RISCOS */
   2.227 -#define SDL_TIMER_UNIX 1
   2.228 -/* #undef SDL_TIMER_WIN32 */
   2.229 -/* #undef SDL_TIMER_WINCE */
   2.230 -
   2.231 -/* Enable various video drivers */
   2.232 -/* #undef SDL_VIDEO_DRIVER_AALIB */
   2.233 -/* #undef SDL_VIDEO_DRIVER_BWINDOW */
   2.234 -/* #undef SDL_VIDEO_DRIVER_CYBERGRAPHICS */
   2.235 -/* #undef SDL_VIDEO_DRIVER_DC */
   2.236 -/* #undef SDL_VIDEO_DRIVER_DDRAW */
   2.237 -#define SDL_VIDEO_DRIVER_DGA 1
   2.238 -/* #undef SDL_VIDEO_DRIVER_DIRECTFB */
   2.239 -/* #undef SDL_VIDEO_DRIVER_DRAWSPROCKET */
   2.240 -#define SDL_VIDEO_DRIVER_DUMMY 1
   2.241 -/* #undef SDL_VIDEO_DRIVER_EPOC */
   2.242 -#define SDL_VIDEO_DRIVER_FBCON 1
   2.243 -/* #undef SDL_VIDEO_DRIVER_GAPI */
   2.244 -/* #undef SDL_VIDEO_DRIVER_GEM */
   2.245 -/* #undef SDL_VIDEO_DRIVER_GGI */
   2.246 -/* #undef SDL_VIDEO_DRIVER_IPOD */
   2.247 -/* #undef SDL_VIDEO_DRIVER_NANOX */
   2.248 -/* #undef SDL_VIDEO_DRIVER_OS2FS */
   2.249 -/* #undef SDL_VIDEO_DRIVER_PHOTON */
   2.250 -/* #undef SDL_VIDEO_DRIVER_PICOGUI */
   2.251 -/* #undef SDL_VIDEO_DRIVER_PS2GS */
   2.252 -/* #undef SDL_VIDEO_DRIVER_QTOPIA */
   2.253 -/* #undef SDL_VIDEO_DRIVER_QUARTZ */
   2.254 -/* #undef SDL_VIDEO_DRIVER_RISCOS */
   2.255 -/* #undef SDL_VIDEO_DRIVER_SVGALIB */
   2.256 -/* #undef SDL_VIDEO_DRIVER_TOOLBOX */
   2.257 -/* #undef SDL_VIDEO_DRIVER_VGL */
   2.258 -/* #undef SDL_VIDEO_DRIVER_WINDIB */
   2.259 -/* #undef SDL_VIDEO_DRIVER_WSCONS */
   2.260 -#define SDL_VIDEO_DRIVER_X11 1
   2.261 -#define SDL_VIDEO_DRIVER_X11_DGAMOUSE 1
   2.262 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC "libX11.so.6"
   2.263 -#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "libXext.so.6"
   2.264 -#define SDL_VIDEO_DRIVER_X11_VIDMODE 1
   2.265 -#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
   2.266 -#define SDL_VIDEO_DRIVER_X11_XME 1
   2.267 -#define SDL_VIDEO_DRIVER_X11_XV 1
   2.268 -/* #undef SDL_VIDEO_DRIVER_XBIOS */
   2.269 -
   2.270 -/* Enable OpenGL support */
   2.271 -#define SDL_VIDEO_OPENGL 1
   2.272 -#define SDL_VIDEO_OPENGL_GLX 1
   2.273 -/* #undef SDL_VIDEO_OPENGL_WGL */
   2.274 -/* #undef SDL_VIDEO_OPENGL_OSMESA */
   2.275 -/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */
   2.276 -
   2.277 -/* Enable assembly blit routines */
   2.278 -#define SDL_ASSEMBLY_BLITTERS 1
   2.279 -#define SDL_HERMES_BLITTERS 1
   2.280 -/* #undef SDL_ALTIVEC_BLITTERS */
   2.281 +typedef signed char int8_t;
   2.282 +typedef unsigned char uint8_t;
   2.283 +typedef signed short int16_t;
   2.284 +typedef unsigned short uint16_t;
   2.285 +typedef signed int int32_t;
   2.286 +typedef unsigned int uint32_t;
   2.287 +typedef unsigned int size_t;
   2.288 +typedef unsigned long uintptr_t;
   2.289  
   2.290  #endif /* _SDL_config_h */
     3.1 --- a/include/SDL_config.h.in	Thu Feb 16 23:32:39 2006 +0000
     3.2 +++ b/include/SDL_config.h.in	Fri Feb 17 08:43:23 2006 +0000
     3.3 @@ -51,6 +51,7 @@
     3.4  #ifdef HAVE_LIBC
     3.5  
     3.6  /* Useful headers */
     3.7 +#undef HAVE_ALLOCA_H
     3.8  #undef HAVE_SYS_TYPES_H
     3.9  #undef HAVE_STDIO_H
    3.10  #undef STDC_HEADERS
     4.1 --- a/include/SDL_stdinc.h	Thu Feb 16 23:32:39 2006 +0000
     4.2 +++ b/include/SDL_stdinc.h	Fri Feb 17 08:43:23 2006 +0000
     4.3 @@ -28,15 +28,22 @@
     4.4  #include "SDL_config.h"
     4.5  
     4.6  /* AIX requires this to be the first thing in the file.  */
     4.7 -#ifndef __GNUC__
     4.8 -# if HAVE_ALLOCA_H
     4.9 -#  include <alloca.h>
    4.10 +#ifdef __GNUC__
    4.11 +# define alloca __builtin_alloca
    4.12 +#else
    4.13 +# ifdef _MSC_VER
    4.14 +#  include <malloc.h>
    4.15 +#  define alloca _alloca
    4.16  # else
    4.17 -#  ifdef _AIX
    4.18 +#  if HAVE_ALLOCA_H
    4.19 +#   include <alloca.h>
    4.20 +#  else
    4.21 +#   ifdef _AIX
    4.22   #pragma alloca
    4.23 -#  else
    4.24 -#   ifndef alloca /* predefined by HP cc +Olibcalls */
    4.25 +#   else
    4.26 +#    ifndef alloca /* predefined by HP cc +Olibcalls */
    4.27  char *alloca ();
    4.28 +#    endif
    4.29  #   endif
    4.30  #  endif
    4.31  # endif
     5.1 --- a/src/audio/baudio/SDL_beaudio.cc	Thu Feb 16 23:32:39 2006 +0000
     5.2 +++ b/src/audio/baudio/SDL_beaudio.cc	Fri Feb 17 08:43:23 2006 +0000
     5.3 @@ -24,14 +24,14 @@
     5.4  
     5.5  #include <SoundPlayer.h>
     5.6  
     5.7 -#include "SDL_BeApp.h"
     5.8 +#include "../../main/beos/SDL_BeApp.h"
     5.9  
    5.10  extern "C" {
    5.11  
    5.12  #include "SDL_audio.h"
    5.13  #include "../SDL_audio_c.h"
    5.14  #include "../SDL_sysaudio.h"
    5.15 -#include "../../thread/SDL_systhread_c.h"
    5.16 +#include "../../thread/beos/SDL_systhread_c.h"
    5.17  #include "SDL_beaudio.h"
    5.18  
    5.19  
     6.1 --- a/src/audio/esd/SDL_esdaudio.c	Thu Feb 16 23:32:39 2006 +0000
     6.2 +++ b/src/audio/esd/SDL_esdaudio.c	Fri Feb 17 08:43:23 2006 +0000
     6.3 @@ -22,10 +22,7 @@
     6.4  
     6.5  /* Allow access to an ESD network stream mixing buffer */
     6.6  
     6.7 -#ifdef ESD_SUPPORT
     6.8 -
     6.9  #include <errno.h>
    6.10 -
    6.11  #include <esd.h>
    6.12  
    6.13  #include "SDL_timer.h"
    6.14 @@ -320,5 +317,3 @@
    6.15  	/* We're ready to rock and roll. :-) */
    6.16  	return(0);
    6.17  }
    6.18 -
    6.19 -#endif /* ESD_SUPPORT */
     7.1 --- a/src/main/Makefile.am	Thu Feb 16 23:32:39 2006 +0000
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,45 +0,0 @@
     7.4 -
     7.5 -## Makefile.am for the main() function in the SDL library
     7.6 -#
     7.7 -# This is necessary because some platforms have special program
     7.8 -# entry points, which require special application initialization.
     7.9 -
    7.10 -# Build a separate library containing the main() entry point.
    7.11 -lib_LIBRARIES = libSDLmain.a
    7.12 -
    7.13 -if TARGET_WIN32
    7.14 -MAINLIB_ARCH_SRCS = win32/SDL_win32_main.c
    7.15 -else
    7.16 -if TARGET_MACOSX
    7.17 -if USE_COCOA
    7.18 -MAINLIB_ARCH_SRCS = macosx/SDLMain.m macosx/SDLMain.h
    7.19 -else
    7.20 -if USE_CARBON
    7.21 -MAINLIB_ARCH_SRCS = macos/SDL_main.c
    7.22 -endif # USE_CARBON
    7.23 -endif # USE_COCOA
    7.24 -else
    7.25 -if TARGET_QTOPIA
    7.26 -MAINLIB_ARCH_SRCS = qtopia/SDL_qtopia_main.cc
    7.27 -else
    7.28 -MAINLIB_ARCH_SRCS = dummy/SDL_dummy_main.c
    7.29 -endif # !TARGET_QTOPIA
    7.30 -endif # !TARGET_MACOSX
    7.31 -endif # !TARGET_WIN32
    7.32 -libSDLmain_a_SOURCES = $(MAINLIB_ARCH_SRCS)
    7.33 -
    7.34 -# Build an internal library of any special app setup functions
    7.35 -noinst_LTLIBRARIES = libarch.la
    7.36 -
    7.37 -if TARGET_BEOS
    7.38 -ARCH_SRCS = beos/SDL_BeApp.cc beos/SDL_BeApp.h
    7.39 -else
    7.40 -ARCH_SRCS = arch.c
    7.41 -endif
    7.42 -
    7.43 -libarch_la_SOURCES = $(ARCH_SRCS)
    7.44 -
    7.45 -exports:
    7.46 -	for i in $(srcdir)/*; do if [ -d $$i/exports ]; then (cd $$i/exports; make); fi; done
    7.47 -
    7.48 -EXTRA_DIST = beos dummy epoc linux macos macosx qtopia win32
     8.1 --- a/src/main/arch.c	Thu Feb 16 23:32:39 2006 +0000
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,4 +0,0 @@
     8.4 -
     8.5 -/* This is needed for automake, so that it can build an empty archive */
     8.6 -
     8.7 -int pointless_symbol_so_the_archive_doesnt_look_empty;
     9.1 --- a/src/video/bwindow/SDL_BWin.h	Thu Feb 16 23:32:39 2006 +0000
     9.2 +++ b/src/video/bwindow/SDL_BWin.h	Fri Feb 17 08:43:23 2006 +0000
     9.3 @@ -23,6 +23,8 @@
     9.4  #ifndef _SDL_BWin_h
     9.5  #define _SDL_BWin_h
     9.6  
     9.7 +#include "SDL_config.h"
     9.8 +
     9.9  #include <stdio.h>
    9.10  #include <AppKit.h>
    9.11  #include <InterfaceKit.h>
    9.12 @@ -32,7 +34,7 @@
    9.13  #endif
    9.14  #include <support/UTF8.h>
    9.15  
    9.16 -#include "SDL_BeApp.h"
    9.17 +#include "../../main/beos/SDL_BeApp.h"
    9.18  #include "SDL_events.h"
    9.19  #include "SDL_BView.h"
    9.20  
    10.1 --- a/src/video/bwindow/SDL_sysvideo.cc	Thu Feb 16 23:32:39 2006 +0000
    10.2 +++ b/src/video/bwindow/SDL_sysvideo.cc	Fri Feb 17 08:43:23 2006 +0000
    10.3 @@ -24,15 +24,14 @@
    10.4  
    10.5  #include <unistd.h>
    10.6  
    10.7 -#include "SDL_BeApp.h"
    10.8  #include "SDL_BWin.h"
    10.9  #include "SDL_timer.h"
   10.10  
   10.11  extern "C" {
   10.12  
   10.13  #include "../SDL_sysvideo.h"
   10.14 -#include "../../events/SDL_sysevents_c.h"
   10.15  #include "../../events/SDL_events_c.h"
   10.16 +#include "SDL_sysevents_c.h"
   10.17  #include "SDL_sysmouse_c.h"
   10.18  #include "SDL_syswm_c.h"
   10.19  #include "SDL_lowvideo.h"
    11.1 --- a/test/configure.in	Thu Feb 16 23:32:39 2006 +0000
    11.2 +++ b/test/configure.in	Fri Feb 17 08:43:23 2006 +0000
    11.3 @@ -18,6 +18,8 @@
    11.4  
    11.5  AC_C_CONST
    11.6  
    11.7 +FIXME: add math library for testsprite
    11.8 +
    11.9  dnl Figure out which math library to use
   11.10  case "$target" in
   11.11      *-*-cygwin* | *-*-mingw32*)