Updated for SDL 1.0.1
authorSam Lantinga <slouken@lokigames.com>
Tue, 21 Dec 1999 17:13:05 +0000
changeset 24a25bb2d59ce8
parent 23 0578063e33d8
child 25 570c888ed4ce
Updated for SDL 1.0.1
Makefile.in
configure
configure.in
mixer.c
mixer.h
music.c
playmus.c
playwave.c
timidity/timidity.c
wavestream.c
     1.1 --- a/Makefile.in	Sat Dec 11 04:24:43 1999 +0000
     1.2 +++ b/Makefile.in	Tue Dec 21 17:13:05 1999 +0000
     1.3 @@ -1,4 +1,4 @@
     1.4 -# Makefile.in generated automatically by automake 1.4a from Makefile.am
     1.5 +# Makefile.in generated automatically by automake 1.4 from Makefile.am
     1.6  
     1.7  # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
     1.8  # This Makefile.in is free software; the Free Software Foundation
     1.9 @@ -48,10 +48,9 @@
    1.10  AUTOHEADER = @AUTOHEADER@
    1.11  
    1.12  INSTALL = @INSTALL@
    1.13 -INSTALL_PROGRAM = @INSTALL_PROGRAM@
    1.14 +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
    1.15  INSTALL_DATA = @INSTALL_DATA@
    1.16  INSTALL_SCRIPT = @INSTALL_SCRIPT@
    1.17 -INSTALL_STRIP_FLAG =
    1.18  transform = @program_transform_name@
    1.19  
    1.20  NORMAL_INSTALL = :
    1.21 @@ -254,8 +253,8 @@
    1.22  	$(mkinstalldirs) $(DESTDIR)$(bindir)
    1.23  	@list='$(bin_PROGRAMS)'; for p in $$list; do \
    1.24  	  if test -f $$p; then \
    1.25 -	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
    1.26 -	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
    1.27 +	    echo " $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
    1.28 +	    $(LIBTOOL)  --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
    1.29  	  else :; fi; \
    1.30  	done
    1.31  
    1.32 @@ -423,7 +422,7 @@
    1.33  	@for file in $(DISTFILES); do \
    1.34  	  d=$(srcdir); \
    1.35  	  if test -d $$d/$$file; then \
    1.36 -	    cp -pr $$d/$$file $(distdir)/$$file; \
    1.37 +	    cp -pr $$/$$file $(distdir)/$$file; \
    1.38  	  else \
    1.39  	    test -f $(distdir)/$$file \
    1.40  	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
    1.41 @@ -495,7 +494,7 @@
    1.42  all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
    1.43  all-redirect: all-recursive
    1.44  install-strip:
    1.45 -	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
    1.46 +	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
    1.47  installdirs: installdirs-recursive
    1.48  installdirs-am:
    1.49  	$(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
     2.1 --- a/configure	Sat Dec 11 04:24:43 1999 +0000
     2.2 +++ b/configure	Tue Dec 21 17:13:05 1999 +0000
     2.3 @@ -1688,7 +1688,7 @@
     2.4          ;;
     2.5  esac
     2.6  
     2.7 -SDL_VERSION=1.0.0
     2.8 +SDL_VERSION=1.0.1
     2.9  # Check whether --with-sdl-prefix or --without-sdl-prefix was given.
    2.10  if test "${with_sdl_prefix+set}" = set; then
    2.11    withval="$with_sdl_prefix"
     3.1 --- a/configure.in	Sat Dec 11 04:24:43 1999 +0000
     3.2 +++ b/configure.in	Tue Dec 21 17:13:05 1999 +0000
     3.3 @@ -55,7 +55,7 @@
     3.4  esac
     3.5  
     3.6  dnl Check for SDL
     3.7 -SDL_VERSION=1.0.0
     3.8 +SDL_VERSION=1.0.1
     3.9  AM_PATH_SDL($SDL_VERSION,
    3.10              :,
    3.11  	    AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
     4.1 --- a/mixer.c	Sat Dec 11 04:24:43 1999 +0000
     4.2 +++ b/mixer.c	Tue Dec 21 17:13:05 1999 +0000
     4.3 @@ -28,8 +28,8 @@
     4.4  #include <stdlib.h>
     4.5  #include <string.h>
     4.6  
     4.7 -#include <SDL/SDL_mutex.h>
     4.8 -#include <SDL/SDL_endian.h>
     4.9 +#include "SDL_mutex.h"
    4.10 +#include "SDL_endian.h"
    4.11  
    4.12  #include "mixer.h"
    4.13  
     5.1 --- a/mixer.h	Sat Dec 11 04:24:43 1999 +0000
     5.2 +++ b/mixer.h	Tue Dec 21 17:13:05 1999 +0000
     5.3 @@ -25,9 +25,9 @@
     5.4  #ifndef _MIXER_H_
     5.5  #define _MIXER_H_
     5.6  
     5.7 -#include <SDL/SDL_types.h>
     5.8 -#include <SDL/SDL_rwops.h>
     5.9 -#include <SDL/SDL_audio.h>
    5.10 +#include "SDL_types.h"
    5.11 +#include "SDL_rwops.h"
    5.12 +#include "SDL_audio.h"
    5.13  
    5.14  #include <SDL/begin_code.h>
    5.15  
     6.1 --- a/music.c	Sat Dec 11 04:24:43 1999 +0000
     6.2 +++ b/music.c	Tue Dec 21 17:13:05 1999 +0000
     6.3 @@ -24,8 +24,8 @@
     6.4  
     6.5  #include <stdlib.h>
     6.6  #include <string.h>
     6.7 -#include <SDL/SDL_endian.h>
     6.8 -#include <SDL/SDL_audio.h>
     6.9 +#include "SDL_endian.h"
    6.10 +#include "SDL_audio.h"
    6.11  
    6.12  #include "mixer.h"
    6.13  
     7.1 --- a/playmus.c	Sat Dec 11 04:24:43 1999 +0000
     7.2 +++ b/playmus.c	Tue Dec 21 17:13:05 1999 +0000
     7.3 @@ -30,7 +30,7 @@
     7.4  #include <unistd.h>
     7.5  #endif
     7.6  
     7.7 -#include <SDL/SDL.h>
     7.8 +#include "SDL.h"
     7.9  #include "mixer.h"
    7.10  
    7.11  
     8.1 --- a/playwave.c	Sat Dec 11 04:24:43 1999 +0000
     8.2 +++ b/playwave.c	Tue Dec 21 17:13:05 1999 +0000
     8.3 @@ -30,7 +30,7 @@
     8.4  #include <unistd.h>
     8.5  #endif
     8.6  
     8.7 -#include <SDL/SDL.h>
     8.8 +#include "SDL.h"
     8.9  #include "mixer.h"
    8.10  
    8.11  
     9.1 --- a/timidity/timidity.c	Sat Dec 11 04:24:43 1999 +0000
     9.2 +++ b/timidity/timidity.c	Tue Dec 21 17:13:05 1999 +0000
     9.3 @@ -22,7 +22,7 @@
     9.4  #include <stdlib.h>
     9.5  #include <string.h>
     9.6  
     9.7 -#include <SDL/SDL.h>
     9.8 +#include "SDL.h"
     9.9  #include "config.h"
    9.10  #include "common.h"
    9.11  #include "instrum.h"
    10.1 --- a/wavestream.c	Sat Dec 11 04:24:43 1999 +0000
    10.2 +++ b/wavestream.c	Tue Dec 21 17:13:05 1999 +0000
    10.3 @@ -27,10 +27,10 @@
    10.4  #include <stdlib.h>
    10.5  #include <string.h>
    10.6  
    10.7 -#include <SDL/SDL_audio.h>
    10.8 -#include <SDL/SDL_mutex.h>
    10.9 -#include <SDL/SDL_rwops.h>
   10.10 -#include <SDL/SDL_endian.h>
   10.11 +#include "SDL_audio.h"
   10.12 +#include "SDL_mutex.h"
   10.13 +#include "SDL_rwops.h"
   10.14 +#include "SDL_endian.h"
   10.15  
   10.16  #include "wave.h"
   10.17  #include "wavestream.h"