stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-14 22:00:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mingw-64bit' into 'master'

Browse source 
MinGW: Fix compiling on 64-bit Windows.

See merge request STJr/SRB2!329
This commit is contained in:
Monster Iestyn 2018-11-18 19:49:18 -05:00
commit ab39534ef6
5 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
bin/Resources/libgme64.dll Normal file
View file

Binary file not shown.

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

Binary file not shown.

6
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
MINGW=1
include win32/Makefile.cfg
endif #ifdef MINGW64
ifdef UNIX ifdef UNIX
UNIXCOMMON=1 UNIXCOMMON=1
endif endif
@ -710,7 +715,6 @@ $(BIN)/s_openal.so: $(OBJDIR)/s_openal.o
-$(MKDIR) $(BIN) -$(MKDIR) $(BIN)
@echo Linking S_OpenAL.so... @echo Linking S_OpenAL.so...
$(CC) --shared $^ -o $@ -g --nostartfiles -lm -lopenal $(CC) --shared $^ -o $@ -g --nostartfiles -lm -lopenal
endif endif
else else

2
src/Makefile.cfg
View file

@ -235,6 +235,7 @@ ifndef LINUX
ifndef FREEBSD ifndef FREEBSD
ifndef CYGWIN32 ifndef CYGWIN32
ifndef MINGW ifndef MINGW
ifndef MINGW64
ifndef SDL ifndef SDL
ifndef NDS ifndef NDS
ifndef DUMMY ifndef DUMMY
@ -252,6 +253,7 @@ endif
endif endif
endif endif
endif endif
endif
#determine the interface directory (where you put all i_*.c) #determine the interface directory (where you put all i_*.c)
i_cdmus_o=$(OBJDIR)/i_cdmus.o i_cdmus_o=$(OBJDIR)/i_cdmus.o

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
ifndef MINGW64 #miniupnc is broken with MINGW64
HAVE_MINIUPNPC=1 HAVE_MINIUPNPC=1
endif
OPTS=-DSTDC_HEADERS OPTS=-DSTDC_HEADERS