Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix osx-arm64 compilation and few Makefile cleanups #409

Merged
merged 4 commits into from
Apr 4, 2022
Merged

Fix osx-arm64 compilation and few Makefile cleanups #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31c69fd
Replace manual defines of MSB_FIRST with retro_endianness.h include
phcoder Apr 4, 2022
9d53c63
Remove unused variable arch
phcoder Apr 4, 2022
cac9697
Remove dead Makefile code
phcoder Apr 4, 2022
ad6de1c
Fix osx-arm64 compilation
phcoder Apr 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
32 changes: 8 additions & 24 deletions Makefile.libretro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -80,15 +72,13 @@ 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
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
Expand Down Expand Up @@ -225,7 +215,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

Expand All @@ -235,7 +224,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

Expand All @@ -246,7 +234,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

Expand All @@ -257,7 +244,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

Expand All @@ -268,7 +254,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

Expand Down Expand Up @@ -564,7 +549,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
Expand Down Expand Up @@ -692,7 +676,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)
Expand Down