From 31c69fd5cb5f23a05336005fc59889c655de8d6a Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 5 Apr 2022 00:39:21 +0200 Subject: [PATCH 1/4] Replace manual defines of MSB_FIRST with retro_endianness.h include --- Makefile | 6 +++--- Makefile.libretro | 11 +---------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 444ffca2..bfe00564 100644 --- a/Makefile +++ b/Makefile @@ -23,13 +23,13 @@ else endif %.o: %.cpp - $(CXX) -c -o $@ $< $(CXXFLAGS) + $(CXX) -c -o $@ $< $(CXXFLAGS) -include retro_endianness.h %.o: %.c - $(CC) -c -o $@ $< $(CFLAGS) + $(CC) -c -o $@ $< $(CFLAGS) -include retro_endianness.h %.o: %.m - $(CC) -c -o $@ $< $(CFLAGS) + $(CC) -c -o $@ $< $(CFLAGS) -include retro_endianness.h %.o: %.S $(CC) -c -o $@ $< $(CFLAGS) diff --git a/Makefile.libretro b/Makefile.libretro index 47e0f5a1..346f9865 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -80,9 +80,6 @@ else ifeq ($(platform), osx) TARGET := $(TARGET_NAME)_libretro.dylib fpic := -fPIC SHARED := -dynamiclib - ifeq ($(arch),ppc) - ENDIANNESS_DEFINES += -DMSB_FIRST - endif OSXVER = `sw_vers -productVersion | cut -d. -f 2` OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"` # fpic += -mmacosx-version-min=10.1 @@ -225,7 +222,6 @@ else ifeq ($(platform), psl1ght) CC = $(PS3DEV)/ppu/bin/ppu-gcc$(EXE_EXT) AR = $(PS3DEV)/ppu/bin/ppu-ar$(EXE_EXT) PLATFORM_DEFINES := -D__PSL1GHT__ - ENDIANNESS_DEFINES += -DMSB_FIRST STATIC_LINKING=1 EXTERNAL_ZLIB=1 @@ -235,7 +231,6 @@ else ifeq ($(platform), xenon) CC = xenon-gcc$(EXE_EXT) AR = xenon-ar$(EXE_EXT) PLATFORM_DEFINES := -D__LIBXENON__ - ENDIANNESS_DEFINES += -DMSB_FIRST STATIC_LINKING=1 EXTERNAL_ZLIB=1 @@ -246,7 +241,6 @@ else ifeq ($(platform), ngc) AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT) PLATFORM_DEFINES := -DGEKKO -DHW_DOL -mrvl -mcpu=750 -meabi -mhard-float PLATFORM_DEFINES += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int - ENDIANNESS_DEFINES += -DMSB_FIRST STATIC_LINKING=1 EXTERNAL_ZLIB=1 @@ -257,7 +251,6 @@ else ifeq ($(platform), wii) AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT) PLATFORM_DEFINES := -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float PLATFORM_DEFINES += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int - ENDIANNESS_DEFINES += -DMSB_FIRST STATIC_LINKING=1 EXTERNAL_ZLIB=1 @@ -268,7 +261,6 @@ else ifeq ($(platform), wiiu) AR = $(DEVKITPPC)/bin/powerpc-eabi-ar$(EXE_EXT) PLATFORM_DEFINES := -DGEKKO -DHW_RVL -mcpu=750 -meabi -mhard-float PLATFORM_DEFINES += -U__INT32_TYPE__ -U __UINT32_TYPE__ -D__INT32_TYPE__=int - ENDIANNESS_DEFINES += -DMSB_FIRST STATIC_LINKING=1 EXTERNAL_ZLIB=1 @@ -564,7 +556,6 @@ PATH := $(call unixcygpath,$(XEDK)/bin/win32):$(PATH) PSS_STYLE :=2 CFLAGS += -D_XBOX -D_XBOX360 CXXFLAGS += -D_XBOX -D_XBOX360 -ENDIANNESS_DEFINES += -DMSB_FIRST STATIC_LINKING=1 # Windows MSVC 2005 x86 @@ -692,7 +683,7 @@ else WARNING_DEFINES = -Wno-write-strings endif -CFLAGS += $(COREDEFINES) $(fpic) $(WARNING_DEFINES) $(DEFINES) $(ENDIANNESS_DEFINES) +CFLAGS += $(COREDEFINES) $(fpic) $(WARNING_DEFINES) $(DEFINES) LDFLAGS += $(LIBM) ifeq ($(platform), psp1) From 9d53c634cac0add897296294e9f1b0bc9d60c574 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 5 Apr 2022 00:41:04 +0200 Subject: [PATCH 2/4] Remove unused variable arch --- Makefile.libretro | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Makefile.libretro b/Makefile.libretro index 346f9865..b156773a 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -22,10 +22,6 @@ ifeq ($(platform),) platform = win else ifneq ($(findstring Darwin,$(shell uname -a)),) platform = osx - arch = intel - ifeq ($(shell uname -p),powerpc) - arch = ppc - endif else ifneq ($(findstring win,$(shell uname -a)),) platform = win endif @@ -38,10 +34,6 @@ ifeq ($(shell uname -a),) system_platform = win else ifneq ($(findstring Darwin,$(shell uname -a)),) system_platform = osx - arch = intel - ifeq ($(shell uname -p),powerpc) - arch = ppc - endif else ifneq ($(findstring MINGW,$(shell uname -a)),) system_platform = win endif From cac96972aaf7c10328b0459fda0f01a2019b96e2 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 5 Apr 2022 00:41:51 +0200 Subject: [PATCH 3/4] Remove dead Makefile code --- Makefile.libretro | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile.libretro b/Makefile.libretro index b156773a..b7533603 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -72,9 +72,6 @@ else ifeq ($(platform), osx) TARGET := $(TARGET_NAME)_libretro.dylib fpic := -fPIC SHARED := -dynamiclib - OSXVER = `sw_vers -productVersion | cut -d. -f 2` - OSX_LT_MAVERICKS = `(( $(OSXVER) <= 9)) && echo "YES"` -# fpic += -mmacosx-version-min=10.1 ifndef ($(NOUNIVERSAL)) CFLAGS += $(ARCHFLAGS) LDFLAGS += $(ARCHFLAGS) From ad6de1cbb270d6b2f2287a8a93acc3efdc5cd848 Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Tue, 5 Apr 2022 00:42:36 +0200 Subject: [PATCH 4/4] Fix osx-arm64 compilation --- Makefile.libretro | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile.libretro b/Makefile.libretro index b7533603..1b47384b 100644 --- a/Makefile.libretro +++ b/Makefile.libretro @@ -72,9 +72,13 @@ else ifeq ($(platform), osx) TARGET := $(TARGET_NAME)_libretro.dylib fpic := -fPIC SHARED := -dynamiclib - ifndef ($(NOUNIVERSAL)) - CFLAGS += $(ARCHFLAGS) - LDFLAGS += $(ARCHFLAGS) + + ifeq ($(CROSS_COMPILE),1) + TARGET_RULE = -target $(LIBRETRO_APPLE_PLATFORM) -isysroot $(LIBRETRO_APPLE_ISYSROOT) + CFLAGS += $(TARGET_RULE) + CPPFLAGS += $(TARGET_RULE) + CXXFLAGS += $(TARGET_RULE) + LDFLAGS += $(TARGET_RULE) endif else ifeq ($(platform), tvos-arm64) TARGET := $(TARGET_NAME)_libretro_tvos.dylib