vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
mazmazz 2018-12-29 21:14:50 -05:00
parent aeca8f9967
commit 9a186243de
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

@ -107,8 +107,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
@ -179,12 +189,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
@ -292,14 +296,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