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:20:20 +02:00
parent 3483888050
commit 761fc68571
2 changed files with 17 additions and 35 deletions

View File

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

View File

@ -1,24 +0,0 @@
From 988a94f2a2c33568090b5dc29e6ad599a95dc92d Mon Sep 17 00:00:00 2001
From: heitbaum <rudi@heitbaum.com>
Date: Thu, 13 Jan 2022 07:17:57 +0000
Subject: [PATCH] Makefile: update for python3 and enable override on OBJDUMP
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 13f612c7ec..410360f156 100644
--- a/Makefile
+++ b/Makefile
@@ -524,8 +524,8 @@ endif
# utilities
MD = -mkdir$(EXE_EXT)
RM = @rm -f
-OBJDUMP = @objdump
-PYTHON ?= @python2
+OBJDUMP ?= @objdump
+PYTHON ?= @python3
#-------------------------------------------------
# form the name of the executable