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

Fix up 64-bit MINGW

Browse source
This commit is contained in:
Steel Titanium 2018-11-13 20:32:18 -05:00
parent 302358c403
commit 4836e711d3
4 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
bin/Mingw64/Release/srb2win64.exe Normal file
View file

Binary file not shown.

BIN
libs/gme/win64/libgme.dll.a Normal file
View file

Binary file not shown.

5
src/Makefile
View file

@ -176,6 +176,11 @@ ifdef MINGW
include win32/Makefile.cfg include win32/Makefile.cfg
endif #ifdef MINGW endif #ifdef MINGW
ifdef MINGW64
NONX86=1
include win32/Makefile.cfg
endif #ifdef MINGW64
ifdef UNIX ifdef UNIX
UNIXCOMMON=1 UNIXCOMMON=1
endif endif

5
src/win32/Makefile.cfg
View file

@ -9,6 +9,9 @@
ifdef MINGW64 ifdef MINGW64
NOASM=1 NOASM=1
NONX86=1 NONX86=1
HAVE_LIBGME=1
LIBGME_CFLAGS=-I../libs/gme/include
LIBGME_LDFLAGS=-L../libs/gme/win64 -lgme
SDL_CFLAGS?=-I../libs/SDL2/x86_64-w64-mingw32/include/SDL2 -I../libs/SDL2_mixer/x86_64-w64-mingw32/include/SDL2 -Dmain=SDL_main SDL_CFLAGS?=-I../libs/SDL2/x86_64-w64-mingw32/include/SDL2 -I../libs/SDL2_mixer/x86_64-w64-mingw32/include/SDL2 -Dmain=SDL_main
SDL_LDFLAGS?=-L../libs/SDL2/x86_64-w64-mingw32/lib -L../libs/SDL2_mixer/x86_64-w64-mingw32/lib -lmingw32 -lSDL2main -lSDL2 -mwindows SDL_LDFLAGS?=-L../libs/SDL2/x86_64-w64-mingw32/lib -L../libs/SDL2_mixer/x86_64-w64-mingw32/lib -lmingw32 -lSDL2main -lSDL2 -mwindows
else else
@ -23,7 +26,9 @@ ifndef NOASM
USEASM=1 USEASM=1
endif endif
ifdef MINGW
HAVE_MINIUPNPC=1 HAVE_MINIUPNPC=1
endif
OPTS=-DSTDC_HEADERS OPTS=-DSTDC_HEADERS