stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-03-23 03:12:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make SDL Mixer X win32-exclusive

Browse source
This commit is contained in:
mazmazz 2018-08-26 14:20:41 -04:00
parent eafed06a29
commit 768ce1a46f
4 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/sdl/Makefile.cfg
View file

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

6
src/sdl/mixer_sound.c
View file

@ -20,7 +20,11 @@
#pragma warning(default : 4214 4244)
#endif
#include "SDL2/SDL_mixer_ext.h"
#ifdef _WIN32
#include "SDL_mixer_ext.h"
#else
#include "SDL_mixer.h"
#endif
/* This is the version number macro for the current SDL_mixer version: */
#ifndef SDL_MIXER_COMPILEDVERSION

2
src/sdl/sdl_sound.c
View file

@ -32,7 +32,7 @@
#endif
#ifdef HAVE_MIXER
#include <SDL2/SDL_mixer_ext.h>
#include <SDL_mixer.h>
/* This is the version number macro for the current SDL_mixer version: */
#ifndef SDL_MIXER_COMPILEDVERSION
#define SDL_MIXER_COMPILEDVERSION \

2
src/win32/Makefile.cfg
View file

@ -15,7 +15,7 @@ else
HAVE_LIBGME=1
LIBGME_CFLAGS=-I../libs/gme/include
LIBGME_LDFLAGS=-L../libs/gme/win32 -lgme
SDL_CFLAGS?=-I../libs/SDL2/i686-w64-mingw32/include/SDL2 -I../libs/SDLMixerX/i686-w64-mingw32/include -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
endif