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

Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile

Browse source
This commit is contained in:
mazmazz 2018-12-29 21:14:50 -05:00
parent d048e7cbec
commit 4cfacf5cde
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/Makefile
View file

@ -104,8 +104,18 @@ endif
ifdef LINUX64 ifdef LINUX64
LINUX=1 LINUX=1
NONX86=1 NONX86=1
# LINUX64 does not imply X86_64=1; could mean ARM64 or Itanium
endif endif
ifdef MINGW64
MINGW=1
NONX86=1
NOASM=1
# MINGW64 should not necessarily imply X86_64=1, but we make that assumption elsewhere
# Once that changes, remove this
X86_64=1
endif #ifdef MINGW64
ifdef HAIKU ifdef HAIKU
SDL=1 SDL=1
endif endif
@ -176,12 +186,6 @@ ifdef MINGW
include win32/Makefile.cfg include win32/Makefile.cfg
endif #ifdef MINGW endif #ifdef MINGW
ifdef MINGW64
MINGW=1
X86_64=1
include win32/Makefile.cfg
endif #ifdef MINGW64
ifdef UNIX ifdef UNIX
UNIXCOMMON=1 UNIXCOMMON=1
endif endif
@ -289,14 +293,14 @@ OPTS += -DCOMPVERSION
ifndef NONX86 ifndef NONX86
ifndef GCC29 ifndef GCC29
M5=-march=pentium M5?=-march=pentium
else else
M5=-mpentium M5?=-mpentium
endif endif
endif else
ifdef X86_64 ifdef X86_64
M5=-march=nocona M5?=-march=nocona
endif
endif endif
ifndef NOASM ifndef NOASM

2
src/win32/Makefile.cfg
View file

@ -7,8 +7,6 @@
# #
ifdef MINGW64 ifdef MINGW64
NOASM=1
NONX86=1
HAVE_LIBGME=1 HAVE_LIBGME=1
LIBGME_CFLAGS=-I../libs/gme/include LIBGME_CFLAGS=-I../libs/gme/include
LIBGME_LDFLAGS=-L../libs/gme/win64 -lgme LIBGME_LDFLAGS=-L../libs/gme/win64 -lgme