Navigation Menu

Skip to content

Commit

Permalink
Cross platform cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
Sam Lantinga committed Apr 5, 2001
1 parent d1be5c9 commit 0080141
Show file tree
Hide file tree
Showing 9 changed files with 213 additions and 477 deletions.
Binary file added MPWmake.sea.bin
View file
Binary file not shown.
450 changes: 0 additions & 450 deletions MPWmake.sea.hqx
View file

This file was deleted.

2 changes: 1 addition & 1 deletion Makefile.am
View file
Expand Up @@ -34,7 +34,7 @@ endif
EXTRA_DIST = \
CHANGES \
VisualC.zip \
MPWmake.sea.hqx \
MPWmake.sea.bin \
CWprojects.sea.hqx \
autogen.sh

Expand Down
Binary file modified VisualC.zip
View file
Binary file not shown.
193 changes: 193 additions & 0 deletions acinclude.m4
View file
Expand Up @@ -166,6 +166,199 @@ int main (int argc, char *argv[])
AC_SUBST(SDL_LIBS)
rm -f conf.sdltest
])
# Configure paths for SMPEG
# Nicolas Vignal 11/19/2000
# stolen from Sam Lantinga
# stolen from Manish Singh
# stolen back from Frank Belew
# stolen from Manish Singh
# Shamelessly stolen from Owen Taylor

dnl AM_PATH_SMPEG([MINIMUM-VERSION, [ACTION-IF-FOUND [,
ACTION-IF-NOT-FOUND]]])
dnl Test for SMPEG, and define SMPEG_CFLAGS and SMPEG_LIBS
dnl
AC_DEFUN(AM_PATH_SMPEG,
[dnl
dnl Get the cflags and libraries from the smpeg-config script
dnl
AC_ARG_WITH(smpeg-prefix,[ --with-smpeg-prefix=PFX Prefix where SMPEG is
installed (optional)],
smpeg_prefix="$withval", smpeg_prefix="")
AC_ARG_WITH(smpeg-exec-prefix,[ --with-smpeg-exec-prefix=PFX Exec prefix
where SMPEG is installed (optional)],
smpeg_exec_prefix="$withval", smpeg_exec_prefix="")
AC_ARG_ENABLE(smpegtest, [ --disable-smpegtest Do not try to compile
and run a test SMPEG program],
, enable_smpegtest=yes)
if test x$smpeg_exec_prefix != x ; then
smpeg_args="$smpeg_args --exec-prefix=$smpeg_exec_prefix"
if test x${SMPEG_CONFIG+set} != xset ; then
SMPEG_CONFIG=$smpeg_exec_prefix/bin/smpeg-config
fi
fi
if test x$smpeg_prefix != x ; then
smpeg_args="$smpeg_args --prefix=$smpeg_prefix"
if test x${SMPEG_CONFIG+set} != xset ; then
SMPEG_CONFIG=$smpeg_prefix/bin/smpeg-config
fi
fi
AC_PATH_PROG(SMPEG_CONFIG, smpeg-config, no)
min_smpeg_version=ifelse([$1], ,0.2.7,$1)
AC_MSG_CHECKING(for SMPEG - version >= $min_smpeg_version)
no_smpeg=""
if test "$SMPEG_CONFIG" = "no" ; then
no_smpeg=yes
else
SMPEG_CFLAGS=`$SMPEG_CONFIG $smpegconf_args --cflags`
SMPEG_LIBS=`$SMPEG_CONFIG $smpegconf_args --libs`
smpeg_major_version=`$SMPEG_CONFIG $smpeg_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
smpeg_minor_version=`$SMPEG_CONFIG $smpeg_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
smpeg_micro_version=`$SMPEG_CONFIG $smpeg_config_args --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_smpegtest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $SMPEG_CFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SMPEG_LIBS $SDL_LIBS"
dnl
dnl Now check if the installed SMPEG is sufficiently new. (Also sanity
dnl checks the results of smpeg-config to some extent
dnl
rm -f conf.smpegtest
AC_TRY_RUN([
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "smpeg.h"
char*
my_strdup (char *str)
{
char *new_str;
if (str)
{
new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
strcpy (new_str, str);
}
else
new_str = NULL;
return new_str;
}
int main (int argc, char *argv[])
{
int major, minor, micro;
char *tmp_version;
/* This hangs on some systems (?)
system ("touch conf.smpegtest");
*/
{ FILE *fp = fopen("conf.smpegtest", "a"); if ( fp ) fclose(fp); }
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = my_strdup("$min_smpeg_version");
if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
printf("%s, bad version string\n", "$min_smpeg_version");
exit(1);
}
if (($smpeg_major_version > major) ||
(($smpeg_major_version == major) && ($smpeg_minor_version > minor)) ||
(($smpeg_major_version == major) && ($smpeg_minor_version == minor)
&& ($smpeg_micro_version >= micro)))
{
return 0;
}
else
{
printf("\n*** 'smpeg-config --version' returned %d.%d.%d, but the
minimum version\n", $smpeg_major_version, $smpeg_minor_version,
$smpeg_micro_version);
printf("*** of SMPEG required is %d.%d.%d. If smpeg-config is
correct, then it is\n", major, minor, micro);
printf("*** best to upgrade to the required version.\n");
printf("*** If smpeg-config was wrong, set the environment variable
SMPEG_CONFIG\n");
printf("*** to point to the correct copy of smpeg-config, and remove
the file\n");
printf("*** config.cache before re-running configure\n");
return 1;
}
}
],, no_smpeg=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_smpeg" = x ; then
AC_MSG_RESULT(yes)
ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$SMPEG_CONFIG" = "no" ; then
echo "*** The smpeg-config script installed by SMPEG could not be
found"
echo "*** If SMPEG was installed in PREFIX, make sure PREFIX/bin is
in"
echo "*** your path, or set the SMPEG_CONFIG environment variable to
the"
echo "*** full path to smpeg-config."
else
if test -f conf.smpegtest ; then
:
else
echo "*** Could not run SMPEG test program, checking why..."
CFLAGS="$CFLAGS $SMPEG_CFLAGS $SDL_CFLAGS"
LIBS="$LIBS $SMPEG_LIBS $SDL_LIBS"
AC_TRY_LINK([
#include <stdio.h>
#include "smpeg.h"
], [ return 0; ],
[ echo "*** The test program compiled, but did not run. This
usually means"
echo "*** that the run-time linker is not finding SMPEG or
finding the wrong"
echo "*** version of SMPEG. If it is not finding SMPEG, you'll
need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit
/etc/ld.so.conf to point"
echo "*** to the installed location Also, make sure you have run
ldconfig if that"
echo "*** is required on your system"
echo "***"
echo "*** If you have an old version installed, it is best to
remove it, although"
echo "*** you may also be able to get things to work by modifying
LD_LIBRARY_PATH"],
[ echo "*** The test program failed to compile or link. See the
file config.log for the"
echo "*** exact error that occured. This usually means SMPEG was
incorrectly installed"
echo "*** or that you have moved SMPEG since it was installed. In
the latter case, you"
echo "*** may want to edit the smpeg-config script:
$SMPEG_CONFIG" ])
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
SMPEG_CFLAGS=""
SMPEG_LIBS=""
ifelse([$3], , :, [$3])
fi
AC_SUBST(SMPEG_CFLAGS)
AC_SUBST(SMPEG_LIBS)
rm -f conf.smpegtest
])
## libtool.m4 - Configure libtool for the target system. -*-Shell-script-*-
## Copyright (C) 1996-1999, 2000 Free Software Foundation, Inc.
## Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
Expand Down
15 changes: 4 additions & 11 deletions configure.in
View file
Expand Up @@ -125,18 +125,11 @@ AC_ARG_ENABLE(music-mp3,
[ --enable-music-mp3 enable MP3 music via smpeg [default=yes]],
, enable_music_mp3=yes)
if test x$enable_music_mp3 = xyes; then
AC_MSG_CHECKING(for SMPEG headers and libraries)
have_smpeg=no
AC_TRY_COMPILE([
#include <smpeg/smpeg.h>
],[
],[
have_smpeg=yes
])
AC_MSG_RESULT($have_smpeg)
SMPEG_VERSION=0.4.3
AM_PATH_SMPEG($SMPEG_VERSION, have_smpeg=yes, have_smpeg=no)
if test x$have_smpeg = xyes; then
CFLAGS="$CFLAGS -DMP3_MUSIC"
LIBS="$LIBS -lsmpeg"
CFLAGS="$CFLAGS $SMPEG_CFLAGS"
LIBS="$LIBS $SMPEG_LIBS"
fi
fi

Expand Down
6 changes: 3 additions & 3 deletions music.c
View file
Expand Up @@ -61,7 +61,7 @@
#include "music_ogg.h"
#endif
#ifdef MP3_MUSIC
#include <smpeg/smpeg.h>
#include "smpeg.h"

static SDL_AudioSpec used_mixer;
#endif
Expand Down Expand Up @@ -546,7 +546,7 @@ static int lowlevel_play(Mix_Music *music)
case MUS_MP3:
SMPEG_enableaudio(music->data.mp3,1);
SMPEG_enablevideo(music->data.mp3,0);
SMPEG_setvolume(music->data.mp3,((float)music_volume/(float)MIX_MAX_VOLUME)*100.0);
SMPEG_setvolume(music->data.mp3,(int)(((float)music_volume/(float)MIX_MAX_VOLUME)*100.0));
SMPEG_play(music->data.mp3);
break;
#endif
Expand Down Expand Up @@ -639,7 +639,7 @@ int Mix_VolumeMusic(int volume)
#endif
#ifdef MP3_MUSIC
case MUS_MP3:
SMPEG_setvolume(music_playing->data.mp3,((float)music_volume/(float)MIX_MAX_VOLUME)*100.0);
SMPEG_setvolume(music_playing->data.mp3,(int)(((float)music_volume/(float)MIX_MAX_VOLUME)*100.0));
break;
#endif
default:
Expand Down
12 changes: 6 additions & 6 deletions playmus.c
View file
Expand Up @@ -130,18 +130,18 @@ main(int argc, char *argv[])
audio_format = AUDIO_U8;
} else {
Usage(argv[0]);
exit(1);
return(1);
}
}
if ( ! argv[i] ) {
Usage(argv[0]);
exit(1);
return(1);
}

/* Initialize the SDL library */
if ( SDL_Init(SDL_INIT_AUDIO) < 0 ) {
fprintf(stderr, "Couldn't initialize SDL: %s\n",SDL_GetError());
exit(255);
return(255);
}
atexit(CleanUp);
signal(SIGINT, IntHandler);
Expand All @@ -150,7 +150,7 @@ main(int argc, char *argv[])
/* Open the audio device */
if (Mix_OpenAudio(audio_rate, audio_format, audio_channels, audio_buffers) < 0) {
fprintf(stderr, "Couldn't open audio: %s\n", SDL_GetError());
exit(2);
return(2);
} else {
Mix_QuerySpec(&audio_rate, &audio_format, &audio_channels);
printf("Opened audio at %d Hz %d bit %s, %d bytes audio buffer\n", audio_rate,
Expand All @@ -171,7 +171,7 @@ main(int argc, char *argv[])
if ( music == NULL ) {
fprintf(stderr, "Couldn't load %s: %s\n",
argv[i], SDL_GetError());
exit(2);
return(2);
}

/* Play and then exit */
Expand All @@ -191,5 +191,5 @@ main(int argc, char *argv[])

i++;
}
exit(0);
return(0);
}
12 changes: 6 additions & 6 deletions playwave.c
View file
Expand Up @@ -84,18 +84,18 @@ main(int argc, char *argv[])
audio_format = AUDIO_U8;
} else {
Usage(argv[0]);
exit(1);
return(1);
}
}
if ( ! argv[i] ) {
Usage(argv[0]);
exit(1);
return(1);
}

/* Initialize the SDL library */
if ( SDL_Init(SDL_INIT_AUDIO) < 0 ) {
fprintf(stderr, "Couldn't initialize SDL: %s\n",SDL_GetError());
exit(255);
return(255);
}
atexit(CleanUp);
signal(SIGINT, exit);
Expand All @@ -104,7 +104,7 @@ main(int argc, char *argv[])
/* Open the audio device */
if (Mix_OpenAudio(audio_rate, audio_format, audio_channels, 4096) < 0) {
fprintf(stderr, "Couldn't open audio: %s\n", SDL_GetError());
exit(2);
return(2);
} else {
Mix_QuerySpec(&audio_rate, &audio_format, &audio_channels);
printf("Opened audio at %d Hz %d bit %s", audio_rate,
Expand All @@ -123,13 +123,13 @@ main(int argc, char *argv[])
if ( wave == NULL ) {
fprintf(stderr, "Couldn't load %s: %s\n",
argv[i], SDL_GetError());
exit(2);
return(2);
}

/* Play and then exit */
Mix_PlayChannel(0, wave, loops);
while ( Mix_Playing(0) ) {
SDL_Delay(100);
}
exit(0);
return(0);
}

0 comments on commit 0080141

Please sign in to comment.