tAdd support for SDL2, including on Mac - vaccinewars - be a doctor and try to … | |
git clone git://src.adamsgaard.dk/vaccinewars | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit b546da68fd49a890223b021cdf2633a11bbc1e93 | |
parent 3f4126a0f316113989f871ed18992eebc906a784 | |
Author: Ben Webb <[email protected]> | |
Date: Wed, 2 Dec 2020 19:54:09 -0800 | |
Add support for SDL2, including on Mac | |
Look for SDL2, and use it (and SDL_mixer) | |
if available rather than SDL 1. If on Mac, | |
build the sound plugin with -module so it | |
gets built as a .so module rather than a | |
.dylib dynamic library. | |
Diffstat: | |
M ChangeLog | 2 +- | |
M configure.ac | 30 ++++++++++++++++++++++++++---- | |
A m4/sdl2.m4 | 202 +++++++++++++++++++++++++++++… | |
3 files changed, 229 insertions(+), 5 deletions(-) | |
--- | |
diff --git a/ChangeLog b/ChangeLog | |
t@@ -20,7 +20,7 @@ SVN | |
stored in the user application data directory (e.g. | |
C:\Users\foo\AppData\Local\dopewars) rather than the same directory as | |
the dopewars binary. | |
- - Add sound support on Mac. | |
+ - Add sound support with SDL2, and on Mac. | |
- Add 64-bit Windows binaries. | |
- Fix for a DOS against the server using the REQUESTJET message type | |
(thanks to Doug Prostko for reporting the problem). | |
diff --git a/configure.ac b/configure.ac | |
t@@ -215,22 +215,44 @@ else | |
dnl Add SDL_mixer sound support if available | |
if test "$USE_SDL" != "no"; then | |
SDL_ALL=no | |
- AM_PATH_SDL(1.0.0, SDL=yes) | |
+ SDL2=yes | |
+ AM_PATH_SDL2(2.0.0, SDL=yes) | |
+ if test "$SDL" != "yes"; then | |
+ SDL2=no | |
+ AM_PATH_SDL(1.0.0, SDL=yes) | |
+ fi | |
if test "$SDL" = "yes"; then | |
headers=no | |
libs=no | |
- AC_CHECK_HEADER(SDL/SDL_mixer.h, headers=yes) | |
- AC_CHECK_LIB(SDL_mixer, Mix_OpenAudio, libs=yes) | |
+ ORIG_CPPFLAGS="$CPPFLAGS" | |
+ ORIG_LDFLAGS="$LDFLAGS" | |
+ CPPFLAGS="$ORIG_CPPFLAGS $SDL_CFLAGS" | |
+ LDLAGS="$ORIG_LDFLAGS $SDL_LIBS" | |
+ AC_CHECK_HEADER(SDL_mixer.h, headers=yes) | |
+ if test "$SDL2" = "yes"; then | |
+ AC_CHECK_LIB(SDL2_mixer, Mix_OpenAudio, libs=yes) | |
+ else | |
+ AC_CHECK_LIB(SDL_mixer, Mix_OpenAudio, libs=yes) | |
+ fi | |
+ CPPFLAGS="$ORIG_CPPFLAGS" | |
+ LDFLAGS="$ORIG_LDFLAGS" | |
if test "$libs" = "yes"; then | |
if test "$headers" = "yes"; then | |
SOUND_CFLAGS="$SOUND_CFLAGS $SDL_CFLAGS" | |
- SDL_LIBS="$SDL_LIBS -lSDL_mixer" | |
+ if test "$SDL2" = "yes"; then | |
+ SDL_LIBS="$SDL_LIBS -lSDL2_mixer" | |
+ else | |
+ SDL_LIBS="$SDL_LIBS -lSDL_mixer" | |
+ fi | |
SOUND_LIBS="$SOUND_LIBS $SDL_LIBS" | |
PLUGOBJS="$PLUGOBJS plugins/sound_sdl.o" | |
AC_SUBST(SDL_LIBS) | |
AC_DEFINE(HAVE_SDL_MIXER, 1, | |
[Do we have the SDL_mixer sound library?]) | |
SDL_ALL=yes | |
+ if test "$APPLE" = "yes"; then | |
+ SDL_LIBS="$SDL_LIBS -module" | |
+ fi | |
fi | |
fi | |
fi | |
diff --git a/m4/sdl2.m4 b/m4/sdl2.m4 | |
t@@ -0,0 +1,202 @@ | |
+# Configure paths for SDL | |
+# Sam Lantinga 9/21/99 | |
+# stolen from Manish Singh | |
+# stolen back from Frank Belew | |
+# stolen from Manish Singh | |
+# Shamelessly stolen from Owen Taylor | |
+ | |
+# serial 1 | |
+ | |
+dnl AM_PATH_SDL2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) | |
+dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS | |
+dnl | |
+AC_DEFUN([AM_PATH_SDL2], | |
+[dnl | |
+dnl Get the cflags and libraries from the sdl2-config script | |
+dnl | |
+AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installe… | |
+ sdl_prefix="$withval", sdl_prefix="") | |
+AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SD… | |
+ sdl_exec_prefix="$withval", sdl_exec_prefix="") | |
+AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and ru… | |
+ , enable_sdltest=yes) | |
+ | |
+ min_sdl_version=ifelse([$1], ,2.0.0,$1) | |
+ | |
+ if test "x$sdl_prefix$sdl_exec_prefix" = x ; then | |
+ PKG_CHECK_MODULES([SDL], [sdl2 >= $min_sdl_version], | |
+ [sdl_pc=yes], | |
+ [sdl_pc=no]) | |
+ else | |
+ sdl_pc=no | |
+ if test x$sdl_exec_prefix != x ; then | |
+ sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix" | |
+ if test x${SDL2_CONFIG+set} != xset ; then | |
+ SDL2_CONFIG=$sdl_exec_prefix/bin/sdl2-config | |
+ fi | |
+ fi | |
+ if test x$sdl_prefix != x ; then | |
+ sdl_config_args="$sdl_config_args --prefix=$sdl_prefix" | |
+ if test x${SDL2_CONFIG+set} != xset ; then | |
+ SDL2_CONFIG=$sdl_prefix/bin/sdl2-config | |
+ fi | |
+ fi | |
+ fi | |
+ | |
+ if test "x$sdl_pc" = xyes ; then | |
+ no_sdl="" | |
+ SDL2_CONFIG="pkg-config sdl2" | |
+ else | |
+ as_save_PATH="$PATH" | |
+ if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then | |
+ PATH="$prefix/bin:$prefix/usr/bin:$PATH" | |
+ fi | |
+ AC_PATH_PROG(SDL2_CONFIG, sdl2-config, no, [$PATH]) | |
+ PATH="$as_save_PATH" | |
+ AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) | |
+ no_sdl="" | |
+ | |
+ if test "$SDL2_CONFIG" = "no" ; then | |
+ no_sdl=yes | |
+ else | |
+ SDL_CFLAGS=`$SDL2_CONFIG $sdl_config_args --cflags` | |
+ SDL_LIBS=`$SDL2_CONFIG $sdl_config_args --libs` | |
+ | |
+ sdl_major_version=`$SDL2_CONFIG $sdl_config_args --version | \ | |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` | |
+ sdl_minor_version=`$SDL2_CONFIG $sdl_config_args --version | \ | |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` | |
+ sdl_micro_version=`$SDL2_CONFIG $sdl_config_args --version | \ | |
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` | |
+ if test "x$enable_sdltest" = "xyes" ; then | |
+ ac_save_CFLAGS="$CFLAGS" | |
+ ac_save_CXXFLAGS="$CXXFLAGS" | |
+ ac_save_LIBS="$LIBS" | |
+ CFLAGS="$CFLAGS $SDL_CFLAGS" | |
+ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" | |
+ LIBS="$LIBS $SDL_LIBS" | |
+dnl | |
+dnl Now check if the installed SDL is sufficiently new. (Also sanity | |
+dnl checks the results of sdl2-config to some extent | |
+dnl | |
+ rm -f conf.sdltest | |
+ AC_TRY_RUN([ | |
+#include <stdio.h> | |
+#include <stdlib.h> | |
+#include <string.h> | |
+#include "SDL.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.sdltest"); | |
+ */ | |
+ { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } | |
+ | |
+ /* HP/UX 9 (%@#!) writes to sscanf strings */ | |
+ tmp_version = my_strdup("$min_sdl_version"); | |
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { | |
+ printf("%s, bad version string\n", "$min_sdl_version"); | |
+ exit(1); | |
+ } | |
+ | |
+ if (($sdl_major_version > major) || | |
+ (($sdl_major_version == major) && ($sdl_minor_version > minor)) || | |
+ (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl… | |
+ { | |
+ return 0; | |
+ } | |
+ else | |
+ { | |
+ printf("\n*** 'sdl2-config --version' returned %d.%d.%d, but the minimum… | |
+ printf("*** of SDL required is %d.%d.%d. If sdl2-config is correct, then… | |
+ printf("*** best to upgrade to the required version.\n"); | |
+ printf("*** If sdl2-config was wrong, set the environment variable SDL2_… | |
+ printf("*** to point to the correct copy of sdl2-config, and remove the … | |
+ printf("*** config.cache before re-running configure\n"); | |
+ return 1; | |
+ } | |
+} | |
+ | |
+],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) | |
+ CFLAGS="$ac_save_CFLAGS" | |
+ CXXFLAGS="$ac_save_CXXFLAGS" | |
+ LIBS="$ac_save_LIBS" | |
+ fi | |
+ fi | |
+ if test "x$no_sdl" = x ; then | |
+ AC_MSG_RESULT(yes) | |
+ else | |
+ AC_MSG_RESULT(no) | |
+ fi | |
+ fi | |
+ if test "x$no_sdl" = x ; then | |
+ ifelse([$2], , :, [$2]) | |
+ else | |
+ if test "$SDL2_CONFIG" = "no" ; then | |
+ echo "*** The sdl2-config script installed by SDL could not be found" | |
+ echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" | |
+ echo "*** your path, or set the SDL2_CONFIG environment variable to the" | |
+ echo "*** full path to sdl2-config." | |
+ else | |
+ if test -f conf.sdltest ; then | |
+ : | |
+ else | |
+ echo "*** Could not run SDL test program, checking why..." | |
+ CFLAGS="$CFLAGS $SDL_CFLAGS" | |
+ CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" | |
+ LIBS="$LIBS $SDL_LIBS" | |
+ AC_TRY_LINK([ | |
+#include <stdio.h> | |
+#include "SDL.h" | |
+ | |
+int main(int argc, char *argv[]) | |
+{ return 0; } | |
+#undef main | |
+#define main K_and_R_C_main | |
+], [ return 0; ], | |
+ [ echo "*** The test program compiled, but did not run. This usually m… | |
+ echo "*** that the run-time linker is not finding SDL or finding the… | |
+ echo "*** version of SDL. If it is not finding SDL, you'll need to s… | |
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.c… | |
+ echo "*** to the installed location Also, make sure you have run ld… | |
+ echo "*** is required on your system" | |
+ echo "***" | |
+ echo "*** If you have an old version installed, it is best to remove… | |
+ echo "*** you may also be able to get things to work by modifying LD… | |
+ [ echo "*** The test program failed to compile or link. See the file c… | |
+ echo "*** exact error that occured. This usually means SDL was incor… | |
+ echo "*** or that you have moved SDL since it was installed. In the … | |
+ echo "*** may want to edit the sdl2-config script: $SDL2_CONFIG" ]) | |
+ CFLAGS="$ac_save_CFLAGS" | |
+ CXXFLAGS="$ac_save_CXXFLAGS" | |
+ LIBS="$ac_save_LIBS" | |
+ fi | |
+ fi | |
+ SDL_CFLAGS="" | |
+ SDL_LIBS="" | |
+ ifelse([$3], , :, [$3]) | |
+ fi | |
+ AC_SUBST(SDL_CFLAGS) | |
+ AC_SUBST(SDL_LIBS) | |
+ rm -f conf.sdltest | |
+]) |