Skip to content

Commit

Permalink
Enable GME support by default
Browse files Browse the repository at this point in the history
  • Loading branch information
@slouken
slouken committed Jan 21, 2024
1 parent 1a32dc4 commit a37e09f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1694,7 +1694,7 @@ Optional Features:
enable FluidSynth MIDI output [default=yes]
--enable-music-midi-fluidsynth-shared
dynamically load FluidSynth library [default=yes]
--enable-music-gme enable Game Music Emu support [default=no]
--enable-music-gme enable Game Music Emu support [default=yes]
--enable-music-gme-shared
dynamically load libgme library [default=yes]
--enable-music-ogg enable Ogg Vorbis music [default=yes]
Expand Down Expand Up @@ -17875,7 +17875,7 @@ if test ${enable_music_gme+y}
then :
enableval=$enable_music_gme;
else $as_nop
enable_music_gme=no
enable_music_gme=yes
fi

# Check whether --enable-music-gme-shared was given.
Expand Down
4 changes: 2 additions & 2 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -585,8 +585,8 @@ fi

SDL2MIXER_GME=0
AC_ARG_ENABLE([music-gme],
[AS_HELP_STRING([--enable-music-gme], [enable Game Music Emu support [default=no]])],
[], [enable_music_gme=no])
[AS_HELP_STRING([--enable-music-gme], [enable Game Music Emu support [default=yes]])],
[], [enable_music_gme=yes])
AC_ARG_ENABLE([music-gme-shared],
[AS_HELP_STRING([--enable-music-gme-shared], [dynamically load libgme library [default=yes]])],
[], [enable_music_gme_shared=yes])
Expand Down

6 comments on commit a37e09f

@sezero
Copy link
Contributor

@sezero sezero commented on a37e09f Jan 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note for next releases: this needs to be done in cmake'ry too..

@slouken
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@madebr, is that something you can do?

@madebr
Copy link
Contributor

@madebr madebr commented on a37e09f Jan 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For SDL2, enabling by default means failing configuration when GME is not found.
For SDL3, configuration will continue (unless configuration happens with -DSDL3MIXER_STRICT=ON).

@slouken
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In that case, we want to enable it by default in SDL3 and not in SDL2. Thanks!

@madebr
Copy link
Contributor

@madebr madebr commented on a37e09f Jan 21, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok! Done in 3c8461d

@slouken
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

Please sign in to comment.