Skip to content
Permalink
Browse files

*** empty log message ***

  • Loading branch information
Sam Lantinga committed Jan 14, 2000
1 parent eadd07f commit 243f67b483189d72f435ea8e724e6597a3a0bba5
Showing with 55 additions and 49 deletions.
  1. +6 −0 CHANGES
  2. +9 −9 Makefile.am
  3. +33 −33 Makefile.in
  4. 0 mixer.h → SDL_mixer.h
  5. +1 −1 configure
  6. +1 −1 configure.in
  7. +1 −1 mixer.c
  8. +1 −1 music.c
  9. +1 −1 music_cmd.c
  10. +1 −1 playmus.c
  11. +1 −1 playwave.c
@@ -1,4 +1,10 @@

1.0.3:
Sam Lantinga - Fri Jan 14 11:06:56 PST 2000
* Made the CHANGELOG entries Y2K compliant. :)
* Changed the name of the library from "mixer" to "SDLmixer"
Instead of including "mixer.h", include "SDL_mixer.h"

1.0.2:
FXJ - Updated the mikmod support to MikMod 3.1.8
FXJ - Added Mix_HookMusicFinished() API function
@@ -1,15 +1,15 @@
# Makefile.am for the SDL sample mixer library and players

lib_LTLIBRARIES = libmixer.la
lib_LTLIBRARIES = libSDLmixer.la

SUBDIRS = @MUSIC_SUBDIRS@
DIST_SUBIDRS = mikmod timidity

libmixerincludedir = $(includedir)
libmixerinclude_HEADERS = \
mixer.h
libSDLmixerincludedir = $(includedir)/SDL
libSDLmixerinclude_HEADERS = \
SDL_mixer.h

libmixer_la_SOURCES = \
libSDLmixer_la_SOURCES = \
mixer.c \
music.c \
music_cmd.c \
@@ -29,12 +29,12 @@ else
TIMIDITY_LIB =
endif

libmixer_la_LDFLAGS = \
libSDLmixer_la_LDFLAGS = \
-release $(LT_RELEASE) \
-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
libmixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)
libSDLmixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)

bin_PROGRAMS = playwave playmus

playwave_LDADD = libmixer.la
playmus_LDADD = libmixer.la
playwave_LDADD = libSDLmixer.la
playmus_LDADD = libSDLmixer.la
@@ -88,30 +88,30 @@ SDL_CONFIG = @SDL_CONFIG@
SDL_LIBS = @SDL_LIBS@
VERSION = @VERSION@

lib_LTLIBRARIES = libmixer.la
lib_LTLIBRARIES = libSDLmixer.la

SUBDIRS = @MUSIC_SUBDIRS@
DIST_SUBIDRS = mikmod timidity

libmixerincludedir = $(includedir)
libmixerinclude_HEADERS = mixer.h
libSDLmixerincludedir = $(includedir)/SDL
libSDLmixerinclude_HEADERS = SDL_mixer.h


libmixer_la_SOURCES = mixer.c music.c music_cmd.c music_cmd.h wave.h wavestream.c wavestream.h
libSDLmixer_la_SOURCES = mixer.c music.c music_cmd.c music_cmd.h wave.h wavestream.c wavestream.h

@USE_MIKMOD_TRUE@MIKMOD_LIB = mikmod/libmikmod.la
@USE_MIKMOD_FALSE@MIKMOD_LIB =
@USE_TIMIDITY_TRUE@TIMIDITY_LIB = timidity/libtimidity.la
@USE_TIMIDITY_FALSE@TIMIDITY_LIB =

libmixer_la_LDFLAGS = -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
libSDLmixer_la_LDFLAGS = -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)

libmixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)
libSDLmixer_la_LIBADD = $(MIKMOD_LIB) $(TIMIDITY_LIB)

bin_PROGRAMS = playwave playmus

playwave_LDADD = libmixer.la
playmus_LDADD = libmixer.la
playwave_LDADD = libSDLmixer.la
playmus_LDADD = libSDLmixer.la
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_CLEAN_FILES =
@@ -122,31 +122,31 @@ DEFS = @DEFS@ -I. -I$(srcdir)
CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
@USE_TIMIDITY_FALSE@@USE_MIKMOD_FALSE@libmixer_la_DEPENDENCIES =
@USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@libmixer_la_DEPENDENCIES = \
@USE_TIMIDITY_FALSE@@USE_MIKMOD_FALSE@libSDLmixer_la_DEPENDENCIES =
@USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@libSDLmixer_la_DEPENDENCIES = \
@USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@mikmod/libmikmod.la \
@USE_TIMIDITY_TRUE@@USE_MIKMOD_TRUE@timidity/libtimidity.la
@USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@libmixer_la_DEPENDENCIES = \
@USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@libSDLmixer_la_DEPENDENCIES = \
@USE_TIMIDITY_TRUE@@USE_MIKMOD_FALSE@timidity/libtimidity.la
@USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@libmixer_la_DEPENDENCIES = \
@USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@libSDLmixer_la_DEPENDENCIES = \
@USE_TIMIDITY_FALSE@@USE_MIKMOD_TRUE@mikmod/libmikmod.la
libmixer_la_OBJECTS = mixer.lo music.lo music_cmd.lo wavestream.lo
libSDLmixer_la_OBJECTS = mixer.lo music.lo music_cmd.lo wavestream.lo
PROGRAMS = $(bin_PROGRAMS)

playwave_SOURCES = playwave.c
playwave_OBJECTS = playwave.o
playwave_DEPENDENCIES = libmixer.la
playwave_DEPENDENCIES = libSDLmixer.la
playwave_LDFLAGS =
playmus_SOURCES = playmus.c
playmus_OBJECTS = playmus.o
playmus_DEPENDENCIES = libmixer.la
playmus_DEPENDENCIES = libSDLmixer.la
playmus_LDFLAGS =
CFLAGS = @CFLAGS@
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
HEADERS = $(libmixerinclude_HEADERS)
HEADERS = $(libSDLmixerinclude_HEADERS)

DIST_COMMON = README COPYING Makefile.am Makefile.in acinclude.m4 \
aclocal.m4 config.guess config.sub configure configure.in install-sh \
@@ -159,8 +159,8 @@ TAR = gtar
GZIP_ENV = --best
DEP_FILES = .deps/mixer.P .deps/music.P .deps/music_cmd.P \
.deps/playmus.P .deps/playwave.P .deps/wavestream.P
SOURCES = $(libmixer_la_SOURCES) playwave.c playmus.c
OBJECTS = $(libmixer_la_OBJECTS) playwave.o playmus.o
SOURCES = $(libSDLmixer_la_SOURCES) playwave.c playmus.c
OBJECTS = $(libSDLmixer_la_OBJECTS) playwave.o playmus.o

all: all-redirect
.SUFFIXES:
@@ -237,8 +237,8 @@ distclean-libtool:

maintainer-clean-libtool:

libmixer.la: $(libmixer_la_OBJECTS) $(libmixer_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libmixer_la_LDFLAGS) $(libmixer_la_OBJECTS) $(libmixer_la_LIBADD) $(LIBS)
libSDLmixer.la: $(libSDLmixer_la_OBJECTS) $(libSDLmixer_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libSDLmixer_la_LDFLAGS) $(libSDLmixer_la_OBJECTS) $(libSDLmixer_la_LIBADD) $(LIBS)

mostlyclean-binPROGRAMS:

@@ -273,19 +273,19 @@ playmus: $(playmus_OBJECTS) $(playmus_DEPENDENCIES)
@rm -f playmus
$(LINK) $(playmus_LDFLAGS) $(playmus_OBJECTS) $(playmus_LDADD) $(LIBS)

install-libmixerincludeHEADERS: $(libmixerinclude_HEADERS)
install-libSDLmixerincludeHEADERS: $(libSDLmixerinclude_HEADERS)
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(libmixerincludedir)
@list='$(libmixerinclude_HEADERS)'; for p in $$list; do \
$(mkinstalldirs) $(DESTDIR)$(libSDLmixerincludedir)
@list='$(libSDLmixerinclude_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \
echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libmixerincludedir)/$$p"; \
$(INSTALL_DATA) $$d$$p $(DESTDIR)$(libmixerincludedir)/$$p; \
echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(libSDLmixerincludedir)/$$p"; \
$(INSTALL_DATA) $$d$$p $(DESTDIR)$(libSDLmixerincludedir)/$$p; \
done

uninstall-libmixerincludeHEADERS:
uninstall-libSDLmixerincludeHEADERS:
@$(NORMAL_UNINSTALL)
list='$(libmixerinclude_HEADERS)'; for p in $$list; do \
rm -f $(DESTDIR)$(libmixerincludedir)/$$p; \
list='$(libSDLmixerinclude_HEADERS)'; for p in $$list; do \
rm -f $(DESTDIR)$(libSDLmixerincludedir)/$$p; \
done

# This directory's subdirectories are mostly independent; you can cd
@@ -483,14 +483,14 @@ installcheck: installcheck-recursive
install-exec-am: install-libLTLIBRARIES install-binPROGRAMS
install-exec: install-exec-recursive

install-data-am: install-libmixerincludeHEADERS
install-data-am: install-libSDLmixerincludeHEADERS
install-data: install-data-recursive

install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
install: install-recursive
uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
uninstall-libmixerincludeHEADERS
uninstall-libSDLmixerincludeHEADERS
uninstall: uninstall-recursive
all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
all-redirect: all-recursive
@@ -499,7 +499,7 @@ install-strip:
installdirs: installdirs-recursive
installdirs-am:
$(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
$(DESTDIR)$(libmixerincludedir)
$(DESTDIR)$(libSDLmixerincludedir)


mostlyclean-generic:
@@ -549,8 +549,8 @@ distclean-compile clean-compile maintainer-clean-compile \
mostlyclean-libtool distclean-libtool clean-libtool \
maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \
clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
install-binPROGRAMS uninstall-libmixerincludeHEADERS \
install-libmixerincludeHEADERS install-data-recursive \
install-binPROGRAMS uninstall-libSDLmixerincludeHEADERS \
install-libSDLmixerincludeHEADERS install-data-recursive \
uninstall-data-recursive install-exec-recursive \
uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
all-recursive check-recursive installcheck-recursive info-recursive \
File renamed without changes.
@@ -753,7 +753,7 @@ fi



PACKAGE=mixer
PACKAGE=SDLmixer

VERSION=$VERSION

@@ -37,7 +37,7 @@ AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)

dnl Setup for automake
AM_INIT_AUTOMAKE(mixer, $VERSION)
AM_INIT_AUTOMAKE(SDLmixer, $VERSION)

dnl Check for tools

@@ -32,7 +32,7 @@
#include "SDL_endian.h"
#include "SDL_timer.h"

#include "mixer.h"
#include "SDL_mixer.h"

static int audio_opened = 0;

@@ -28,7 +28,7 @@
#include "SDL_audio.h"
#include "SDL_timer.h"

#include "mixer.h"
#include "SDL_mixer.h"

/* The music command hack is UNIX specific */
#ifndef unix
@@ -34,7 +34,7 @@
#include <string.h>
#include <signal.h>

#include "mixer.h"
#include "SDL_mixer.h"
#include "music_cmd.h"

/* Unimplemented */
@@ -31,7 +31,7 @@
#endif

#include "SDL.h"
#include "mixer.h"
#include "SDL_mixer.h"


static int audio_open = 0;
@@ -31,7 +31,7 @@
#endif

#include "SDL.h"
#include "mixer.h"
#include "SDL_mixer.h"


static int audio_open = 0;

0 comments on commit 243f67b

Please sign in to comment.