thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 f61c8fa279
commit 44d2340a5b
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
LINUX=1
NONX86=1
# LINUX64 does not imply X86_64=1; could mean ARM64 or Itanium
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
SDL=1
endif
@ -176,12 +186,6 @@ ifdef MINGW
include win32/Makefile.cfg
endif #ifdef MINGW
ifdef MINGW64
MINGW=1
X86_64=1
include win32/Makefile.cfg
endif #ifdef MINGW64
ifdef UNIX
UNIXCOMMON=1
endif
@ -289,14 +293,14 @@ OPTS += -DCOMPVERSION
ifndef NONX86
ifndef GCC29
M5=-march=pentium
M5?=-march=pentium
else
M5=-mpentium
M5?=-mpentium
endif
endif
else
ifdef X86_64
M5=-march=nocona
M5?=-march=nocona
endif
endif
ifndef NOASM

2
src/win32/Makefile.cfg
View file

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