ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makefile: Rename i686 platform to x86 and AMD64 to x64

This commit is contained in:
Jan Holthuis 2015-07-29 13:27:27 +02:00
parent d295bad50b
commit 0b505e6857
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
shell/linux/Makefile
View File

@ -25,13 +25,13 @@ CXXFLAGS :=
# Platform auto-detection # Platform auto-detection
# Can be overridden by using: # Can be overridden by using:
# make platform=AMD64 # make platform=x64
ifeq (,$(platform)) ifeq (,$(platform))
ARCH = $(shell uname -m) ARCH = $(shell uname -m)
ifeq ($(ARCH), $(filter $(ARCH), i386 i686)) ifeq ($(ARCH), $(filter $(ARCH), i386 i686))
platform = i686 platform = x86
else ifeq ($(ARCH), $(filter $(ARCH), x86_64 AMD64)) else ifeq ($(ARCH), $(filter $(ARCH), x86_64 AMD64))
platform = AMD64 platform = x64
else ifneq (,$(findstring arm,$(ARCH))) else ifneq (,$(findstring arm,$(ARCH)))
HARDWARE = $(shell grep Hardware /proc/cpuinfo) HARDWARE = $(shell grep Hardware /proc/cpuinfo)
ifneq (,$(findstring BCM2709,$(HARDWARE))) ifneq (,$(findstring BCM2709,$(HARDWARE)))
@ -52,8 +52,8 @@ endif
$(info Platform: $(platform)) $(info Platform: $(platform))
# Generic x86 (32 bit) # Generic 32 bit x86 (a.k.a. i386/i486/i686)
ifneq (,$(findstring i686,$(platform))) ifneq (,$(findstring x86,$(platform)))
X86_REC := 1 X86_REC := 1
NOT_ARM := 1 NOT_ARM := 1
MFLAGS += -m32 MFLAGS += -m32
@ -62,8 +62,8 @@ ifneq (,$(findstring i686,$(platform)))
CFLAGS += -m32 -D TARGET_LINUX_x86 -D TARGET_NO_AREC CFLAGS += -m32 -D TARGET_LINUX_x86 -D TARGET_NO_AREC
CXXFLAGS += -fno-exceptions CXXFLAGS += -fno-exceptions
# Generic x86_64 (64 bit) # Generic 64 bit x86 (a.k.a. x64/AMD64/x86_64/Intel64/EM64T)
else ifneq (,$(findstring AMD64,$(platform))) else ifneq (,$(findstring x64,$(platform)))
X64_REC := 1 X64_REC := 1
NOT_ARM := 1 NOT_ARM := 1
CFLAGS += -D TARGET_LINUX_x64 -D TARGET_NO_AREC CFLAGS += -D TARGET_LINUX_x64 -D TARGET_NO_AREC