New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix building with sdl2_mixer 2.0.2 #1297

Merged
merged 1 commit into from Oct 29, 2017

Conversation

Projects
None yet
3 participants
@carstene1ns
Member

carstene1ns commented Oct 28, 2017

Quick hack, just to get it building again.

@carstene1ns carstene1ns added this to the 0.5.4 milestone Oct 28, 2017

if (Mix_GetMusicType(bgm.get()) != MUS_MP3_MAD)
#endif
// Play indefinitely without fade-in

This comment has been minimized.

@fdelapena

fdelapena Oct 28, 2017

Contributor

Multiline if without brackets.

This comment has been minimized.

@Ghabry

Ghabry Oct 29, 2017

Member

Imo the whole MUS_MP3_MAD if-check can be removed because for the next cleanup all the other ugly hacks for <= 2.0.1 will be removed, too.

This comment has been minimized.

@carstene1ns

carstene1ns Oct 29, 2017

Member

I am fine with this. 👍

@Ghabry

Ghabry approved these changes Oct 29, 2017

@carstene1ns

This comment has been minimized.

Member

carstene1ns commented Oct 29, 2017

done.

@Ghabry Ghabry merged commit aaf4638 into EasyRPG:master Oct 29, 2017

6 checks passed

Android (armeabi-v7a) Build finished.
Details
GNU/Linux Build finished.
Details
OSX Build finished.
Details
Windows (x64) Build finished.
Details
Windows (x86) Build finished.
Details
web Build finished.
Details

@carstene1ns carstene1ns deleted the carstene1ns:mixerfix branch Oct 29, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment