stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-02-17 17:41:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Treat MINGW64 as a subset of MINGW in Makefile.cfg

Browse source
This commit is contained in:
Monster Iestyn 2019-01-05 15:55:05 +00:00
parent d5870e6f8a
commit e40110c1e8
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/Makefile.cfg
View file

@ -242,7 +242,6 @@ ifndef LINUX
ifndef FREEBSD
ifndef CYGWIN32
ifndef MINGW
ifndef MINGW64
ifndef SDL
ifndef NDS
ifndef DUMMY
@ -260,7 +259,6 @@ endif
endif
endif
endif
endif
#determine the interface directory (where you put all i_*.c)
i_cdmus_o=$(OBJDIR)/i_cdmus.o
@ -342,12 +340,6 @@ ifdef CYGWIN32
OBJDIR:=$(OBJDIR)/cygwin
BIN:=$(BIN)/Cygwin
else
ifdef MINGW64
INTERFACE=win32
#NASMFORMAT=win64
OBJDIR:=$(OBJDIR)/Mingw64
BIN:=$(BIN)/Mingw64
else
ifdef WII
INTERFACE=sdl12
NONX86=1
@ -376,9 +368,15 @@ ifdef PS3N
else
ifdef MINGW
INTERFACE=win32
ifdef MINGW64
#NASMFORMAT=win64
OBJDIR:=$(OBJDIR)/Mingw64
BIN:=$(BIN)/Mingw64
else #32-bit
NASMFORMAT=win32
OBJDIR:=$(OBJDIR)/Mingw
BIN:=$(BIN)/Mingw
endif
else
ifdef XBOX
INTERFACE=sdl12
@ -435,7 +433,6 @@ endif
endif
endif
endif
endif
ifdef GP2X
ifdef SDL