libretro-mame2015: update cross-compile patch

Signed-off-by: Matthias Reichl <hias@horus.com>
This commit is contained in:
Matthias Reichl 2022-04-12 19:12:08 +02:00
parent f7579f5cdf
commit 3b69d8b786

View File

@ -1,19 +1,15 @@
diff --git a/Makefile b/Makefile
index 54a6f648c8..4a933d1d01 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -132,8 +132,8 @@ ifneq (,$(findstring unix,$(platform))) @@ -138,7 +138,7 @@
LIBS += -lGL LIBS += -lGL
endif endif
LDFLAGS += $(fpic) $(SHARED) LDFLAGS += $(fpic) $(SHARED)
- REALCC ?= gcc - REALCC ?= gcc
- NATIVECC ?= g++
+ REALCC ?= $(CC) + REALCC ?= $(CC)
+ NATIVECC ?= $(CXX)
NATIVECFLAGS ?= -std=gnu99
BASELIBS += -lpthread BASELIBS += -lpthread
CXX ?= g++ CXX ?= g++
@@ -142,13 +142,13 @@ ifneq (,$(findstring unix,$(platform))) #workaround for mame bug (c++ in .c files)
@@ -146,23 +146,23 @@
AR ?= @ar AR ?= @ar
LD := $(CXX) LD := $(CXX)
LIBS += -lstdc++ -lpthread -ldl LIBS += -lstdc++ -lpthread -ldl
@ -25,20 +21,21 @@ index 54a6f648c8..4a933d1d01 100644
+ ifeq ($(firstword $(filter amd64,$(ARCH))),amd64) + ifeq ($(firstword $(filter amd64,$(ARCH))),amd64)
PTR64 = 1 PTR64 = 1
endif endif
- ifeq ($(firstword $(filter aarch64,$(UNAME))),aarch64)
+ ifeq ($(firstword $(filter aarch64,$(ARCH))),aarch64)
PTR64 = 1
PLATCFLAGS += -DSDLMAME_NO64BITIO -DSDLMAME_ARM -DFORCE_DRC_C_BACKEND
endif
- ifeq ($(firstword $(filter ppc64,$(UNAME))),ppc64) - ifeq ($(firstword $(filter ppc64,$(UNAME))),ppc64)
+ ifeq ($(firstword $(filter ppc64,$(ARCH))),ppc64) + ifeq ($(firstword $(filter ppc64,$(ARCH))),ppc64)
PTR64 = 1 PTR64 = 1
endif endif
ifneq (,$(findstring ppc,$(UNAME))) - ifneq (,$(findstring ppc,$(UNAME)))
@@ -487,7 +487,7 @@ endif + ifneq (,$(findstring ppc,$(ARCH)))
# utilities BIGENDIAN=1
MD = -mkdir$(EXE_EXT) endif
RM = @rm -f - ifneq (,$(findstring armv,$(UNAME) $(platform)))
-OBJDUMP = @objdump + ifneq (,$(findstring armv,$(ARCH) $(platform)))
+OBJDUMP ?= @objdump CCOMFLAGS += -mstructure-size-boundary=32
PYTHON ?= @python2 PLATCFLAGS += -DSDLMAME_NO64BITIO -DSDLMAME_ARM -DRETRO_SETJMP_HACK -DARM
LDFLAGS += -Wl,--fix-cortex-a8 -Wl,--no-as-needed
#-------------------------------------------------
--
2.17.1