New configure-based build system. Still work in progress, but much improved

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%401365

Makefile.am

-# The top-level input Makefile for SDL
-
-# require automake 1.4
-AUTOMAKE_OPTIONS = 1.4
-
-## Any directories that you want built and installed should go here.
-SUBDIRS = src include docs
-
-## Any directories you want a part of the distribution should be listed
-## here, as well as have a Makefile generated at the end of configure.in
-##
-## This only works for subdirectories one level deep.
-DIST_SUBDIRS = $(SUBDIRS)
-
-# SDL runtime configuration script
-bin_SCRIPTS = sdl-config
-
-# All the rest of the distributed files
-EXTRA_DIST =		\
-	BUGS		\
-	TODO		\
-	COPYING		\
-	CREDITS		\
-	INSTALL		\
-	README		\
-	README.AmigaOS	\
-	README.CVS	\
-	README.DC	\
-	README.Epoc	\
-	README.MacOS	\
-	README.MacOSX	\
-	README.MiNT	\
-	README.NanoX	\
-	README.PicoGUI	\
-	README.QNX	\
-	README.Qtopia	\
-	README.WinCE	\
-	README-SDL.txt	\
-	Borland.html	\
-	Borland.zip	\
-	VisualC.html	\
-	VisualC.zip	\
-	VisualCE.zip	\
-	Makefile.dc	\
-	MPWmake.sea.bin	\
-	CWprojects.sea.bin \
-	PBProjects.tar.gz \
-	EpocBuildFiles.zip \
-	Xcode.tar.gz	\
-	Xcode21.tar.gz	\
-	XcodeUniversal.tar.gz	\
-	WhatsNew	\
-	docs.html	\
-	sdl.m4		\
-	SDL.spec	\
-	autogen.sh	\
-	strip_fPIC.sh
-
-# M4 macro file for inclusion with autoconf
-m4datadir = $(datadir)/aclocal
-m4data_DATA = sdl.m4
-
-# Rule to build tar-gzipped distribution package
-$(PACKAGE)-$(VERSION).tar.gz: dist
-
-# Rule to build RPM distribution package
-rpm: $(PACKAGE)-$(VERSION).tar.gz
-	rpm -ta $(PACKAGE)-$(VERSION).tar.gz
-
-# Rule to rebuild the export lists for BeOS, MacOS and Win32.
-exports:
-	(cd src/main/beos/exports; $(MAKE))
-	(cd src/main/macos/exports; $(MAKE))
-	(cd src/main/macosx/exports; $(MAKE))
-	(cd src/main/win32/exports; $(MAKE))
-
-# Rule to build the Project Builder archive in MacOS X
-PBProjects.tar.gz:
-	rm -f `find . -name .DS_Store`
-	if [ -d PBProjects ]; then \
-	    tar zcvf $@ PBProjects; \
-	fi
-
-# Rule to install the libraries only - prevent rebuilding apps
-install-lib:
-	cd src && $(MAKE) install-libLTLIBRARIES
-
-# Run ldconfig after installing the library:
-install-hook:
-	-ldconfig
-
-# Grab the test programs for the distribution:
-dist-hook:
-	if test -f test/Makefile; then (cd test; make distclean); fi
-	rm -rf $(srcdir)/test/autom4te*
-	cp -rp $(srcdir)/test $(distdir)
-	rm -rf `find $(distdir) -type d -name CVS -print`
-
-# Create a CVS snapshot that people can run update -d on
-CVSROOT = :pserver:guest@libsdl.org:/home/sdlweb/libsdl.org/cvs
-snapshot:
-	cvs -d $(CVSROOT) login
-	cvs -d $(CVSROOT) checkout SDL12
-	(cd SDL12 && ./autogen.sh && rm -rf autom4te.cache)
-	mv SDL12 SDL-1.2
-	tar zcvf $(HOME)/SDL-1.2.tar.gz SDL-1.2
-	rm -rf SDL-1.2
-snapshot13:
-	cvs -d $(CVSROOT) login
-	cvs -d $(CVSROOT) checkout -r branch_1_3_x SDL12
-	(cd SDL12 && ./autogen.sh && rm -rf autom4te.cache)
-	mv SDL12 SDL-1.3
-	tar zcvf $(HOME)/SDL-1.3.tar.gz SDL-1.3
-	rm -rf SDL-1.3

SDL.spec.in

 Summary: Simple DirectMedia Layer
-Name: @PACKAGE@
-Version: @VERSION@
+Name: SDL
+Version: @SDL_VERSION@
 Release: 1
 Source: http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 URL: http://www.libsdl.org/
@@ -45,7 +45,12 @@ make
 %install
 rm -rf $RPM_BUILD_ROOT
 %ifos linux
-make install prefix=$RPM_BUILD_ROOT/%{prefix}
+make install prefix=$RPM_BUILD_ROOT/%{prefix} \
+             bindir=$RPM_BUILD_ROOT/%{_bindir} \
+             libdir=$RPM_BUILD_ROOT/%{_libdir} \
+             includedir=$RPM_BUILD_ROOT/%{_includedir} \
+             datadir=$RPM_BUILD_ROOT/%{_datadir} \
+             mandir=$RPM_BUILD_ROOT/%{_mandir}
 ln -s libSDL-1.2.so.0 $RPM_BUILD_ROOT/%{prefix}/lib/libSDL-1.1.so.0
 %else
 %makeinstall
@@ -81,8 +86,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*.%{__soext}
 %dir %{_includedir}/SDL
 %{_includedir}/SDL/*.h
-%{_mandir}/man3/*
 %{_datadir}/aclocal/*
+%{_mandir}/man3/*
 
 %changelog
 * Mon Jan 03 2004 Anders Bjorklund <afb@algonet.se>

TODO

 
+Update project files
+Create general SDL_config.h
+Create stubs for all the disabled subsystems
+Test all the platforms and drivers
+
 Wish list for the 1.3 development branch:
 
  * Use /etc/fb.modes, if available, like GGI does

acinclude.m4

-# Local macros for the SDL configure.in script
-
-dnl Function to link an architecture specific file
-dnl LINK_ARCH_SRC(source_dir, arch, source_file)
-AC_DEFUN([COPY_ARCH_SRC],
-[
-  old="$srcdir/$1/$2/$3"
-  new="$1/$3"
-  if test ! -d $1; then
-    echo "Creating directory $1"
-    mkdir -p $1
-  fi
-  echo "Copying $old -> $new"
-  cat >$new <<__EOF__
-/* WARNING:  This file was automatically generated!
- * Original: $old
- */
-__EOF__
-  cat >>$new <$old
-])
-
 ##############################################################################
 dnl Configure Paths for Alsa
 dnl Some modifications by Richard Boulton <richard-alsa@tartarus.org>
@@ -1010,6 +989,12 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
+  beos*)
+    # On BeOS, this test takes a really really long time.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
   amigaos*)
     # On AmigaOS with pdksh, this test takes hours, literally.
     # So we just punt and use a minimum line length of 8192.

autogen.sh

 #!/bin/sh
 #
-echo "Generating build information using aclocal, automake and autoconf"
+echo "Generating build information using aclocal and autoconf"
 echo "This may take a while ..."
 
-# Touch the timestamps on all the files since CVS messes them up
-directory=`dirname $0`
-touch $directory/configure.in
-touch $directory/include/SDL_config.h.in
-
 # Regenerate configuration files
-aclocal || exit 1
-automake --foreign --include-deps --add-missing --copy || exit 1
-autoconf || exit 1
-(cd test; aclocal; automake --foreign --include-deps --add-missing --copy; autoconf)
+(aclocal && autoconf) || exit $?
+(cd test; aclocal; autoconf)
 
 # Run configure for this platform
-#./configure $*
 echo "Now you are ready to run ./configure"

build-scripts/install-sh

+#!/bin/sh
+# install - install a program, script, or datafile
+
+scriptversion=2005-02-02.21
+
+# This originates from X11R5 (mit/util/scripts/install.sh), which was
+# later released in X11R6 (xc/config/util/install.sh) with the
+# following copyright and license.
+#
+# Copyright (C) 1994 X Consortium
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Except as contained in this notice, the name of the X Consortium shall not
+# be used in advertising or otherwise to promote the sale, use or other deal-
+# ings in this Software without prior written authorization from the X Consor-
+# tium.
+#
+#
+# FSF changes to this file are in the public domain.
+#
+# Calling this script install-sh is preferred over install.sh, to prevent
+# `make' implicit rules from creating a file called install from it
+# when there is no Makefile.
+#
+# This script is compatible with the BSD install script, but was written
+# from scratch.  It can only install one file at a time, a restriction
+# shared with many OS's install programs.
+
+# set DOITPROG to echo to test this script
+
+# Don't use :- since 4.3BSD and earlier shells don't like it.
+doit="${DOITPROG-}"
+
+# put in absolute paths if you don't have them in your path; or use env. vars.
+
+mvprog="${MVPROG-mv}"
+cpprog="${CPPROG-cp}"
+chmodprog="${CHMODPROG-chmod}"
+chownprog="${CHOWNPROG-chown}"
+chgrpprog="${CHGRPPROG-chgrp}"
+stripprog="${STRIPPROG-strip}"
+rmprog="${RMPROG-rm}"
+mkdirprog="${MKDIRPROG-mkdir}"
+
+chmodcmd="$chmodprog 0755"
+chowncmd=
+chgrpcmd=
+stripcmd=
+rmcmd="$rmprog -f"
+mvcmd="$mvprog"
+src=
+dst=
+dir_arg=
+dstarg=
+no_target_directory=
+
+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+   or: $0 [OPTION]... SRCFILES... DIRECTORY
+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+   or: $0 [OPTION]... -d DIRECTORIES...
+
+In the 1st form, copy SRCFILE to DSTFILE.
+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+In the 4th, create DIRECTORIES.
+
+Options:
+-c         (ignored)
+-d         create directories instead of installing files.
+-g GROUP   $chgrpprog installed files to GROUP.
+-m MODE    $chmodprog installed files to MODE.
+-o USER    $chownprog installed files to USER.
+-s         $stripprog installed files.
+-t DIRECTORY  install into DIRECTORY.
+-T         report an error if DSTFILE is a directory.
+--help     display this help and exit.
+--version  display version info and exit.
+
+Environment variables override the default commands:
+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+"
+
+while test -n "$1"; do
+  case $1 in
+    -c) shift
+        continue;;
+
+    -d) dir_arg=true
+        shift
+        continue;;
+
+    -g) chgrpcmd="$chgrpprog $2"
+        shift
+        shift
+        continue;;
+
+    --help) echo "$usage"; exit $?;;
+
+    -m) chmodcmd="$chmodprog $2"
+        shift
+        shift
+        continue;;
+
+    -o) chowncmd="$chownprog $2"
+        shift
+        shift
+        continue;;
+
+    -s) stripcmd=$stripprog
+        shift
+        continue;;
+
+    -t) dstarg=$2
+	shift
+	shift
+	continue;;
+
+    -T) no_target_directory=true
+	shift
+	continue;;
+
+    --version) echo "$0 $scriptversion"; exit $?;;
+
+    *)  # When -d is used, all remaining arguments are directories to create.
+	# When -t is used, the destination is already specified.
+	test -n "$dir_arg$dstarg" && break
+        # Otherwise, the last argument is the destination.  Remove it from $@.
+	for arg
+	do
+          if test -n "$dstarg"; then
+	    # $@ is not empty: it contains at least $arg.
+	    set fnord "$@" "$dstarg"
+	    shift # fnord
+	  fi
+	  shift # arg
+	  dstarg=$arg
+	done
+	break;;
+  esac
+done
+
+if test -z "$1"; then
+  if test -z "$dir_arg"; then
+    echo "$0: no input file specified." >&2
+    exit 1
+  fi
+  # It's OK to call `install-sh -d' without argument.
+  # This can happen when creating conditional directories.
+  exit 0
+fi
+
+for src
+do
+  # Protect names starting with `-'.
+  case $src in
+    -*) src=./$src ;;
+  esac
+
+  if test -n "$dir_arg"; then
+    dst=$src
+    src=
+
+    if test -d "$dst"; then
+      mkdircmd=:
+      chmodcmd=
+    else
+      mkdircmd=$mkdirprog
+    fi
+  else
+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
+    # might cause directories to be created, which would be especially bad
+    # if $src (and thus $dsttmp) contains '*'.
+    if test ! -f "$src" && test ! -d "$src"; then
+      echo "$0: $src does not exist." >&2
+      exit 1
+    fi
+
+    if test -z "$dstarg"; then
+      echo "$0: no destination specified." >&2
+      exit 1
+    fi
+
+    dst=$dstarg
+    # Protect names starting with `-'.
+    case $dst in
+      -*) dst=./$dst ;;
+    esac
+
+    # If destination is a directory, append the input filename; won't work
+    # if double slashes aren't ignored.
+    if test -d "$dst"; then
+      if test -n "$no_target_directory"; then
+	echo "$0: $dstarg: Is a directory" >&2
+	exit 1
+      fi
+      dst=$dst/`basename "$src"`
+    fi
+  fi
+
+  # This sed command emulates the dirname command.
+  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
+
+  # Make sure that the destination directory exists.
+
+  # Skip lots of stat calls in the usual case.
+  if test ! -d "$dstdir"; then
+    defaultIFS='
+	 '
+    IFS="${IFS-$defaultIFS}"
+
+    oIFS=$IFS
+    # Some sh's can't handle IFS=/ for some reason.
+    IFS='%'
+    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+    shift
+    IFS=$oIFS
+
+    pathcomp=
+
+    while test $# -ne 0 ; do
+      pathcomp=$pathcomp$1
+      shift
+      if test ! -d "$pathcomp"; then
+        $mkdirprog "$pathcomp"
+	# mkdir can fail with a `File exist' error in case several
+	# install-sh are creating the directory concurrently.  This
+	# is OK.
+	test -d "$pathcomp" || exit
+      fi
+      pathcomp=$pathcomp/
+    done
+  fi
+
+  if test -n "$dir_arg"; then
+    $doit $mkdircmd "$dst" \
+      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
+  else
+    dstfile=`basename "$dst"`
+
+    # Make a couple of temp file names in the proper directory.
+    dsttmp=$dstdir/_inst.$$_
+    rmtmp=$dstdir/_rm.$$_
+
+    # Trap to clean up those temp files at exit.
+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+    trap '(exit $?); exit' 1 2 13 15
+
+    # Copy the file name to the temp name.
+    $doit $cpprog "$src" "$dsttmp" &&
+
+    # and set any options; do chmod last to preserve setuid bits.
+    #
+    # If any of these fail, we abort the whole thing.  If we want to
+    # ignore errors from any of these, just make sure not to ignore
+    # errors from the above "$doit $cpprog $src $dsttmp" command.
+    #
+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
+
+    # Now rename the file to the real destination.
+    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
+      || {
+	   # The rename failed, perhaps because mv can't rename something else
+	   # to itself, or perhaps because mv is so ancient that it does not
+	   # support -f.
+
+	   # Now remove or move aside any old file at destination location.
+	   # We try this two ways since rm can't unlink itself on some
+	   # systems and the destination file might be busy for other
+	   # reasons.  In this case, the final cleanup might fail but the new
+	   # file should still install successfully.
+	   {
+	     if test -f "$dstdir/$dstfile"; then
+	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
+	       || {
+		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
+		 (exit 1); exit 1
+	       }
+	     else
+	       :
+	     fi
+	   } &&
+
+	   # Now rename the file to the real destination.
+	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
+	 }
+    }
+  fi || { (exit 1); exit 1; }
+done
+
+# The final little trick to "correctly" pass the exit status to the exit trap.
+{
+  (exit 0); exit 0
+}
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
+# End:

build-scripts/makedep.sh

+#!/bin/sh
+#
+# Generate dependencies from a list of source files
+
+# Check to make sure our environment variables are set
+if test x"$INCLUDE" = x -o x"$SOURCES" = x -o x"$objects" = x -o x"$output" = x; then
+    echo "SOURCES, INCLUDE, objects, and output needs to be set"
+    exit 1
+fi
+cache_prefix=".#$$"
+
+generate_var()
+{
+    echo $1 | sed -e 's|^.*/||' -e 's|\.|_|g'
+}
+
+search_deps()
+{
+    base=`echo $1 | sed 's|/[^/]*$||'`
+    grep '#include "' <$1 | sed -e 's|.*"\([^"]*\)".*|\1|' | \
+    while read file
+    do cache=${cache_prefix}_`generate_var $file`
+       if test -f $cache; then
+          # We already ahve this cached
+          cat $cache
+          continue;
+       fi
+       for path in $base `echo $INCLUDE | sed 's|-I||g'`
+       do dep="$path/$file"
+          if test -f "$dep"; then
+             echo "	$dep \\" >$cache
+             echo "	$dep \\"
+             generate_dep $dep
+             break
+          fi
+       done
+    done
+}
+
+generate_dep()
+{
+    cat >>${output}.new <<__EOF__
+$1:	\\
+`search_deps $1`
+
+__EOF__
+}
+
+:>${output}.new
+for src in $SOURCES
+do  echo "Generating dependencies for $src"
+    generate_dep $src
+    ext=`echo $src | sed 's|.*\.\(.*\)|\1|'`
+    obj=`echo $src | sed "s|^.*/\([^ ]*\)\..*|$objects/\1.lo|g"`
+    echo "$obj: $src" >>${output}.new
+    case $ext in
+        asm) echo "	\$(BUILDASM)" >>${output}.new;;
+        cc)  echo "	\$(BUILDCC)" >>${output}.new;;
+        c)   echo "	\$(BUILDC)" >>${output}.new;;
+        m)   echo "	\$(BUILDM)" >>${output}.new;;
+        *)   echo "Unknown file extension: $ext";;
+    esac
+    echo "" >>${output}.new
+done
+rm -f ${cache_prefix}*
+mv ${output}.new ${output}

build-scripts/mkinstalldirs

+#! /bin/sh
+# mkinstalldirs --- make directory hierarchy
+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Created: 1993-05-16
+# Public domain
+
+errstatus=0
+dirmode=""
+
+usage="\
+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+
+# process command line arguments
+while test $# -gt 0 ; do
+   case "${1}" in
+     -h | --help | --h* )			# -h for help
+	echo "${usage}" 1>&2; exit 0 ;;
+     -m )					# -m PERM arg
+	shift
+	test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
+	dirmode="${1}"
+	shift ;;
+     -- ) shift; break ;;			# stop option processing
+     -* ) echo "${usage}" 1>&2; exit 1 ;;	# unknown option
+     * )  break ;;				# first non-opt arg
+   esac
+done
+
+for file
+do
+  if test -d "$file"; then
+    shift
+  else
+    break
+  fi
+done
+
+case $# in
+0) exit 0 ;;
+esac
+
+case $dirmode in
+'')
+  if mkdir -p -- . 2>/dev/null; then
+    echo "mkdir -p -- $*"
+    exec mkdir -p -- "$@"
+  fi ;;
+*)
+  if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
+    echo "mkdir -m $dirmode -p -- $*"
+    exec mkdir -m "$dirmode" -p -- "$@"
+  fi ;;
+esac
+
+for file
+do
+   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+   shift
+
+   pathcomp=
+   for d
+   do
+     pathcomp="$pathcomp$d"
+     case "$pathcomp" in
+       -* ) pathcomp=./$pathcomp ;;
+     esac
+
+     if test ! -d "$pathcomp"; then
+	echo "mkdir $pathcomp"
+
+	mkdir "$pathcomp" || lasterr=$?
+
+	if test ! -d "$pathcomp"; then
+	  errstatus=$lasterr
+	else
+	  if test ! -z "$dirmode"; then
+	     echo "chmod $dirmode $pathcomp"
+
+	     lasterr=""
+	     chmod "$dirmode" "$pathcomp" || lasterr=$?
+
+	     if test ! -z "$lasterr"; then
+	       errstatus=$lasterr
+	     fi
+	  fi
+	fi
+     fi
+
+     pathcomp="$pathcomp/"
+   done
+done
+
+exit $errstatus
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 3
+# End:
+# mkinstalldirs ends here

include/SDL_config.h

+/* include/SDL_config.h.  Generated by configure.  */
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+
+#ifndef _SDL_config_h
+#define _SDL_config_h
+
+/* This is a set of defines to configure the SDL features */
+
+/* C language features */
+/* #undef const */
+/* #undef inline */
+/* #undef volatile */
+
+/* C datatypes */
+/* #undef size_t */
+/* #undef int8_t */
+/* #undef uint8_t */
+/* #undef int16_t */
+/* #undef uint16_t */
+/* #undef int32_t */
+/* #undef uint32_t */
+#define SDL_HAS_64BIT_TYPE 1
+/* #undef int64_t */
+/* #undef uint64_t */
+/* #undef uintptr_t */
+
+/* Endianness */
+#define SDL_BYTEORDER 1234
+
+/* Comment this if you want to build without any C library requirements */
+#define HAVE_LIBC 1
+#ifdef HAVE_LIBC
+
+/* Useful headers */
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_STDIO_H 1
+#define STDC_HEADERS 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STDARG_H 1
+#define HAVE_MALLOC_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_STRING_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H 1
+#define HAVE_CTYPE_H 1
+#define HAVE_MATH_H 1
+#define HAVE_SIGNAL_H 1
+/* #undef HAVE_ALTIVEC_H */
+
+/* C library functions */
+#define HAVE_MALLOC 1
+#define HAVE_CALLOC 1
+#define HAVE_REALLOC 1
+#define HAVE_FREE 1
+#define HAVE_ALLOCA 1
+#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */
+#define HAVE_GETENV 1
+#define HAVE_PUTENV 1
+#define HAVE_UNSETENV 1
+#endif
+#define HAVE_QSORT 1
+#define HAVE_ABS 1
+#define HAVE_BCOPY 1
+#define HAVE_MEMSET 1
+#define HAVE_MEMCPY 1
+#define HAVE_MEMMOVE 1
+#define HAVE_MEMCMP 1
+#define HAVE_STRLEN 1
+#define HAVE_STRCPY 1
+#define HAVE_STRNCPY 1
+#define HAVE_STRCAT 1
+#define HAVE_STRNCAT 1
+#define HAVE_STRDUP 1
+/* #undef HAVE__STRREV */
+/* #undef HAVE__STRUPR */
+/* #undef HAVE__STRLWR */
+/* #undef HAVE_INDEX */
+/* #undef HAVE_RINDEX */
+#define HAVE_STRCHR 1
+#define HAVE_STRRCHR 1
+#define HAVE_STRSTR 1
+/* #undef HAVE_ITOA */
+/* #undef HAVE__LTOA */
+/* #undef HAVE__UITOA */
+/* #undef HAVE__ULTOA */
+#define HAVE_STRTOL 1
+/* #undef HAVE__I64TOA */
+/* #undef HAVE__UI64TOA */
+#define HAVE_STRTOLL 1
+#define HAVE_STRTOD 1
+#define HAVE_ATOI 1
+#define HAVE_ATOF 1
+#define HAVE_STRCMP 1
+#define HAVE_STRNCMP 1
+/* #undef HAVE_STRICMP */
+#define HAVE_STRCASECMP 1
+#define HAVE_SSCANF 1
+#define HAVE_SNPRINTF 1
+/* #undef HAVE_VSNPRINTF */
+#define HAVE_SIGACTION 1
+#define HAVE_SETJMP 1
+#define HAVE_NANOSLEEP 1
+/* #undef HAVE_CLOCK_GETTIME */
+#define HAVE_DLVSYM 1
+
+#else
+/* We may need some replacement for stdarg.h here */
+#include <stdarg.h>
+#endif /* HAVE_LIBC */
+
+/* General platform specific identifiers */
+/* #undef TARGET_API_MAC_CARBON */
+/* #undef TARGET_API_MAC_OSX */
+
+/* Allow disabling of core subsystems */
+/* #undef SDL_AUDIO_DISABLED */
+/* #undef SDL_CDROM_DISABLED */
+/* #undef SDL_CPUINFO_DISABLED */
+/* #undef SDL_EVENTS_DISABLED */
+/* #undef SDL_FILE_DISABLED */
+/* #undef SDL_JOYSTICK_DISABLED */
+/* #undef SDL_LOADSO_DISABLED */
+/* #undef SDL_THREADS_DISABLED */
+/* #undef SDL_TIMERS_DISABLED */
+/* #undef SDL_VIDEO_DISABLED */
+
+/* Enable various audio drivers */
+/* #undef SDL_AUDIO_DRIVER_AHI */
+#define SDL_AUDIO_DRIVER_ALSA 1
+#define SDL_AUDIO_DRIVER_ALSA_DYNAMIC "libasound.so.2"
+/* #undef SDL_AUDIO_DRIVER_ARTS */
+/* #undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC */
+/* #undef SDL_AUDIO_DRIVER_BAUDIO */
+/* #undef SDL_AUDIO_DRIVER_COREAUDIO */
+/* #undef SDL_AUDIO_DRIVER_DART */
+/* #undef SDL_AUDIO_DRIVER_DC */
+#define SDL_AUDIO_DRIVER_DISK 1
+/* #undef SDL_AUDIO_DRIVER_DMEDIA */
+/* #undef SDL_AUDIO_DRIVER_DRENDERER */
+/* #undef SDL_AUDIO_DRIVER_DSOUND */
+/* #undef SDL_AUDIO_DRIVER_ESD */
+/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */
+/* #undef SDL_AUDIO_DRIVER_MINT */
+/* #undef SDL_AUDIO_DRIVER_MMEAUDIO */
+/* #undef SDL_AUDIO_DRIVER_NAS */
+/* #undef SDL_AUDIO_DRIVER_OPENBSD */
+#define SDL_AUDIO_DRIVER_OSS 1
+/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */
+/* #undef SDL_AUDIO_DRIVER_PAUD */
+/* #undef SDL_AUDIO_DRIVER_QNXNTO */
+/* #undef SDL_AUDIO_DRIVER_SNDMGR */
+/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */
+/* #undef SDL_AUDIO_DRIVER_WAVEOUT */
+
+/* Enable various cdrom drivers */
+/* #undef SDL_CDROM_AIX */
+/* #undef SDL_CDROM_BEOS */
+/* #undef SDL_CDROM_BSDI */
+/* #undef SDL_CDROM_DC */
+/* #undef SDL_CDROM_DUMMY */
+/* #undef SDL_CDROM_FREEBSD */
+#define SDL_CDROM_LINUX 1
+/* #undef SDL_CDROM_MACOS */
+/* #undef SDL_CDROM_MACOSX */
+/* #undef SDL_CDROM_MINT */
+/* #undef SDL_CDROM_OPENBSD */
+/* #undef SDL_CDROM_OS2 */
+/* #undef SDL_CDROM_OSF */
+/* #undef SDL_CDROM_QNX */
+/* #undef SDL_CDROM_WIN32 */
+
+/* Enable various input drivers */
+/* #undef SDL_INPUT_TSLIB */
+/* #undef SDL_JOYSTICK_AMIGA */
+/* #undef SDL_JOYSTICK_BEOS */
+/* #undef SDL_JOYSTICK_DC */
+/* #undef SDL_JOYSTICK_DUMMY */
+/* #undef SDL_JOYSTICK_IOKIT */
+#define SDL_JOYSTICK_LINUX 1
+/* #undef SDL_JOYSTICK_LINUXEV */
+/* #undef SDL_JOYSTICK_MACOS */
+/* #undef SDL_JOYSTICK_MINT */
+/* #undef SDL_JOYSTICK_OS2 */
+/* #undef SDL_JOYSTICK_RISCOS */
+/* #undef SDL_JOYSTICK_WINMM */
+/* #undef SDL_JOYSTICK_USBHID */
+
+/* Enable various shared object loading systems */
+/* #undef SDL_LOADSO_BEOS */
+/* #undef SDL_LOADSO_DLCOMPAT */
+#define SDL_LOADSO_DLOPEN 1
+/* #undef SDL_LOADSO_LDG */
+/* #undef SDL_LOADSO_MACOS */
+/* #undef SDL_LOADSO_OS2 */
+/* #undef SDL_LOADSO_WIN32 */
+
+/* Enable various threading systems */
+/* #undef SDL_THREAD_AMIGA */
+/* #undef SDL_THREAD_BEOS */
+/* #undef SDL_THREAD_DC */
+/* #undef SDL_THREAD_EPOC */
+/* #undef SDL_THREAD_OS2 */
+/* #undef SDL_THREAD_PTH */
+#define SDL_THREAD_PTHREAD 1
+#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1
+/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP */
+/* #undef SDL_THREAD_SPROC */
+/* #undef SDL_THREAD_WIN32 */
+
+/* Enable various timer systems */
+/* #undef SDL_TIMER_AMIGA */
+/* #undef SDL_TIMER_BEOS */
+/* #undef SDL_TIMER_DC */
+/* #undef SDL_TIMER_EPOC */
+/* #undef SDL_TIMER_MACOS */
+/* #undef SDL_TIMER_MINT */
+/* #undef SDL_TIMER_OS2 */
+/* #undef SDL_TIMER_RISCOS */
+#define SDL_TIMER_UNIX 1
+/* #undef SDL_TIMER_WIN32 */
+/* #undef SDL_TIMER_WINCE */
+
+/* Enable various video drivers */
+/* #undef SDL_VIDEO_DRIVER_AALIB */
+/* #undef SDL_VIDEO_DRIVER_BWINDOW */
+/* #undef SDL_VIDEO_DRIVER_CYBERGRAPHICS */
+/* #undef SDL_VIDEO_DRIVER_DC */
+/* #undef SDL_VIDEO_DRIVER_DDRAW */
+#define SDL_VIDEO_DRIVER_DGA 1
+/* #undef SDL_VIDEO_DRIVER_DIRECTFB */
+/* #undef SDL_VIDEO_DRIVER_DRAWSPROCKET */
+#define SDL_VIDEO_DRIVER_DUMMY 1
+/* #undef SDL_VIDEO_DRIVER_EPOC */
+#define SDL_VIDEO_DRIVER_FBCON 1
+/* #undef SDL_VIDEO_DRIVER_GAPI */
+/* #undef SDL_VIDEO_DRIVER_GEM */
+/* #undef SDL_VIDEO_DRIVER_GGI */
+/* #undef SDL_VIDEO_DRIVER_IPOD */
+/* #undef SDL_VIDEO_DRIVER_NANOX */
+/* #undef SDL_VIDEO_DRIVER_OS2FS */
+/* #undef SDL_VIDEO_DRIVER_PHOTON */
+/* #undef SDL_VIDEO_DRIVER_PICOGUI */
+/* #undef SDL_VIDEO_DRIVER_PS2GS */
+/* #undef SDL_VIDEO_DRIVER_QTOPIA */
+/* #undef SDL_VIDEO_DRIVER_QUARTZ */
+/* #undef SDL_VIDEO_DRIVER_RISCOS */
+/* #undef SDL_VIDEO_DRIVER_SVGALIB */
+/* #undef SDL_VIDEO_DRIVER_TOOLBOX */
+/* #undef SDL_VIDEO_DRIVER_VGL */
+/* #undef SDL_VIDEO_DRIVER_WINDIB */
+/* #undef SDL_VIDEO_DRIVER_WSCONS */
+#define SDL_VIDEO_DRIVER_X11 1
+#define SDL_VIDEO_DRIVER_X11_DGAMOUSE 1
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC "libX11.so.6"
+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "libXext.so.6"
+#define SDL_VIDEO_DRIVER_X11_VIDMODE 1
+#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
+#define SDL_VIDEO_DRIVER_X11_XME 1
+#define SDL_VIDEO_DRIVER_X11_XV 1
+/* #undef SDL_VIDEO_DRIVER_XBIOS */
+
+/* Enable OpenGL support */
+#define SDL_VIDEO_OPENGL 1
+#define SDL_VIDEO_OPENGL_GLX 1
+/* #undef SDL_VIDEO_OPENGL_WGL */
+/* #undef SDL_VIDEO_OPENGL_OSMESA */
+/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */
+
+/* Enable assembly blit routines */
+#define SDL_ASSEMBLY_BLITTERS 1
+#define SDL_HERMES_BLITTERS 1
+/* #undef SDL_ALTIVEC_BLITTERS */
+
+#endif /* _SDL_config_h */

include/SDL_config.h.in

@@ -63,7 +63,9 @@
 #undef HAVE_INTTYPES_H
 #undef HAVE_STDINT_H
 #undef HAVE_CTYPE_H
+#undef HAVE_MATH_H
 #undef HAVE_SIGNAL_H
+#undef HAVE_ALTIVEC_H
 
 /* C library functions */
 #undef HAVE_MALLOC
@@ -115,19 +117,178 @@
 #undef HAVE_SSCANF
 #undef HAVE_SNPRINTF
 #undef HAVE_VSNPRINTF
+#undef HAVE_SIGACTION
+#undef HAVE_SETJMP
+#undef HAVE_NANOSLEEP
+#undef HAVE_CLOCK_GETTIME
+#undef HAVE_DLVSYM
 
+#else
+/* We may need some replacement for stdarg.h here */
+#include <stdarg.h>
 #endif /* HAVE_LIBC */
 
+/* General platform specific identifiers */
+#undef TARGET_API_MAC_CARBON
+#undef TARGET_API_MAC_OSX
 
 /* Allow disabling of core subsystems */
-#undef DISABLE_AUDIO
-#undef DISABLE_VIDEO
-#undef DISABLE_EVENTS
-#undef DISABLE_JOYSTICK
-#undef DISABLE_CDROM
-#undef DISABLE_THREADS
-#undef DISABLE_TIMERS
-#undef DISABLE_FILE
-#undef DISABLE_CPUINFO
+#undef SDL_AUDIO_DISABLED
+#undef SDL_CDROM_DISABLED
+#undef SDL_CPUINFO_DISABLED
+#undef SDL_EVENTS_DISABLED
+#undef SDL_FILE_DISABLED
+#undef SDL_JOYSTICK_DISABLED
+#undef SDL_LOADSO_DISABLED
+#undef SDL_THREADS_DISABLED
+#undef SDL_TIMERS_DISABLED
+#undef SDL_VIDEO_DISABLED
+
+/* Enable various audio drivers */
+#undef SDL_AUDIO_DRIVER_AHI
+#undef SDL_AUDIO_DRIVER_ALSA
+#undef SDL_AUDIO_DRIVER_ALSA_DYNAMIC
+#undef SDL_AUDIO_DRIVER_ARTS
+#undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC
+#undef SDL_AUDIO_DRIVER_BAUDIO
+#undef SDL_AUDIO_DRIVER_COREAUDIO
+#undef SDL_AUDIO_DRIVER_DART
+#undef SDL_AUDIO_DRIVER_DC
+#undef SDL_AUDIO_DRIVER_DISK
+#undef SDL_AUDIO_DRIVER_DMEDIA
+#undef SDL_AUDIO_DRIVER_DRENDERER
+#undef SDL_AUDIO_DRIVER_DSOUND
+#undef SDL_AUDIO_DRIVER_ESD
+#undef SDL_AUDIO_DRIVER_ESD_DYNAMIC
+#undef SDL_AUDIO_DRIVER_MINT
+#undef SDL_AUDIO_DRIVER_MMEAUDIO
+#undef SDL_AUDIO_DRIVER_NAS
+#undef SDL_AUDIO_DRIVER_OPENBSD
+#undef SDL_AUDIO_DRIVER_OSS
+#undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H
+#undef SDL_AUDIO_DRIVER_PAUD
+#undef SDL_AUDIO_DRIVER_QNXNTO
+#undef SDL_AUDIO_DRIVER_SNDMGR
+#undef SDL_AUDIO_DRIVER_SUNAUDIO
+#undef SDL_AUDIO_DRIVER_WAVEOUT
+
+/* Enable various cdrom drivers */
+#undef SDL_CDROM_AIX
+#undef SDL_CDROM_BEOS
+#undef SDL_CDROM_BSDI
+#undef SDL_CDROM_DC
+#undef SDL_CDROM_DUMMY
+#undef SDL_CDROM_FREEBSD
+#undef SDL_CDROM_LINUX
+#undef SDL_CDROM_MACOS
+#undef SDL_CDROM_MACOSX
+#undef SDL_CDROM_MINT
+#undef SDL_CDROM_OPENBSD
+#undef SDL_CDROM_OS2
+#undef SDL_CDROM_OSF
+#undef SDL_CDROM_QNX
+#undef SDL_CDROM_WIN32
+
+/* Enable various input drivers */
+#undef SDL_INPUT_TSLIB
+#undef SDL_JOYSTICK_AMIGA
+#undef SDL_JOYSTICK_BEOS
+#undef SDL_JOYSTICK_DC
+#undef SDL_JOYSTICK_DUMMY
+#undef SDL_JOYSTICK_IOKIT
+#undef SDL_JOYSTICK_LINUX
+#undef SDL_JOYSTICK_LINUXEV
+#undef SDL_JOYSTICK_MACOS
+#undef SDL_JOYSTICK_MINT
+#undef SDL_JOYSTICK_OS2
+#undef SDL_JOYSTICK_RISCOS
+#undef SDL_JOYSTICK_WINMM
+#undef SDL_JOYSTICK_USBHID
+
+/* Enable various shared object loading systems */
+#undef SDL_LOADSO_BEOS
+#undef SDL_LOADSO_DLCOMPAT
+#undef SDL_LOADSO_DLOPEN
+#undef SDL_LOADSO_LDG
+#undef SDL_LOADSO_MACOS
+#undef SDL_LOADSO_OS2
+#undef SDL_LOADSO_WIN32
+
+/* Enable various threading systems */
+#undef SDL_THREAD_AMIGA
+#undef SDL_THREAD_BEOS
+#undef SDL_THREAD_DC
+#undef SDL_THREAD_EPOC
+#undef SDL_THREAD_OS2
+#undef SDL_THREAD_PTH
+#undef SDL_THREAD_PTHREAD
+#undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX
+#undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP
+#undef SDL_THREAD_SPROC
+#undef SDL_THREAD_WIN32
+
+/* Enable various timer systems */
+#undef SDL_TIMER_AMIGA
+#undef SDL_TIMER_BEOS
+#undef SDL_TIMER_DC
+#undef SDL_TIMER_EPOC
+#undef SDL_TIMER_MACOS
+#undef SDL_TIMER_MINT
+#undef SDL_TIMER_OS2
+#undef SDL_TIMER_RISCOS
+#undef SDL_TIMER_UNIX
+#undef SDL_TIMER_WIN32
+#undef SDL_TIMER_WINCE
+
+/* Enable various video drivers */
+#undef SDL_VIDEO_DRIVER_AALIB
+#undef SDL_VIDEO_DRIVER_BWINDOW
+#undef SDL_VIDEO_DRIVER_CYBERGRAPHICS
+#undef SDL_VIDEO_DRIVER_DC
+#undef SDL_VIDEO_DRIVER_DDRAW
+#undef SDL_VIDEO_DRIVER_DGA
+#undef SDL_VIDEO_DRIVER_DIRECTFB
+#undef SDL_VIDEO_DRIVER_DRAWSPROCKET
+#undef SDL_VIDEO_DRIVER_DUMMY
+#undef SDL_VIDEO_DRIVER_EPOC
+#undef SDL_VIDEO_DRIVER_FBCON
+#undef SDL_VIDEO_DRIVER_GAPI
+#undef SDL_VIDEO_DRIVER_GEM
+#undef SDL_VIDEO_DRIVER_GGI
+#undef SDL_VIDEO_DRIVER_IPOD
+#undef SDL_VIDEO_DRIVER_NANOX
+#undef SDL_VIDEO_DRIVER_OS2FS
+#undef SDL_VIDEO_DRIVER_PHOTON
+#undef SDL_VIDEO_DRIVER_PICOGUI
+#undef SDL_VIDEO_DRIVER_PS2GS
+#undef SDL_VIDEO_DRIVER_QTOPIA
+#undef SDL_VIDEO_DRIVER_QUARTZ
+#undef SDL_VIDEO_DRIVER_RISCOS
+#undef SDL_VIDEO_DRIVER_SVGALIB
+#undef SDL_VIDEO_DRIVER_TOOLBOX
+#undef SDL_VIDEO_DRIVER_VGL
+#undef SDL_VIDEO_DRIVER_WINDIB
+#undef SDL_VIDEO_DRIVER_WSCONS
+#undef SDL_VIDEO_DRIVER_X11
+#undef SDL_VIDEO_DRIVER_X11_DGAMOUSE
+#undef SDL_VIDEO_DRIVER_X11_DYNAMIC
+#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT
+#undef SDL_VIDEO_DRIVER_X11_VIDMODE
+#undef SDL_VIDEO_DRIVER_X11_XINERAMA
+#undef SDL_VIDEO_DRIVER_X11_XME
+#undef SDL_VIDEO_DRIVER_X11_XV
+#undef SDL_VIDEO_DRIVER_XBIOS
+
+/* Enable OpenGL support */
+#undef SDL_VIDEO_OPENGL
+#undef SDL_VIDEO_OPENGL_GLX
+#undef SDL_VIDEO_OPENGL_WGL
+#undef SDL_VIDEO_OPENGL_OSMESA
+#undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC
+
+/* Enable assembly blit routines */
+#undef SDL_ASSEMBLY_BLITTERS
+#undef SDL_HERMES_BLITTERS
+#undef SDL_ALTIVEC_BLITTERS
 
 #endif /* _SDL_config_h */

include/SDL_error.h

@@ -40,11 +40,13 @@ extern DECLSPEC void SDLCALL SDL_ClearError(void);
 
 /* Private error message function - used internally */
 #define SDL_OutOfMemory()	SDL_Error(SDL_ENOMEM)
+#define SDL_Unsupported()	SDL_Error(SDL_UNSUPPORTED)
 typedef enum {
 	SDL_ENOMEM,
 	SDL_EFREAD,
 	SDL_EFWRITE,
 	SDL_EFSEEK,
+	SDL_UNSUPPORTED,
 	SDL_LASTERROR
 } SDL_errorcode;
 extern DECLSPEC void SDLCALL SDL_Error(SDL_errorcode code);

include/SDL_stdinc.h

@@ -55,14 +55,13 @@ char *alloca ();
 #else
 # if HAVE_STDLIB_H
 # include <stdlib.h>
+# elif HAVE_MALLOC_H
+# include <malloc.h>
 # endif
 # if HAVE_STDARG_H
 # include <stdarg.h>
 # endif
 #endif
-#if HAVE_MALLOC_H
-# include <malloc.h>
-#endif
 #if HAVE_STRING_H
 # if !STDC_HEADERS && HAVE_MEMORY_H
 # include <memory.h>

include/SDL_syswm.h

@@ -45,18 +45,13 @@ struct SDL_SysWMinfo;
 typedef struct SDL_SysWMinfo SDL_SysWMinfo;
 #else
 
+/* This is the structure for custom window manager events */
+#if SDL_VIDEO_DRIVER_X11
 #if defined(__APPLE__) && defined(__MACH__)
 // conflicts with Quickdraw.h
 #define Cursor X11Cursor
 #endif
 
-/* This is the structure for custom window manager events */
-#if (defined(unix) || defined(__unix__) || defined(_AIX) || \
-         defined(__OpenBSD__) || defined(__NetBSD__) || \
-         (defined(__APPLE__) && defined(__MACH__))) && \
-    (!defined(DISABLE_X11) && !defined(__CYGWIN32__) && !defined(ENABLE_NANOX) && \
-         !defined(__QNXNTO__))
- /* AIX is unix, of course, but the native compiler CSet doesn't define unix */
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
@@ -105,7 +100,7 @@ typedef struct SDL_SysWMinfo {
 	} info;
 } SDL_SysWMinfo;
 
-#elif defined(ENABLE_NANOX)
+#elif SDL_VIDEO_DRIVER_NANOX
 #include <microwin/nano-X.h>
 
 /* The generic custom event structure */
@@ -120,7 +115,7 @@ typedef struct SDL_SysWMinfo {
 	GR_WINDOW_ID window ;	/* The display window */
 } SDL_SysWMinfo;
 
-#elif defined(WIN32)
+#elif SDL_VIDEO_DRIVER_WINDIB || SDL_VIDEO_DRIVER_DDRAW
 #include "SDL_windows.h"
 
 /* The windows custom event structure */
@@ -139,7 +134,7 @@ typedef struct SDL_SysWMinfo {
 	HGLRC hglrc;			/* The OpenGL context, if any */
 } SDL_SysWMinfo;
 
-#elif defined(__riscos__)
+#elif SDL_VIDEO_DRIVER_RISCOS
 
 /* RISC OS custom event structure */
 struct SDL_SysWMmsg {
@@ -156,7 +151,7 @@ typedef struct SDL_SysWMinfo {
 	int window;		/* The RISC OS display window */
 } SDL_SysWMinfo;
 
-#elif defined(__QNXNTO__)
+#elif SDL_VIDEO_DRIVER_PHOTON
 #include <sys/neutrino.h>
 #include <Ph.h>
 
@@ -186,7 +181,7 @@ typedef struct SDL_SysWMinfo {
 	int data;
 } SDL_SysWMinfo;
 
-#endif /* OS type */
+#endif /* video driver type */
 
 #endif /* SDL_PROTOTYPES_ONLY */
 

sdl-config.in

@@ -40,15 +40,6 @@ while test $# -gt 0; do
       ;;
     --cflags)
       echo -I@includedir@/SDL @SDL_CFLAGS@
-
-      # The portable way of including SDL is #include "SDL.h"
-      #if test @includedir@ != /usr/include ; then
-      #    # Handle oddities in Win32 path handling (assumes prefix)
-      #    prefix=`echo ${prefix} | sed 's,^//\([A-Z]\),\1:,'`
-      #
-      #    includes=-I@includedir@
-      #fi
-      #echo $includes -I@includedir@/SDL @SDL_CFLAGS@
       ;;
 @ENABLE_SHARED_TRUE@    --libs)
 @ENABLE_SHARED_TRUE@      libdirs="-L@libdir@ @SDL_RLD_FLAGS@"

src/Makefile.am

-
-## Makefile.am for the main SDL library
-
-# These are the subdirectories that are always built
-CORE_SUBDIRS =			\
-	main stdlib
-
-# These are the subdirectories which may be built
-EXTRA_SUBDIRS =			\
-	 audio video events joystick cdrom thread timer file cpuinfo hermes
-
-# These are the subdirectories which will be built now
-SUBDIRS = $(CORE_SUBDIRS) @SDL_EXTRADIRS@
-
-# These are the subdirectories which will be distributed with "make dist"
-DIST_SUBDIRS = $(CORE_SUBDIRS) $(EXTRA_SUBDIRS)
-
-# The SDL library target
-lib_LTLIBRARIES = libSDL.la
-
-libSDL_la_SOURCES = $(GENERAL_SRCS)
-libSDL_la_LDFLAGS = 		\
-	-no-undefined		\
-        -release $(LT_RELEASE)	\
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libSDL_la_LIBADD =		\
-	main/libarch.la		\
-	stdlib/libstdlib.la	\
-	@SDL_EXTRALIBS@		\
-	@SYSTEM_LIBS@
-libSDL_la_DEPENDENCIES =	\
-	main/libarch.la		\
-	stdlib/libstdlib.la	\
-	@SDL_EXTRALIBS@
-
-# The SDL library sources
-GENERAL_SRCS = 		\
-	SDL.c			\
-	SDL_error.c		\
-	SDL_error_c.h		\
-	SDL_fatal.c		\
-	SDL_fatal.h		\
-	SDL_loadso.c
-

src/SDL.c

@@ -22,26 +22,26 @@
 
 /* Initialization code for SDL */
 
-#ifdef ENABLE_PTH
-#include <pth.h>
-#endif
-
 #include "SDL.h"
 #include "SDL_fatal.h"
-#ifndef DISABLE_VIDEO
-#include "SDL_leaks.h"
+#if !SDL_VIDEO_DISABLED
+#include "video/SDL_leaks.h"
+#endif
+
+#if SDL_THREAD_PTH
+#include <pth.h>
 #endif
 
 /* Initialization/Cleanup routines */
-#ifndef DISABLE_JOYSTICK
+#if !SDL_JOYSTICK_DISABLED
 extern int  SDL_JoystickInit(void);
 extern void SDL_JoystickQuit(void);
 #endif
-#ifndef DISABLE_CDROM
+#if !SDL_CDROM_DISABLED
 extern int  SDL_CDROMInit(void);
 extern void SDL_CDROMQuit(void);
 #endif
-#ifndef DISABLE_TIMERS
+#if !SDL_TIMERS_DISABLED
 extern void SDL_StartTicks(void);
 extern int  SDL_TimerInit(void);
 extern void SDL_TimerQuit(void);
@@ -61,7 +61,7 @@ int surfaces_allocated = 0;
 
 int SDL_InitSubSystem(Uint32 flags)
 {
-#ifndef DISABLE_VIDEO
+#if !SDL_VIDEO_DISABLED
 	/* Initialize the video/event subsystem */
 	if ( (flags & SDL_INIT_VIDEO) && !(SDL_initialized & SDL_INIT_VIDEO) ) {
 		if ( SDL_VideoInit(SDL_getenv("SDL_VIDEODRIVER"),
@@ -77,7 +77,7 @@ int SDL_InitSubSystem(Uint32 flags)
 	}
 #endif
 
-#ifndef DISABLE_AUDIO
+#if !SDL_AUDIO_DISABLED
 	/* Initialize the audio subsystem */
 	if ( (flags & SDL_INIT_AUDIO) && !(SDL_initialized & SDL_INIT_AUDIO) ) {
 		if ( SDL_AudioInit(SDL_getenv("SDL_AUDIODRIVER")) < 0 ) {
@@ -92,7 +92,7 @@ int SDL_InitSubSystem(Uint32 flags)
 	}
 #endif
 
-#ifndef DISABLE_TIMERS
+#if !SDL_TIMERS_DISABLED
 	/* Initialize the timer subsystem */
 	if ( ! ticks_started ) {
 		SDL_StartTicks();
@@ -111,7 +111,7 @@ int SDL_InitSubSystem(Uint32 flags)
 	}
 #endif
 
-#ifndef DISABLE_JOYSTICK
+#if !SDL_JOYSTICK_DISABLED
 	/* Initialize the joystick subsystem */
 	if ( (flags & SDL_INIT_JOYSTICK) &&
 	     !(SDL_initialized & SDL_INIT_JOYSTICK) ) {
@@ -127,7 +127,7 @@ int SDL_InitSubSystem(Uint32 flags)
 	}
 #endif
 
-#ifndef DISABLE_CDROM
+#if !SDL_CDROM_DISABLED
 	/* Initialize the CD-ROM subsystem */
 	if ( (flags & SDL_INIT_CDROM) && !(SDL_initialized & SDL_INIT_CDROM) ) {
 		if ( SDL_CDROMInit() < 0 ) {
@@ -146,7 +146,7 @@ int SDL_InitSubSystem(Uint32 flags)
 
 int SDL_Init(Uint32 flags)
 {
-#if !defined(DISABLE_THREADS) && defined(ENABLE_PTH)
+#if !SDL_THREADS_DISABLED && SDL_THREAD_PTH
 	if (!pth_init()) {
 		return -1;
 	}
@@ -170,31 +170,31 @@ int SDL_Init(Uint32 flags)
 void SDL_QuitSubSystem(Uint32 flags)
 {
 	/* Shut down requested initialized subsystems */
-#ifndef DISABLE_CDROM
+#if !SDL_CDROM_DISABLED
 	if ( (flags & SDL_initialized & SDL_INIT_CDROM) ) {
 		SDL_CDROMQuit();
 		SDL_initialized &= ~SDL_INIT_CDROM;
 	}
 #endif
-#ifndef DISABLE_JOYSTICK
+#if !SDL_JOYSTICK_DISABLED
 	if ( (flags & SDL_initialized & SDL_INIT_JOYSTICK) ) {
 		SDL_JoystickQuit();
 		SDL_initialized &= ~SDL_INIT_JOYSTICK;
 	}
 #endif
-#ifndef DISABLE_TIMERS
+#if !SDL_TIMERS_DISABLED
 	if ( (flags & SDL_initialized & SDL_INIT_TIMER) ) {
 		SDL_TimerQuit();
 		SDL_initialized &= ~SDL_INIT_TIMER;
 	}
 #endif
-#ifndef DISABLE_AUDIO
+#if !SDL_AUDIO_DISABLED
 	if ( (flags & SDL_initialized & SDL_INIT_AUDIO) ) {
 		SDL_AudioQuit();
 		SDL_initialized &= ~SDL_INIT_AUDIO;
 	}
 #endif
-#ifndef DISABLE_VIDEO
+#if !SDL_VIDEO_DISABLED
 	if ( (flags & SDL_initialized & SDL_INIT_VIDEO) ) {
 		SDL_VideoQuit();
 		SDL_initialized &= ~SDL_INIT_VIDEO;
@@ -236,7 +236,7 @@ void SDL_Quit(void)
 	/* Uninstall any parachute signal handlers */
 	SDL_UninstallParachute();
 
-#if !defined(DISABLE_THREADS) && defined(ENABLE_PTH)
+#if !SDL_THREADS_DISABLED && SDL_THREAD_PTH
 	pth_kill();
 #endif
 #ifdef DEBUG_BUILD

src/SDL_error.c

@@ -24,16 +24,15 @@
 
 #include "SDL_error.h"
 #include "SDL_error_c.h"
-#ifndef DISABLE_THREADS
-#include "SDL_thread_c.h"
-#endif
 
-#ifdef DISABLE_THREADS
-/* The default (non-thread-safe) global error variable */
+/* Routine to get the thread-specific error variable */
+#if SDL_THREADS_DISABLED
+/* The  SDL_arraysize(The ),default (non-thread-safe) global error variable */
 static SDL_error SDL_global_error;
-
 #define SDL_GetErrBuf()	(&SDL_global_error)
-#endif /* DISABLE_THREADS */
+#else
+extern SDL_error *SDL_GetErrBuf(void);
+#endif /* SDL_THREADS_DISABLED */
 
 #define SDL_ERRBUFIZE	1024
 

src/SDL_loadso.c

-/*
-    SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2006 Sam Lantinga
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-
-    Sam Lantinga
-    slouken@libsdl.org
-*/
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-/* System dependent library loading routines                           */
-
-/*
- * Mac OS X >= 10.3 are guaranteed to have dlopen support in a system
- *  framework, which means we don't have to roll our own on non-PowerPC
- *  systems to guarantee compatibility (x86 Macs started at 10.4).   --ryan.
- */
-#if ( (defined(MACOSX)) && (!defined(__POWERPC__)) )
-#  define USE_DLOPEN 1
-#endif
-
-/* !!! FIXME: includes so I don't have to update all the project files... */
-#define SDL_INTERNAL_BUILDING_LOADSO 1
-#if defined(USE_DUMMY_LOADSO)
-# include "loadso/dummy/SDL_loadso.c"
-#elif defined(USE_DLOPEN)
-# include "loadso/dlopen/SDL_loadso.c"
-#elif defined(MACOSX)
-# include "loadso/macosx/SDL_loadso.c"
-#elif defined(macintosh)
-# include "loadso/macos/SDL_loadso.c"
-#elif defined(WIN32) || defined(_WIN32_WCE)
-# include "loadso/windows/SDL_loadso.c"
-#elif defined(__BEOS__)
-# include "loadso/beos/SDL_loadso.c"
-#elif defined(__MINT__) && defined(ENABLE_LDG)
-# include "loadso/mint/SDL_loadso.c"
-#elif defined(__OS2__)
-# include "loadso/os2/SDL_loadso.c"
-#else
-# include "loadso/dummy/SDL_loadso.c"
-#endif /* system type */
-

src/audio/Makefile.am

-
-## Makefile.am for the SDL audio library
-
-noinst_LTLIBRARIES = libaudio.la
-
-# Define which subdirectories need to be built
-SUBDIRS = @AUDIO_SUBDIRS@
-DIST_SUBDIRS =	\
-	alsa	\
-	arts	\
-	baudio	\
-	dc	\
-	disk	\
-	dma	\
-	dmedia	\
-	dsp	\
-	esd	\
-	macosx	\
-	macrom	\
-	mint	\
-	mme	\
-	nas	\
-	nto	\
-	openbsd	\
-	paudio	\
-	sun	\
-	ums	\
-	windib	\
-	windx5
-
-DRIVERS = @AUDIO_DRIVERS@
-
-# Include the architecture-independent sources
-COMMON_SRCS =			\
-	SDL_audio.c		\
-	SDL_audio_c.h		\
-	SDL_audiocvt.c		\
-	SDL_audiodev.c		\
-	SDL_audiodev_c.h	\
-	SDL_audiomem.c		\
-	SDL_audiomem.h		\
-	SDL_mixer.c		\
-	SDL_sysaudio.h		\
-	SDL_wave.c		\
-	SDL_wave.h              \
-	SDL_mixer_MMX.c         \
-	SDL_mixer_MMX.h		\
-	SDL_mixer_MMX_VC.c	\
-	SDL_mixer_MMX_VC.h	\
-	SDL_mixer_m68k.c	\
-	SDL_mixer_m68k.h
-
-libaudio_la_SOURCES = $(COMMON_SRCS)
-libaudio_la_LIBADD = $(DRIVERS)
-libaudio_la_DEPENDENCIES = $(DRIVERS)

src/audio/SDL_audio.c

@@ -35,76 +35,76 @@
 
 /* Available audio drivers */
 static AudioBootStrap *bootstrap[] = {
-#ifdef OPENBSD_AUDIO_SUPPORT
+#if SDL_AUDIO_DRIVER_OPENBSD
 	&OPENBSD_AUDIO_bootstrap,
 #endif
-#ifdef OSS_SUPPORT
+#if SDL_AUDIO_DRIVER_OSS
 	&DSP_bootstrap,
 	&DMA_bootstrap,
 #endif
-#ifdef ALSA_SUPPORT
+#if SDL_AUDIO_DRIVER_ALSA
 	&ALSA_bootstrap,
 #endif
-#ifdef QNXNTOAUDIO_SUPPORT
+#if SDL_AUDIO_DRIVER_QNXNTO
 	&QNXNTOAUDIO_bootstrap,
 #endif
-#ifdef SUNAUDIO_SUPPORT
+#if SDL_AUDIO_DRIVER_SUNAUDIO
 	&SUNAUDIO_bootstrap,
 #endif
-#ifdef DMEDIA_SUPPORT
+#if SDL_AUDIO_DRIVER_DMEDIA
 	&DMEDIA_bootstrap,
 #endif
-#ifdef ARTSC_SUPPORT
-	&ARTSC_bootstrap,
+#if SDL_AUDIO_DRIVER_ARTS
+	&ARTS_bootstrap,
 #endif
-#ifdef ESD_SUPPORT
+#if SDL_AUDIO_DRIVER_ESD
 	&ESD_bootstrap,
 #endif
-#ifdef NAS_SUPPORT
+#if SDL_AUDIO_DRIVER_NAS
 	&NAS_bootstrap,
 #endif
-#ifdef ENABLE_DIRECTX
+#if SDL_AUDIO_DRIVER_DSOUND
 	&DSOUND_bootstrap,
 #endif
-#ifdef ENABLE_WINDIB
+#if SDL_AUDIO_DRIVER_WAVEOUT
 	&WAVEOUT_bootstrap,
 #endif
-#ifdef __BEOS__
+#if SDL_AUDIO_DRIVER_PAUD
+	&Paud_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_BAUDIO
 	&BAUDIO_bootstrap,
 #endif
-#ifdef MACOSX
+#if SDL_AUDIO_DRIVER_COREAUDIO
 	&COREAUDIO_bootstrap,
 #endif
-#if defined(macintosh) || TARGET_API_MAC_CARBON
+#if SDL_AUDIO_DRIVER_SNDMGR
 	&SNDMGR_bootstrap,
 #endif
-#ifdef _AIX
-	&Paud_bootstrap,
-#endif
-#ifdef ENABLE_AHI
+#if SDL_AUDIO_DRIVER_AHI
 	&AHI_bootstrap,
 #endif
-#ifdef MMEAUDIO_SUPPORT
-	&MMEAUDIO_bootstrap,
-#endif
-#ifdef MINTAUDIO_SUPPORT
+#if SDL_AUDIO_DRIVER_MINT
 	&MINTAUDIO_GSXB_bootstrap,
 	&MINTAUDIO_MCSN_bootstrap,
 	&MINTAUDIO_STFA_bootstrap,
 	&MINTAUDIO_XBIOS_bootstrap,
 	&MINTAUDIO_DMA8_bootstrap,
 #endif
-#ifdef DISKAUD_SUPPORT
+#if SDL_AUDIO_DRIVER_DISK
 	&DISKAUD_bootstrap,
 #endif
-#ifdef ENABLE_DC
+#if SDL_AUDIO_DRIVER_DC
 	&DCAUD_bootstrap,
 #endif
-#ifdef DRENDERER_SUPPORT
+#if SDL_AUDIO_DRIVER_DRENDERER
 	&DRENDERER_bootstrap,
 #endif
-#ifdef __OS2__
-        &DART_bootstrap,
+#if SDL_AUDIO_DRIVER_MMEAUDIO
+	&MMEAUDIO_bootstrap,
+#endif
+#if SDL_AUDIO_DRIVER_DART
+	&DART_bootstrap,
 #endif
 	NULL
 };
@@ -294,7 +294,7 @@ int SDL_AudioInit(const char *driver_name)
 	/* Select the proper audio driver */
 	audio = NULL;
 	idx = 0;
-#ifdef unix
+#if SDL_AUDIO_DRIVER_ESD
 	if ( (driver_name == NULL) && (SDL_getenv("ESPEAKER") != NULL) ) {
 		/* Ahem, we know that if ESPEAKER is set, user probably wants
 		   to use ESD, but don't start it if it's not already running.
@@ -323,7 +323,7 @@ int SDL_AudioInit(const char *driver_name)
 			}
 		}
 	}
-#endif /* unix */
+#endif /* SDL_AUDIO_DRIVER_ESD */
 	if ( audio == NULL ) {
 		if ( driver_name != NULL ) {
 #if 0	/* This will be replaced with a better driver selection API */
@@ -414,10 +414,10 @@ int SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpec *obtained)
 		return(-1);
 	}
 
-#if defined(macintosh) || (defined(__riscos__) && defined(DISABLE_THREADS))
+#if defined(macintosh) || (defined(__riscos__) && SDL_THREADS_DISABLED)
 	/* FIXME: Need to implement PPC interrupt asm for SDL_LockAudio() */
 #else
-#if defined(__MINT__) && !defined(ENABLE_THREADS)
+#if defined(__MINT__) && SDL_THREADS_DISABLED
 	/* Uses interrupt driven audio, without thread */
 #else
 	/* Create a semaphore for locking the sound buffers */

src/audio/SDL_audiomem.h

@@ -20,10 +20,5 @@
     slouken@libsdl.org
 */
 
-/* Functions to allocate audio buffer memory, shareable across threads
-	(necessary because SDL audio emulates threads with fork()
- */
-
-extern void *SDL_AllocAudioMem(int size);
-extern void SDL_FreeAudioMem(void *mem);
-
+#define SDL_AllocAudioMem	SDL_malloc
+#define SDL_FreeAudioMem	SDL_free

src/audio/SDL_sysaudio.h

@@ -99,75 +99,75 @@ typedef struct AudioBootStrap {
 	SDL_AudioDevice *(*create)(int devindex);
 } AudioBootStrap;
 
-#ifdef OPENBSD_AUDIO_SUPPORT
+#if SDL_AUDIO_DRIVER_OPENBSD
 extern AudioBootStrap OPENBSD_AUDIO_bootstrap;
 #endif
-#ifdef OSS_SUPPORT
+#if SDL_AUDIO_DRIVER_OSS
 extern AudioBootStrap DSP_bootstrap;
 extern AudioBootStrap DMA_bootstrap;
 #endif
-#ifdef ALSA_SUPPORT
+#if SDL_AUDIO_DRIVER_ALSA
 extern AudioBootStrap ALSA_bootstrap;
 #endif
-#ifdef QNXNTOAUDIO_SUPPORT
+#if SDL_AUDIO_DRIVER_QNXNTO
 extern AudioBootStrap QNXNTOAUDIO_bootstrap;
 #endif
-#ifdef SUNAUDIO_SUPPORT
+#if SDL_AUDIO_DRIVER_SUNAUDIO
 extern AudioBootStrap SUNAUDIO_bootstrap;
 #endif
-#ifdef DMEDIA_SUPPORT
+#if SDL_AUDIO_DRIVER_DMEDIA
 extern AudioBootStrap DMEDIA_bootstrap;
 #endif
-#ifdef ARTSC_SUPPORT
-extern AudioBootStrap ARTSC_bootstrap;
+#if SDL_AUDIO_DRIVER_ARTS
+extern AudioBootStrap ARTS_bootstrap;
 #endif
-#ifdef ESD_SUPPORT
+#if SDL_AUDIO_DRIVER_ESD
 extern AudioBootStrap ESD_bootstrap;
 #endif
-#ifdef NAS_SUPPORT
+#if SDL_AUDIO_DRIVER_NAS
 extern AudioBootStrap NAS_bootstrap;
 #endif
-#ifdef ENABLE_DIRECTX
+#if SDL_AUDIO_DRIVER_DSOUND
 extern AudioBootStrap DSOUND_bootstrap;
 #endif
-#ifdef ENABLE_WINDIB
+#if SDL_AUDIO_DRIVER_WAVEOUT
 extern AudioBootStrap WAVEOUT_bootstrap;
 #endif
-#ifdef _AIX
+#if SDL_AUDIO_DRIVER_PAUD
 extern AudioBootStrap Paud_bootstrap;
 #endif
-#ifdef __BEOS__
+#if SDL_AUDIO_DRIVER_BAUDIO
 extern AudioBootStrap BAUDIO_bootstrap;
 #endif
-#ifdef MACOSX
+#if SDL_AUDIO_DRIVER_COREAUDIO
 extern AudioBootStrap COREAUDIO_bootstrap;
 #endif
-#if defined(macintosh) || TARGET_API_MAC_CARBON
+#if SDL_AUDIO_DRIVER_SNDMGR
 extern AudioBootStrap SNDMGR_bootstrap;
 #endif
-#ifdef ENABLE_AHI
+#if SDL_AUDIO_DRIVER_AHI
 extern AudioBootStrap AHI_bootstrap;
 #endif
-#ifdef MINTAUDIO_SUPPORT
+#if SDL_AUDIO_DRIVER_MINT
 extern AudioBootStrap MINTAUDIO_GSXB_bootstrap;
 extern AudioBootStrap MINTAUDIO_MCSN_bootstrap;
 extern AudioBootStrap MINTAUDIO_STFA_bootstrap;
 extern AudioBootStrap MINTAUDIO_XBIOS_bootstrap;
 extern AudioBootStrap MINTAUDIO_DMA8_bootstrap;
 #endif
-#ifdef DISKAUD_SUPPORT
+#if SDL_AUDIO_DRIVER_DISK
 extern AudioBootStrap DISKAUD_bootstrap;
 #endif
-#ifdef ENABLE_DC
+#if SDL_AUDIO_DRIVER_DC
 extern AudioBootStrap DCAUD_bootstrap;
 #endif
-#ifdef DRENDERER_SUPPORT
+#if SDL_AUDIO_DRIVER_DRENDERER
 extern AudioBootStrap DRENDERER_bootstrap;
 #endif
-#ifdef MMEAUDIO_SUPPORT
+#if SDL_AUDIO_DRIVER_MMEAUDIO
 extern AudioBootStrap MMEAUDIO_bootstrap;
 #endif
-#ifdef __OS2__
+#if SDL_AUDIO_DRIVER_DART
 extern AudioBootStrap DART_bootstrap;
 #endif
 

src/audio/SDL_wave.c

@@ -20,8 +20,6 @@
     slouken@libsdl.org
 */
 
-#ifndef DISABLE_FILE
-
 /* Microsoft WAVE file loading routines */
 
 #include "SDL_audio.h"
@@ -590,5 +588,3 @@ static int ReadChunk(SDL_RWops *src, Chunk *chunk)
 	}
 	return(chunk->length);
 }
-
-#endif /* ENABLE_FILE */

src/audio/alsa/Makefile.am

-
-## Makefile.am for SDL using the ALSA PCM audio API
-
-noinst_LTLIBRARIES = libaudio_alsa.la
-libaudio_alsa_la_SOURCES = $(SRCS)
-
-alsa_lib = \"@alsa_lib@\"
-
-# The SDL audio driver sources
-SRCS =	SDL_alsa_audio.c	\
-	SDL_alsa_audio.h

src/audio/alsa/SDL_alsa_audio.c

@@ -27,18 +27,13 @@
 #include <sys/types.h>
 #include <signal.h>	/* For kill() */
 
-#include "SDL_audio.h"
-#include "SDL_audiomem.h"
-#include "SDL_audio_c.h"
 #include "SDL_timer.h"
+#include "SDL_audio.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
 #include "SDL_alsa_audio.h"
 
-#ifdef ALSA_DYNAMIC
-#ifdef USE_DLVSYM
-#ifndef __USE_GNU
-#define __USE_GNU
-#endif
-#endif
+#ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC
 #include <dlfcn.h>
 #include "SDL_name.h"
 #include "SDL_loadso.h"
@@ -60,9 +55,9 @@ static void ALSA_PlayAudio(_THIS);
 static Uint8 *ALSA_GetAudioBuf(_THIS);
 static void ALSA_CloseAudio(_THIS);
 
-#ifdef ALSA_DYNAMIC
+#ifdef SDL_AUDIO_DRIVER_ALSA_DYNAMIC
 
-static const char *alsa_library = ALSA_DYNAMIC;
+static const char *alsa_library = SDL_AUDIO_DRIVER_ALSA_DYNAMIC;
 static void *alsa_handle = NULL;
 static int alsa_loaded = 0;
 
@@ -131,7 +126,7 @@ static int LoadALSALibrary(void) {
 		retval = 0;
 		for (i = 0; i < SDL_TABLESIZE(alsa_functions); i++) {
 /*			*alsa_functions[i].func = SDL_LoadFunction(alsa_handle,alsa_functions[i].name);*/
-#ifdef USE_DLVSYM
+#if HAVE_DLVSYM
 			*alsa_functions[i].func = dlvsym(alsa_handle,alsa_functions[i].name,"ALSA_0.9");
 			if (!*alsa_functions[i].func)
 #endif
@@ -156,7 +151,7 @@ static int LoadALSALibrary(void) {
 	return 0;
 }
 
-#endif /* ALSA_DYNAMIC */
+#endif /* SDL_AUDIO_DRIVER_ALSA_DYNAMIC */
 
 static const char *get_audio_device(int channels)
 {

src/audio/alsa/SDL_alsa_audio.h

@@ -23,11 +23,12 @@
 #ifndef _ALSA_PCM_audio_h
 #define _ALSA_PCM_audio_h
 
-#include "SDL_sysaudio.h"
 #define ALSA_PCM_OLD_HW_PARAMS_API
 #define ALSA_PCM_OLD_SW_PARAMS_API
 #include <alsa/asoundlib.h>
 
+#include "../SDL_sysaudio.h"
+
 /* Hidden "this" pointer for the video functions */
 #define _THIS	SDL_AudioDevice *this
 

src/audio/amigaos/Makefile.am

-
-## Makefile.am for the SDL AmigaOS audio subsystem
-
-noinst_LTLIBRARIES = libaudio_arch.la
-
-ARCH_SRCS = SDL_ahiaudio.c SDL_ahiaudio.h
-
-libaudio_arch_la_SOURCES = $(ARCH_SRCS)

src/audio/amigaos/SDL_ahiaudio.c

@@ -23,8 +23,7 @@
 /* Allow access to a raw mixing buffer (for AmigaOS) */
 
 #include "SDL_audio.h"
-#include "SDL_audiomem.h"
-#include "SDL_audio_c.h"
+#include "../SDL_audio_c.h"
 #include "SDL_ahiaudio.h"
 
 /* Audio driver functions */

src/audio/amigaos/SDL_ahiaudio.h

@@ -33,7 +33,8 @@
 
 #include <devices/ahi.h>
 #include "mydebug.h"
-#include "SDL_sysaudio.h"
+
+#include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the audio functions */
 #define _THIS	SDL_AudioDevice *this

src/audio/arts/Makefile.am

-
-## Makefile.am for SDL using the Analog Realtime Synthesizer sound driver
-
-noinst_LTLIBRARIES = libaudio_arts.la
-libaudio_arts_la_SOURCES = $(SRCS)
-
-arts_lib = \"@arts_lib@\"
-
-# The SDL audio driver sources
-SRCS =	SDL_artsaudio.c	\
-	SDL_artsaudio.h

src/audio/arts/SDL_artsaudio.c

@@ -24,12 +24,12 @@
 
 #include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_audiomem.h"
-#include "SDL_audio_c.h"
-#include "SDL_audiodev_c.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_audiodev_c.h"
 #include "SDL_artsaudio.h"
 
-#ifdef ARTSC_DYNAMIC
+#ifdef SDL_AUDIO_DRIVER_ARTS_DYNAMIC
 #include "SDL_name.h"
 #include "SDL_loadso.h"
 #else
@@ -37,18 +37,18 @@
 #endif
 
 /* The tag name used by artsc audio */
-#define ARTSC_DRIVER_NAME         "arts"
+#define ARTS_DRIVER_NAME         "arts"
 
 /* Audio driver functions */
-static int ARTSC_OpenAudio(_THIS, SDL_AudioSpec *spec);
-static void ARTSC_WaitAudio(_THIS);
-static void ARTSC_PlayAudio(_THIS);
-static Uint8 *ARTSC_GetAudioBuf(_THIS);
-static void ARTSC_CloseAudio(_THIS);
+static int ARTS_OpenAudio(_THIS, SDL_AudioSpec *spec);
+static void ARTS_WaitAudio(_THIS);
+static void ARTS_PlayAudio(_THIS);
+static Uint8 *ARTS_GetAudioBuf(_THIS);
+static void ARTS_CloseAudio(_THIS);
 
-#ifdef ARTSC_DYNAMIC
+#ifdef SDL_AUDIO_DRIVER_ARTS_DYNAMIC
 
-static const char *arts_library = ARTSC_DYNAMIC;
+static const char *arts_library = SDL_AUDIO_DRIVER_ARTS_DYNAMIC;
 static void *arts_handle = NULL;
 static int arts_loaded = 0;
 
@@ -114,7 +114,7 @@ static int LoadARTSLibrary(void)
 	return 0;
 }
 
-#endif /* ARTSC_DYNAMIC */
+#endif /* SDL_AUDIO_DRIVER_ARTS_DYNAMIC */
 
 /* Audio driver bootstrap functions */
 
@@ -171,24 +171,24 @@ static SDL_AudioDevice *Audio_CreateDevice(int devindex)
 	stream = 0;
 
 	/* Set the function pointers */
-	this->OpenAudio = ARTSC_OpenAudio;
-	this->WaitAudio = ARTSC_WaitAudio;
-	this->PlayAudio = ARTSC_PlayAudio;
-	this->GetAudioBuf = ARTSC_GetAudioBuf;
-	this->CloseAudio = ARTSC_CloseAudio;
+	this->OpenAudio = ARTS_OpenAudio;
+	this->WaitAudio = ARTS_WaitAudio;
+	this->PlayAudio = ARTS_PlayAudio;
+	this->GetAudioBuf = ARTS_GetAudioBuf;
+	this->CloseAudio = ARTS_CloseAudio;
 
 	this->free = Audio_DeleteDevice;
 
 	return this;
 }
 
-AudioBootStrap ARTSC_bootstrap = {
-	ARTSC_DRIVER_NAME, "Analog Realtime Synthesizer",
+AudioBootStrap ARTS_bootstrap = {
+	ARTS_DRIVER_NAME, "Analog Realtime Synthesizer",
 	Audio_Available, Audio_CreateDevice
 };
 
 /* This function waits until it is possible to write a full sound buffer */
-static void ARTSC_WaitAudio(_THIS)
+static void ARTS_WaitAudio(_THIS)
 {
 	Sint32 ticks;
 
@@ -211,7 +211,7 @@ static void ARTSC_WaitAudio(_THIS)
 	}
 }
 
-static void ARTSC_PlayAudio(_THIS)
+static void ARTS_PlayAudio(_THIS)
 {
 	int written;
 
@@ -232,12 +232,12 @@ static void ARTSC_PlayAudio(_THIS)
 #endif
 }
 
-static Uint8 *ARTSC_GetAudioBuf(_THIS)
+static Uint8 *ARTS_GetAudioBuf(_THIS)
 {
 	return(mixbuf);
 }
 
-static void ARTSC_CloseAudio(_THIS)
+static void ARTS_CloseAudio(_THIS)
 {
 	if ( mixbuf != NULL ) {
 		SDL_FreeAudioMem(mixbuf);
@@ -250,7 +250,7 @@ static void ARTSC_CloseAudio(_THIS)
 	SDL_NAME(arts_free)();
 }
 
-static int ARTSC_OpenAudio(_THIS, SDL_AudioSpec *spec)
+static int ARTS_OpenAudio(_THIS, SDL_AudioSpec *spec)
 {
 	int bits, frag_spec;
 	Uint16 test_format, format;

src/audio/arts/SDL_artsaudio.h

@@ -24,7 +24,8 @@
 #define _SDL_artscaudio_h
 
 #include <artsc.h>
-#include "SDL_sysaudio.h"
+
+#include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the video functions */
 #define _THIS	SDL_AudioDevice *this

src/audio/baudio/Makefile.am

-
-## Makefile.am for SDL using the BeOS BSoundPlayer sound driver
-
-noinst_LTLIBRARIES = libaudio_baudio.la
-libaudio_baudio_la_SOURCES = $(SRCS)
-
-# The SDL audio driver sources
-SRCS =	SDL_beaudio.cc	\
-	SDL_beaudio.h

src/audio/baudio/SDL_beaudio.cc

@@ -29,9 +29,9 @@
 extern "C" {
 
 #include "SDL_audio.h"
-#include "SDL_audio_c.h"
-#include "SDL_sysaudio.h"
-#include "SDL_systhread_c.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_sysaudio.h"
+#include "../../thread/SDL_systhread_c.h"
 #include "SDL_beaudio.h"
 
 

src/audio/baudio/SDL_beaudio.h

@@ -23,7 +23,7 @@
 #ifndef _SDL_lowaudio_h
 #define _SDL_lowaudio_h
 
-#include "SDL_sysaudio.h"
+#include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the video functions */
 #define _THIS	SDL_AudioDevice *_this

src/audio/dart/SDL_dart.c

@@ -24,7 +24,7 @@
 
 #include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_audio_c.h"
+#include "../SDL_audio_c.h"
 #include "SDL_dart.h"
 
 // Buffer states:

src/audio/dart/SDL_dart.h

@@ -23,8 +23,6 @@
 #ifndef _SDL_lowaudio_h
 #define _SDL_lowaudio_h
 
-#include "SDL_sysaudio.h"
-
 #define INCL_TYPES
 #define INCL_DOSSEMAPHORES
 #define INCL_DOSRESOURCES
@@ -37,6 +35,8 @@
 #include <os2.h>
 #include <os2me.h>     // DART stuff and MMIO stuff
 
+#include "../SDL_sysaudio.h"
+
 /* Hidden "this" pointer for the audio functions */
 #define _THIS	SDL_AudioDevice *_this
 

src/audio/dc/Makefile.am

-
-## Makefile.am for SDL on the Dreamcast console
-
-noinst_LTLIBRARIES = libaudio_dc.la
-libaudio_dc_la_SOURCES = $(SRCS)
-
-# The SDL audio driver sources
-SRCS =	SDL_dcaudio.c	\
-	SDL_dcaudio.h	\
-	aica.c		\
-	aica.h

src/audio/dc/SDL_dcaudio.c

@@ -32,9 +32,9 @@
 
 #include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_audiomem.h"
-#include "SDL_audio_c.h"
-#include "SDL_audiodev_c.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_audiodev_c.h"
 #include "SDL_dcaudio.h"
 
 #include "aica.h"

src/audio/dc/SDL_dcaudio.h

@@ -23,7 +23,7 @@
 #ifndef _SDL_diskaudio_h
 #define _SDL_diskaudio_h
 
-#include "SDL_sysaudio.h"
+#include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the video functions */
 #define _THIS	SDL_AudioDevice *this

src/audio/disk/Makefile.am

-
-## Makefile.am for SDL audio "driver" that writes to a file.
-
-noinst_LTLIBRARIES = libaudio_disk.la
-libaudio_disk_la_SOURCES = $(SRCS)
-
-# The SDL audio driver sources
-SRCS =	SDL_diskaudio.c	\
-	SDL_diskaudio.h

src/audio/disk/SDL_diskaudio.c

@@ -37,9 +37,9 @@
 
 #include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_audiomem.h"
-#include "SDL_audio_c.h"
-#include "SDL_audiodev_c.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_audiodev_c.h"
 #include "SDL_diskaudio.h"
 
 /* The tag name used by DISK audio */

src/audio/disk/SDL_diskaudio.h

@@ -23,7 +23,7 @@
 #ifndef _SDL_diskaudio_h
 #define _SDL_diskaudio_h
 
-#include "SDL_sysaudio.h"
+#include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the video functions */
 #define _THIS	SDL_AudioDevice *this

src/audio/dma/Makefile.am

-
-## Makefile.am for SDL using the OSS /dev/dsp DMA sound driver
-
-noinst_LTLIBRARIES = libaudio_dma.la
-libaudio_dma_la_SOURCES = $(SRCS)
-
-# The SDL audio driver sources
-SRCS =	SDL_dmaaudio.c	\
-	SDL_dmaaudio.h

src/audio/dma/SDL_dmaaudio.c

@@ -33,7 +33,10 @@
 #include <sys/ioctl.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
-#ifdef OSS_USE_SOUNDCARD_H
+
+#include "SDL_config.h"
+
+#if SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H
 /* This is installed on some systems */
 #include <soundcard.h>
 #else
@@ -47,9 +50,8 @@
 
 #include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_audiomem.h"
-#include "SDL_audio_c.h"
-#include "SDL_audiodev_c.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_audiodev_c.h"
 #include "SDL_dmaaudio.h"
 
 /* The tag name used by DMA audio */

src/audio/dma/SDL_dmaaudio.h

@@ -23,7 +23,7 @@
 #ifndef _SDL_dspaudio_h
 #define _SDL_dspaudio_h
 
-#include "SDL_sysaudio.h"
+#include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the video functions */
 #define _THIS	SDL_AudioDevice *this

src/audio/dmedia/Makefile.am

-
-## Makefile.am for SDL using the IRIX DMedia sound driver
-
-noinst_LTLIBRARIES = libaudio_dmedia.la
-libaudio_dmedia_la_SOURCES = $(SRCS)
-
-# The SDL audio driver sources
-SRCS =	SDL_irixaudio.c	\
-	SDL_irixaudio.h

src/audio/dmedia/SDL_irixaudio.c

@@ -25,8 +25,8 @@
 
 #include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_audiomem.h"
-#include "SDL_audio_c.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
 #include "SDL_irixaudio.h"
 
 

src/audio/dmedia/SDL_irixaudio.h

@@ -25,7 +25,7 @@
 
 #include <dmedia/audio.h>
 
-#include "SDL_sysaudio.h"
+#include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the audio functions */
 #define _THIS	SDL_AudioDevice *this

src/audio/dsp/Makefile.am

-
-## Makefile.am for SDL using the OSS /dev/dsp standard sound driver
-
-noinst_LTLIBRARIES = libaudio_dsp.la
-libaudio_dsp_la_SOURCES = $(SRCS)
-
-# The SDL audio driver sources
-SRCS =	SDL_dspaudio.c	\
-	SDL_dspaudio.h

src/audio/dsp/SDL_dspaudio.c

@@ -34,7 +34,10 @@
 #include <sys/time.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
-#ifdef OSS_USE_SOUNDCARD_H
+
+#include "SDL_config.h"
+
+#if SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H
 /* This is installed on some systems */
 #include <soundcard.h>
 #else
@@ -44,9 +47,9 @@
 
 #include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_audiomem.h"
-#include "SDL_audio_c.h"
-#include "SDL_audiodev_c.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_audiodev_c.h"
 #include "SDL_dspaudio.h"
 
 /* The tag name used by DSP audio */

src/audio/dsp/SDL_dspaudio.h

@@ -23,7 +23,7 @@
 #ifndef _SDL_dspaudio_h
 #define _SDL_dspaudio_h
 
-#include "SDL_sysaudio.h"
+#include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the video functions */
 #define _THIS	SDL_AudioDevice *this

src/audio/esd/Makefile.am

-
-## Makefile.am for SDL using the Enlightened Sound Daemon sound driver
-
-noinst_LTLIBRARIES = libaudio_esd.la
-libaudio_esd_la_SOURCES = $(SRCS)
-
-esd_lib = \"@esd_lib@\"
-
-# The SDL audio driver sources
-SRCS =	SDL_esdaudio.c	\
-	SDL_esdaudio.h

src/audio/esd/SDL_esdaudio.c

@@ -30,12 +30,12 @@
 
 #include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_audiomem.h"
-#include "SDL_audio_c.h"
-#include "SDL_audiodev_c.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_audiodev_c.h"
 #include "SDL_esdaudio.h"
 
-#ifdef ESD_DYNAMIC
+#ifdef SDL_AUDIO_DRIVER_ESD_DYNAMIC
 #include "SDL_name.h"
 #include "SDL_loadso.h"
 #else
@@ -52,9 +52,9 @@ static void ESD_PlayAudio(_THIS);
 static Uint8 *ESD_GetAudioBuf(_THIS);
 static void ESD_CloseAudio(_THIS);
 
-#ifdef ESD_DYNAMIC
+#ifdef SDL_AUDIO_DRIVER_ESD_DYNAMIC
 
-static const char *esd_library = ESD_DYNAMIC;
+static const char *esd_library = SDL_AUDIO_DRIVER_ESD_DYNAMIC;
 static void *esd_handle = NULL;
 static int esd_loaded = 0;
 
@@ -112,7 +112,7 @@ static int LoadESDLibrary(void)
 	return 0;
 }
 
-#endif /* ESD_DYNAMIC */
+#endif /* SDL_AUDIO_DRIVER_ESD_DYNAMIC */
 
 /* Audio driver bootstrap functions */
 

src/audio/esd/SDL_esdaudio.h

@@ -23,7 +23,7 @@
 #ifndef _SDL_esdaudio_h
 #define _SDL_esdaudio_h
 
-#include "SDL_sysaudio.h"
+#include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the video functions */
 #define _THIS	SDL_AudioDevice *this

src/audio/macosx/Makefile.am

-
-## Makefile.am for SDL using the Mac OS X CoreAudio driver
-
-noinst_LTLIBRARIES = libaudio_macosx.la
-libaudio_macosx_la_SOURCES = $(SRCS)
-
-# The SDL audio driver sources
-SRCS =	SDL_coreaudio.c	\
-	SDL_coreaudio.h

src/audio/macosx/SDL_coreaudio.c

@@ -23,9 +23,8 @@
 #include <AudioUnit/AudioUnit.h>
 
 #include "SDL_audio.h"
-#include "SDL_audio_c.h"
-#include "SDL_audiomem.h"
-#include "SDL_sysaudio.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_sysaudio.h"
 #include "SDL_coreaudio.h"
 
 

src/audio/macosx/SDL_coreaudio.h

@@ -23,7 +23,7 @@
 #ifndef _SDL_coreaudio_h
 #define _SDL_coreaudio_h
 
-#include "SDL_sysaudio.h"
+#include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the video functions */
 #define _THIS	SDL_AudioDevice *this

src/audio/macrom/Makefile.am

-
-## Makefile.am for SDL using the MacOS SoundManager audio driver
-
-noinst_LTLIBRARIES = libaudio_macrom.la
-libaudio_macrom_la_SOURCES = $(SRCS)
-
-# The SDL audio driver sources
-SRCS =	SDL_romaudio.c	\
-	SDL_romaudio.h

src/audio/macrom/SDL_romaudio.c

@@ -40,9 +40,8 @@
 #endif
 
 #include "SDL_audio.h"
-#include "SDL_audio_c.h"
-#include "SDL_audiomem.h"
-#include "SDL_sysaudio.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_sysaudio.h"
 #include "SDL_romaudio.h"
 
 /* Audio driver functions */

src/audio/macrom/SDL_romaudio.h

@@ -23,7 +23,7 @@
 #ifndef _SDL_romaudio_h
 #define _SDL_romaudio_h
 
-#include "SDL_sysaudio.h"
+#include "../SDL_sysaudio.h"
 
 /* This is Ryan's improved MacOS sound code, with locking support */
 #define USE_RYANS_SOUNDCODE

src/audio/mint/Makefile.am

-## Makefile.am for SDL using Xbios/Dma/whatever available audio functions
-
-noinst_LTLIBRARIES = libaudio_mintaudio.la
-libaudio_mintaudio_la_SOURCES = $(SRCS)
-
-# The SDL audio driver sources
-SRCS = \
-	SDL_mintaudio.c	\
-	SDL_mintaudio.h	\
-	SDL_mintaudio_dma8.c	\
-	SDL_mintaudio_dma8.h	\
-	SDL_mintaudio_gsxb.c	\
-	SDL_mintaudio_gsxb.h	\
-	SDL_mintaudio_it.S	\
-	SDL_mintaudio_mcsn.c	\
-	SDL_mintaudio_mcsn.h	\
-	SDL_mintaudio_stfa.c	\
-	SDL_mintaudio_stfa.h	\
-	SDL_mintaudio_xbios.c

src/audio/mint/SDL_mintaudio.h

@@ -29,7 +29,7 @@
 #ifndef _SDL_mintaudio_h
 #define _SDL_mintaudio_h
 
-#include "SDL_sysaudio.h"
+#include "../SDL_sysaudio.h"
 #include "SDL_mintaudio_stfa.h"
 
 /* Hidden "this" pointer for the audio functions */

src/audio/mint/SDL_mintaudio_dma8.c

@@ -33,9 +33,8 @@
 #include <mint/cookie.h>
 
 #include "SDL_audio.h"
-#include "SDL_audio_c.h"
-#include "SDL_audiomem.h"
-#include "SDL_sysaudio.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_sysaudio.h"
 
 #include "SDL_atarimxalloc_c.h"
 

src/audio/mint/SDL_mintaudio_gsxb.c

@@ -33,9 +33,8 @@
 #include <mint/cookie.h>
 
 #include "SDL_audio.h"
-#include "SDL_audio_c.h"
-#include "SDL_audiomem.h"
-#include "SDL_sysaudio.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_sysaudio.h"
 
 #include "SDL_atarimxalloc_c.h"
 

src/audio/mint/SDL_mintaudio_mcsn.c

@@ -35,9 +35,8 @@
 #include <mint/cookie.h>
 
 #include "SDL_audio.h"
-#include "SDL_audio_c.h"
-#include "SDL_audiomem.h"
-#include "SDL_sysaudio.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_sysaudio.h"
 
 #include "SDL_atarimxalloc_c.h"
 

src/audio/mint/SDL_mintaudio_stfa.c

@@ -33,9 +33,8 @@
 #include <mint/cookie.h>
 
 #include "SDL_audio.h"
-#include "SDL_audio_c.h"
-#include "SDL_audiomem.h"
-#include "SDL_sysaudio.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_sysaudio.h"
 
 #include "SDL_atarimxalloc_c.h"
 
@@ -161,8 +160,8 @@ static void Mint_LockAudio(_THIS)
 
 	/* Stop replay */
 	oldpile=(void *)Super(0);
-	cookie_stfa->sound_enable=STFA_PLAY_DISABLE;
-	Super(oldpile);
+	cookie_stfa->sound_enable=STFA_PLAY_SDL_DISABLE;
+	Super( SDL_arraysize(Super),oldpile);
 }
 
 static void Mint_UnlockAudio(_THIS)

src/audio/mint/SDL_mintaudio_xbios.c

@@ -36,9 +36,8 @@
 #include <mint/cookie.h>
 
 #include "SDL_audio.h"
-#include "SDL_audio_c.h"
-#include "SDL_audiomem.h"
-#include "SDL_sysaudio.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_sysaudio.h"
 
 #include "SDL_atarimxalloc_c.h"
 

src/audio/mme/Makefile.am

-
-## Makefile.am for SDL using the Tru64 MME sound driver
-
-noinst_LTLIBRARIES = libaudio_mme.la
-libaudio_mme_la_SOURCES = $(SRCS)
-
-# The SDL audio driver sources
-SRCS =	SDL_mmeaudio.c	\
-	SDL_mmeaudio.h

src/audio/mme/SDL_mmeaudio.c

@@ -25,8 +25,7 @@
 
 #include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_audio_c.h"
-
+#include "../SDL_audio_c.h"
 #include "SDL_mmeaudio.h"
 
 static BOOL inUse[NUM_BUFFERS];

src/audio/mme/SDL_mmeaudio.h

@@ -24,7 +24,8 @@
 
 #ifndef _SDL_lowaudio_h
 #define _SDL_lowaudio_h
-#include "SDL_sysaudio.h"
+
+#include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the video functions */
 #define _THIS	SDL_AudioDevice *this

src/audio/nas/Makefile.am

-
-## Makefile.am for SDL using the Network Audio System sound driver
-
-noinst_LTLIBRARIES = libaudio_nas.la
-libaudio_nas_la_SOURCES = $(SRCS)
-
-# The SDL audio driver sources
-SRCS =	SDL_nasaudio.c	\
-	SDL_nasaudio.h

src/audio/nas/SDL_nasaudio.c

@@ -31,9 +31,9 @@
 
 #include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_audiomem.h"
-#include "SDL_audio_c.h"
-#include "SDL_audiodev_c.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_audiodev_c.h"
 #include "SDL_nasaudio.h"
 
 /* The tag name used by artsc audio */

src/audio/nas/SDL_nasaudio.h

@@ -33,7 +33,8 @@
 #include <audio/audiolib.h>
 #endif
 #include <sys/time.h>
-#include "SDL_sysaudio.h"
+
+#include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the video functions */
 #define _THIS	SDL_AudioDevice *this

src/audio/nto/Makefile.am

-
-## Makefile.am for SDL using the QNX Neutrino PCM audio API
-
-noinst_LTLIBRARIES = libaudio_nto.la
-libaudio_nto_la_SOURCES = $(SRCS)
-
-# The SDL audio driver sources
-SRCS =	SDL_nto_audio.c	\
-	SDL_nto_audio.h

src/audio/nto/SDL_nto_audio.c

@@ -33,8 +33,8 @@
 
 #include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_audiomem.h"
-#include "SDL_audio_c.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
 #include "SDL_nto_audio.h"
 
 /* The tag name used by NTO audio */

src/audio/nto/SDL_nto_audio.h

@@ -23,9 +23,10 @@
 #ifndef __SDL_NTO_AUDIO_H__
 #define __SDL_NTO_AUDIO_H__
 
-#include "SDL_sysaudio.h"
 #include <sys/asoundlib.h>
 
+#include "../SDL_sysaudio.h"
+
 /* Hidden "this" pointer for the audio functions */
 #define _THIS	SDL_AudioDevice *this
 

src/audio/openbsd/Makefile.am

-
-## Makefile.am for SDL using the native OpenBSD sound driver
-
-noinst_LTLIBRARIES = libaudio_openbsd.la
-libaudio_openbsd_la_SOURCES = $(SRCS)
-
-# The SDL audio driver sources
-SRCS =	SDL_openbsdaudio.c	\
-	SDL_openbsdaudio.h

src/audio/openbsd/SDL_openbsdaudio.c

@@ -36,9 +36,9 @@
 
 #include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_audiomem.h"
-#include "SDL_audio_c.h"
-#include "SDL_audiodev_c.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_audiodev_c.h"
 #include "SDL_openbsdaudio.h"
 
 /* The tag name used by OpenBSD audio */

src/audio/openbsd/SDL_openbsdaudio.h

@@ -23,7 +23,7 @@
 #ifndef _SDL_openbsdaudio_h
 #define _SDL_openbsdaudio_h
 
-#include "SDL_sysaudio.h"
+#include "../SDL_sysaudio.h"
 
 #define _THIS	SDL_AudioDevice *this
 

src/audio/paudio/Makefile.am

-
-## Makefile.am for SDL using the AIX PAudio sound driver
-
-noinst_LTLIBRARIES = libaudio_paudio.la
-libaudio_paudio_la_SOURCES = $(SRCS)
-
-# The SDL audio driver sources
-SRCS =	SDL_paudio.c	\
-	SDL_paudio.h

src/audio/paudio/SDL_paudio.c

@@ -33,9 +33,9 @@
 
 #include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_audiomem.h"
-#include "SDL_audio_c.h"
-#include "SDL_audiodev_c.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_audiodev_c.h"
 #include "SDL_paudio.h"
 
 #define DEBUG_AUDIO 1

src/audio/paudio/SDL_paudio.h

@@ -23,7 +23,7 @@
 #ifndef _SDL_paudaudio_h
 #define _SDL_paudaudio_h
 
-#include "SDL_sysaudio.h"
+#include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the video functions */
 #define _THIS	SDL_AudioDevice *this

src/audio/sun/Makefile.am

-
-## Makefile.am for SDL using the UNIX /dev/audio sound driver
-
-noinst_LTLIBRARIES = libaudio_sun.la
-libaudio_sun_la_SOURCES = $(SRCS)
-
-# The SDL audio driver sources
-SRCS =	SDL_sunaudio.c	\
-	SDL_sunaudio.h

src/audio/sun/SDL_sunaudio.c

@@ -38,10 +38,10 @@
 
 #include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_audiomem.h"
-#include "SDL_audiodev_c.h"
+#include "../SDL_audiomem.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_audiodev_c.h"
 #include "SDL_sunaudio.h"
-#include "SDL_audio_c.h"
 
 /* Open the audio device for playback, and don't block if busy */
 #define OPEN_FLAGS	(O_WRONLY|O_NONBLOCK)

src/audio/sun/SDL_sunaudio.h

@@ -23,7 +23,7 @@
 #ifndef _SDL_lowaudio_h
 #define _SDL_lowaudio_h
 
-#include "SDL_sysaudio.h"
+#include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the video functions */
 #define _THIS	SDL_AudioDevice *this

src/audio/ums/Makefile.am

-
-## Makefile.am for SDL using the AIX UMS sound driver
-
-noinst_LTLIBRARIES = libaudio_ums.la
-libaudio_ums_la_SOURCES = $(SRCS)
-
-# The SDL audio driver sources
-SRCS =	SDL_umsaudio.c	\
-	SDL_umsaudio.h

src/audio/ums/SDL_umsaudio.c

@@ -34,8 +34,8 @@
 #include <sys/mman.h>
 
 #include "SDL_audio.h"
-#include "SDL_audio_c.h"
-#include "SDL_audiodev_c.h"
+#include "../SDL_audio_c.h"
+#include "../SDL_audiodev_c.h"
 #include "SDL_umsaudio.h"
 
 /* The tag name used by UMS audio */

src/audio/ums/SDL_umsaudio.h

@@ -25,10 +25,10 @@
 #ifndef _SDL_UMSaudio_h
 #define _SDL_UMSaudio_h
 
-#include "SDL_sysaudio.h"
-
 #include <UMS/UMSAudioDevice.h>
 
+#include "../SDL_sysaudio.h"
+
 /* Hidden "this" pointer for the video functions */
 #define _THIS	SDL_AudioDevice *this
 

src/audio/windib/Makefile.am

-
-## Makefile.am for SDL using the Win32 WaveOut audio driver
-
-noinst_LTLIBRARIES = libaudio_windib.la
-libaudio_windib_la_SOURCES = $(SRCS)
-
-# The SDL audio driver sources
-SRCS =	SDL_dibaudio.c	\
-	SDL_dibaudio.h

src/audio/windib/SDL_dibaudio.c

@@ -27,7 +27,7 @@
 
 #include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_audio_c.h"
+#include "../SDL_audio_c.h"
 #include "SDL_dibaudio.h"
 #if defined(_WIN32_WCE) && (_WIN32_WCE < 300)
 #include "win_ce_semaphore.h"

src/audio/windib/SDL_dibaudio.h

@@ -23,7 +23,7 @@
 #ifndef _SDL_lowaudio_h
 #define _SDL_lowaudio_h
 
-#include "SDL_sysaudio.h"
+#include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the video functions */
 #define _THIS	SDL_AudioDevice *this

src/audio/windx5/Makefile.am

-
-## Makefile.am for SDL using the Win32 DirectX audio driver
-
-noinst_LTLIBRARIES = libaudio_windx5.la
-libaudio_windx5_la_SOURCES = $(SRCS)
-
-# The SDL audio driver sources
-SRCS =	SDL_dx5audio.c	\
-	SDL_dx5audio.h	\
-	directx.h

src/audio/windx5/SDL_dx5audio.c

@@ -24,7 +24,7 @@
 
 #include "SDL_timer.h"
 #include "SDL_audio.h"
-#include "SDL_audio_c.h"
+#include "../SDL_audio_c.h"
 #include "SDL_dx5audio.h"
 
 /* Define this if you want to use DirectX 6 DirectSoundNotify interface */

src/audio/windx5/SDL_dx5audio.h

@@ -25,7 +25,7 @@
 
 #include "directx.h"
 
-#include "SDL_sysaudio.h"
+#include "../SDL_sysaudio.h"
 
 /* Hidden "this" pointer for the video functions */
 #define _THIS	SDL_AudioDevice *this