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

Fix up compiling on DD version

Browse source
This commit is contained in:
Steel Titanium 2018-11-14 18:00:10 -05:00
parent c5a97dcfe6
commit f02105732e
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

Binary file not shown.

2
src/Makefile
View file

@ -177,6 +177,7 @@ include win32/Makefile.cfg
endif #ifdef MINGW endif #ifdef MINGW
ifdef MINGW64 ifdef MINGW64
MINGW=1
NONX86=1 NONX86=1
include win32/Makefile.cfg include win32/Makefile.cfg
endif #ifdef MINGW64 endif #ifdef MINGW64
@ -715,7 +716,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

2
src/win32/Makefile.cfg
View file

@ -26,7 +26,7 @@ ifndef NOASM
USEASM=1 USEASM=1
endif endif
ifdef MINGW ifdef MINGW #miniupnc is broken with MINGW64
HAVE_MINIUPNPC=1 HAVE_MINIUPNPC=1
endif endif