stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-15 09:11:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

HAVE_MIXERX and NOMIXERX compile flags (win32 only)

Browse source
This commit is contained in:
mazmazz 2018-08-26 14:35:22 -04:00
parent 73b4c4c5b4
commit 65e5794ee3
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/sdl/Makefile.cfg
View file

@ -80,7 +80,8 @@ ifdef NOMIXER
else else
i_sound_o=$(OBJDIR)/mixer_sound.o i_sound_o=$(OBJDIR)/mixer_sound.o
OPTS+=-DHAVE_MIXER OPTS+=-DHAVE_MIXER
ifdef MINGW ifdef HAVE_MIXERX
OPTS+=-DHAVE_MIXERX
SDL_LDFLAGS+=-lSDL2_mixer_ext SDL_LDFLAGS+=-lSDL2_mixer_ext
else else
SDL_LDFLAGS+=-lSDL2_mixer SDL_LDFLAGS+=-lSDL2_mixer

3
src/sdl/mixer_sound.c
View file

@ -100,6 +100,9 @@ void I_StartupSound(void)
#if SDL_MIXER_VERSION_ATLEAST(1,2,11) #if SDL_MIXER_VERSION_ATLEAST(1,2,11)
Mix_Init(MIX_INIT_FLAC|MIX_INIT_MOD|MIX_INIT_MP3|MIX_INIT_OGG); Mix_Init(MIX_INIT_FLAC|MIX_INIT_MOD|MIX_INIT_MP3|MIX_INIT_OGG);
#endif #endif
#if HAVE_MIXERX
Mix_SetMidiPlayer(MIDI_OPNMIDI);
#endif
if (Mix_OpenAudio(44100, AUDIO_S16SYS, 2, 2048) < 0) if (Mix_OpenAudio(44100, AUDIO_S16SYS, 2, 2048) < 0)
{ {

6
src/win32/Makefile.cfg
View file

@ -15,8 +15,14 @@ else
HAVE_LIBGME=1 HAVE_LIBGME=1
LIBGME_CFLAGS=-I../libs/gme/include LIBGME_CFLAGS=-I../libs/gme/include
LIBGME_LDFLAGS=-L../libs/gme/win32 -lgme LIBGME_LDFLAGS=-L../libs/gme/win32 -lgme
ifndef NOMIXERX
HAVE_MIXERX=1
SDL_CFLAGS?=-I../libs/SDL2/i686-w64-mingw32/include/SDL2 -I../libs/SDLMixerX/i686-w64-mingw32/include/SDL2 -Dmain=SDL_main SDL_CFLAGS?=-I../libs/SDL2/i686-w64-mingw32/include/SDL2 -I../libs/SDLMixerX/i686-w64-mingw32/include/SDL2 -Dmain=SDL_main
SDL_LDFLAGS?=-L../libs/SDL2/i686-w64-mingw32/lib -L../libs/SDLMixerX/i686-w64-mingw32/lib -lmingw32 -lSDL2main -lSDL2 -mwindows SDL_LDFLAGS?=-L../libs/SDL2/i686-w64-mingw32/lib -L../libs/SDLMixerX/i686-w64-mingw32/lib -lmingw32 -lSDL2main -lSDL2 -mwindows
else
SDL_CFLAGS?=-I../libs/SDL2/i686-w64-mingw32/include/SDL2 -I../libs/SDL2_mixer/i686-w64-mingw32/include/SDL2 -Dmain=SDL_main
SDL_LDFLAGS?=-L../libs/SDL2/i686-w64-mingw32/lib -L../libs/SDL2_mixer/i686-w64-mingw32/lib -lmingw32 -lSDL2main -lSDL2 -mwindows
endif
endif endif
ifndef NOASM ifndef NOASM