Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-18 22:49:58 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add macosx_arm64_clang target support [R. Belmont, Miodrag Milanovic]

Browse Source
This commit is contained in:
arbee 2020-12-12 20:00:04 -05:00
parent 95c6429988
commit 2c63fde1d0
3 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
makefile
View File

@ -166,6 +166,9 @@ endif
ifneq ($(filter aarch64%,$(UNAME_M)),)
PLATFORM := arm64
endif
ifneq ($(filter arm64%,$(UNAME_M)),)
PLATFORM := arm64
endif
ifneq ($(filter aarch64%,$(UNAME_P)),)
PLATFORM := arm64
endif
@ -399,6 +402,13 @@ ifndef FORCE_DRC_C_BACKEND
endif
endif
# ARM / ARM64
ifeq ($(findstring arm,$(UNAME)),arm)
ifndef FORCE_DRC_C_BACKEND
FORCE_DRC_C_BACKEND := 1
endif
endif
# Autodetect BIGENDIAN
# MacOSX
ifndef BIGENDIAN
@ -1030,10 +1040,14 @@ ifneq ($(TARGETOS),asmjs)
ifeq ($(ARCHITECTURE),_x64)
ARCHITECTURE := _x64_clang
else
ifneq ($(filter arm64%,$(UNAME_M)),)
ARCHITECTURE := _arm64_clang
else
ARCHITECTURE := _x86_clang
endif
endif
endif
endif
ifneq ($(PYTHON_AVAILABLE),python)
$(error Python is not available in path)
@ -1420,6 +1434,11 @@ $(PROJECTDIR)/$(MAKETYPE)-osx-clang/Makefile: makefile $(SCRIPTS) $(GENIE)
.PHONY: macosx_x64_clang
macosx_x64_clang: generate $(PROJECTDIR)/$(MAKETYPE)-osx-clang/Makefile
$(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-osx-clang config=$(CONFIG)64 precompile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-osx-clang config=$(CONFIG)64
.PHONY: macosx_arm64_clang
macosx_arm64_clang: generate $(PROJECTDIR)/$(MAKETYPE)-osx-clang/Makefile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-osx-clang config=$(CONFIG)64 precompile
$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-osx-clang config=$(CONFIG)64

11
scripts/genie.lua
View File

@ -681,14 +681,21 @@ else
"LSB_FIRST",
}
if _OPTIONS["targetos"]=="macosx" then
configuration { "x64" }
configuration { "arm64" }
buildoptions {
"-arch arm64",
}
linkoptions {
"-arch arm64",
}
configuration { "x64", "not arm64" }
buildoptions {
"-arch x86_64",
}
linkoptions {
"-arch x86_64",
}
configuration { "x32" }
configuration { "x32", "not arm64" }
buildoptions {
"-arch i386",
}

24
scripts/toolchain.lua
View File

@ -1054,27 +1054,39 @@ function toolchain(_buildDir, _subDir)
configuration { "pnacl", "Release" }
libdirs { "$(NACL_SDK_ROOT)/lib/pnacl/Release" }
configuration { "osx*", "x32" }
configuration { "osx*", "x32", "not arm64" }
objdir (_buildDir .. "osx_clang" .. "/obj")
buildoptions {
"-m32",
}
configuration { "osx*", "x32", "Release" }
configuration { "osx*", "x32", "not arm64", "Release" }
targetdir (_buildDir .. "osx_clang" .. "/bin/x32/Release")
configuration { "osx*", "x32", "Debug" }
configuration { "osx*", "x32", "not arm64", "Debug" }
targetdir (_buildDir .. "osx_clang" .. "/bin/x32/Debug")
configuration { "osx*", "x64" }
configuration { "osx*", "x64", "not arm64" }
objdir (_buildDir .. "osx_clang" .. "/obj")
buildoptions {
"-m64", "-DHAVE_IMMINTRIN_H=1",
}
configuration { "osx*", "x64", "Release" }
configuration { "osx*", "x64", "not arm64", "Release" }
targetdir (_buildDir .. "osx_clang" .. "/bin/x64/Release")
configuration { "osx*", "x64", "Debug" }
configuration { "osx*", "x64", "not arm64", "Debug" }
targetdir (_buildDir .. "osx_clang" .. "/bin/x64/Debug")
configuration { "osx*", "arm64" }
objdir (_buildDir .. "osx_clang" .. "/obj")
buildoptions {
"-m64", "-DHAVE_IMMINTRIN_H=0", "-DSDL_DISABLE_IMMINTRIN_H=1", "-DHAVE_SSE=0"
}
configuration { "osx*", "arm64", "Release" }
targetdir (_buildDir .. "osx_clang" .. "/bin/x64/Release")
configuration { "osx*", "arm64", "Debug" }
targetdir (_buildDir .. "osx_clang" .. "/bin/x64/Debug")
configuration { "ios-arm" }