Author: cazfi
Date: Fri Dec 18 07:51:38 2015
New Revision: 31062

URL: http://svn.gna.org/viewcvs/freeciv?rev=31062&view=rev
Log:
Get headers of the correct SDL version for audio support.

See bug #24198

Modified:
    branches/S2_6/m4/sound.m4

Modified: branches/S2_6/m4/sound.m4
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/m4/sound.m4?rev=31062&r1=31061&r2=31062&view=diff
==============================================================================
--- branches/S2_6/m4/sound.m4   (original)
+++ branches/S2_6/m4/sound.m4   Fri Dec 18 07:51:38 2015
@@ -40,7 +40,7 @@
         SOUND_CFLAGS="$SOUND_CFLAGS $SDL2_CFLAGS"
         SOUND_LIBS="$SOUND_LIBS -lSDL2_mixer $SDL2_LIBS"
         AC_DEFINE([AUDIO_SDL], [1], [SDL Mixer support])
-        AC_DEFINE([AUDIO_SDL1_2], [1], [SDL-1.2 Mixer in use])
+        AC_DEFINE([AUDIO_SDL2], [1], [SDL-2 Mixer in use])
         AC_MSG_RESULT([yes])
         SOUND_SDL_OK=true
       else
@@ -62,6 +62,7 @@
     SOUND_CFLAGS="$SOUND_CFLAGS $SDLMIXER_CFLAGS"
     SOUND_LIBS="$SOUND_LIBS $SDLMIXER_LIBS"
     AC_DEFINE([AUDIO_SDL], [1], [SDL_Mixer support])
+    AC_DEFINE([AUDIO_SDL1_2], [1], [SDL-1.2 Mixer in use])
     SDL_mixer=sdl
     SOUND_SDL_OK=true
 ], [
@@ -83,6 +84,7 @@
         SOUND_CFLAGS="$SOUND_CFLAGS $SDL_CFLAGS"
         SOUND_LIBS="$SOUND_LIBS -lSDL_mixer $SDL_LIBS"
         AC_DEFINE([AUDIO_SDL], [1], [SDL_Mixer support])
+        AC_DEFINE([AUDIO_SDL1_2], [1], [SDL-1.2 Mixer in use])
         AC_MSG_RESULT([yes])
         SOUND_SDL_OK=true
       else


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to