TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix menu.cpp build failure for sdlmixer=0

Browse source 
When sdlmixer=0, opt_sm_mtype1 is not defined, but was used.  Preprocess
out the use.
This commit is contained in:
Kp 2017-11-25 01:56:51 +00:00
parent e53e969d92
commit 8376504a34
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
similar/main/menu.cpp
View file

@ -2087,11 +2087,18 @@ int sound_menu_items::menuset(newmenu *, const d_event &event, sound_menu_items
GameCfg.MusicType = MUSIC_TYPE_NONE;
replay = 1;
}
/*
* When builtin music is enabled, the next line expands to
* `#if +1 + 0`; when it is disabled, the line expands to
* `#if + 0`.
*/
#if DXX_SOUND_ADDON_MUSIC_MENU_ITEM(COUNT) + 0
else if (citem == opt_sm_mtype1)
{
GameCfg.MusicType = MUSIC_TYPE_BUILTIN;
replay = 1;
}
#endif
else if (citem == opt_sm_mtype2)
{
GameCfg.MusicType = MUSIC_TYPE_REDBOOK;