From bbf9f5adc8b770ed57578d83eba39e1575f1aa83 Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Wed, 18 May 2016 16:54:55 -0400 Subject: [PATCH] Makefile: use built-in SDL2 and SDL2_mixer for Mingw32 and Mingw64 --- src/win32/Makefile.cfg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/win32/Makefile.cfg b/src/win32/Makefile.cfg index c369651b..7a290d39 100644 --- a/src/win32/Makefile.cfg +++ b/src/win32/Makefile.cfg @@ -9,10 +9,14 @@ ifdef MINGW64 NOASM=1 NONX86=1 + SDL_CFLAGS?=-I../libs/SDL2/x86_64-w64-mingw32/include/SDL2 -I../libs/SDL2_mixer/x86_64-w64-mingw32/include/SDL2 -Dmain=SDL_main -DSDLMAIN + SDL_LDFLAGS?=-L../libs/SDL2/x86_64-w64-mingw32/lib -L../libs/SDL2_mixer/x86_64-w64-mingw32/lib -lmingw32 -lSDL2main -lSDL2 -mwindows -lSDL2_mixer 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/SDL2_mixer/i686-w64-mingw32/include/SDL2 -Dmain=SDL_main -DSDLMAIN + SDL_LDFLAGS?=-L../libs/SDL2/i686-w64-mingw32/lib -L../libs/SDL2_mixer/i686-w64-mingw32/lib -lmingw32 -lSDL2main -lSDL2 -mwindows -lSDL2_mixer endif ifndef NOASM