diff options
-rw-r--r-- | makefile | 13 | ||||
-rw-r--r-- | scripts/genie.lua | 9 |
2 files changed, 22 insertions, 0 deletions
@@ -136,6 +136,12 @@ endif ifneq ($(filter arm%,$(UNAME_P)),) PLATFORM := arm endif +ifneq ($(filter aarch64%,$(UNAME_M)),) +PLATFORM := arm64 +endif +ifneq ($(filter aarch64%,$(UNAME_P)),) +PLATFORM := arm64 +endif ifneq ($(filter powerpc,$(UNAME_P)),) PLATFORM := powerpc endif @@ -279,6 +285,13 @@ ifndef NOASM endif endif +ifeq ($(findstring aarch64,$(UNAME)),aarch64) +ARCHITECTURE := +ifndef NOASM + NOASM := 1 +endif +endif + # Emscripten ifeq ($(findstring emcc,$(CC)),emcc) TARGETOS := asmjs diff --git a/scripts/genie.lua b/scripts/genie.lua index ef5c945bb64..9d686e1f274 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -1025,6 +1025,15 @@ if (_OPTIONS["PLATFORM"]=="arm") then } end +if (_OPTIONS["PLATFORM"]=="arm64") then + buildoptions { + "-Wno-cast-align", + } + defines { + "PTR64=1", + } +end + local subdir if (_OPTIONS["target"] == _OPTIONS["subtarget"]) then subdir = _OPTIONS["osd"] .. "/" .. _OPTIONS["target"] |