diff options
Diffstat (limited to 'makefile')
-rw-r--r-- | makefile | 34 |
1 files changed, 23 insertions, 11 deletions
@@ -25,7 +25,6 @@ # USE_DISPATCH_GL = 0 # MODERN_WIN_API = 0 -# USE_XAUDIO2 = 0 # DIRECTINPUT = 7 # USE_SDL = 1 # SDL_INI_PATH = .;$HOME/.mame/;ini; @@ -137,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 @@ -280,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 @@ -577,10 +589,6 @@ ifdef MODERN_WIN_API PARAMS += --MODERN_WIN_API='$(MODERN_WIN_API)' endif -ifdef USE_XAUDIO2 -PARAMS += --USE_XAUDIO2='$(USE_XAUDIO2)' -endif - ifdef DIRECTINPUT PARAMS += --DIRECTINPUT='$(DIRECTINPUT)' endif @@ -804,16 +812,20 @@ CLANG_VERSION := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) --version 2> /dev/nu endif PYTHON_AVAILABLE := $(shell $(PYTHON) --version > /dev/null 2>&1 && echo python) endif + ifeq ($(CLANG_VERSION),) $(info GCC $(GCC_VERSION) detected) else $(info Clang $(CLANG_VERSION) detected) +ifneq ($(TARGETOS),asmjs) ifeq ($(ARCHITECTURE),_x64) ARCHITECTURE := _x64_clang else ARCHITECTURE := _x86_clang endif endif +endif + ifneq ($(PYTHON_AVAILABLE),python) $(error Python is not available in path) endif @@ -950,7 +962,7 @@ endif ifndef ANDROID_NDK_ROOT $(error ANDROID_NDK_ROOT is not set) endif - $(SILENT) $(GENIE) $(PARAMS) --gcc=android-arm --gcc_version=3.6.0 --osd=osdmini --targetos=android-arm --targetos=android --PLATFORM=arm --NOASM=1 gmake + $(SILENT) $(GENIE) $(PARAMS) --gcc=android-arm --gcc_version=3.8.0 --osd=osdmini --targetos=android-arm --targetos=android --PLATFORM=arm --NOASM=1 gmake .PHONY: android-arm android-arm: generate $(PROJECTDIR_MINI)/gmake-android-arm/Makefile @@ -974,7 +986,7 @@ endif ifndef ANDROID_NDK_ROOT $(error ANDROID_NDK_ROOT is not set) endif - $(SILENT) $(GENIE) $(PARAMS) --gcc=android-arm64 --gcc_version=3.6.0 --osd=osdmini --targetos=android-arm64 --targetos=android --PLATFORM=arm64 --NOASM=1 gmake + $(SILENT) $(GENIE) $(PARAMS) --gcc=android-arm64 --gcc_version=3.8.0 --osd=osdmini --targetos=android-arm64 --targetos=android --PLATFORM=arm64 --NOASM=1 gmake .PHONY: android-arm64 android-arm64: generate $(PROJECTDIR_MINI)/gmake-android-arm64/Makefile @@ -998,7 +1010,7 @@ endif ifndef ANDROID_NDK_ROOT $(error ANDROID_NDK_ROOT is not set) endif - $(SILENT) $(GENIE) $(PARAMS) --gcc=android-mips --gcc_version=3.6.0 --osd=osdmini --targetos=android-mips --targetos=android --PLATFORM=mips --NOASM=1 gmake + $(SILENT) $(GENIE) $(PARAMS) --gcc=android-mips --gcc_version=3.8.0 --osd=osdmini --targetos=android-mips --targetos=android --PLATFORM=mips --NOASM=1 gmake .PHONY: android-mips android-mips: generate $(PROJECTDIR_MINI)/gmake-android-mips/Makefile @@ -1022,7 +1034,7 @@ endif ifndef ANDROID_NDK_ROOT $(error ANDROID_NDK_ROOT is not set) endif - $(SILENT) $(GENIE) $(PARAMS) --gcc=android-mips64 --gcc_version=3.6.0 --osd=osdmini --targetos=android-mips64 --targetos=android --PLATFORM=mips64 --NOASM=1 gmake + $(SILENT) $(GENIE) $(PARAMS) --gcc=android-mips64 --gcc_version=3.8.0 --osd=osdmini --targetos=android-mips64 --targetos=android --PLATFORM=mips64 --NOASM=1 gmake .PHONY: android-mips64 android-mips64: generate $(PROJECTDIR_MINI)/gmake-android-mips64/Makefile @@ -1046,7 +1058,7 @@ endif ifndef ANDROID_NDK_ROOT $(error ANDROID_NDK_ROOT is not set) endif - $(SILENT) $(GENIE) $(PARAMS) --gcc=android-x86 --gcc_version=3.6.0 --osd=osdmini --targetos=android-x86 --targetos=android --PLATFORM=x86 gmake + $(SILENT) $(GENIE) $(PARAMS) --gcc=android-x86 --gcc_version=3.8.0 --osd=osdmini --targetos=android-x86 --targetos=android --PLATFORM=x86 gmake .PHONY: android-x86 android-x86: generate $(PROJECTDIR_MINI)/gmake-android-x86/Makefile @@ -1070,7 +1082,7 @@ endif ifndef ANDROID_NDK_ROOT $(error ANDROID_NDK_ROOT is not set) endif - $(SILENT) $(GENIE) $(PARAMS) --gcc=android-x64 --gcc_version=3.6.0 --osd=osdmini --targetos=android-x64 --targetos=android --PLATFORM=x64 gmake + $(SILENT) $(GENIE) $(PARAMS) --gcc=android-x64 --gcc_version=3.8.0 --osd=osdmini --targetos=android-x64 --targetos=android --PLATFORM=x64 gmake .PHONY: android-x64 android-x64: generate $(PROJECTDIR_MINI)/gmake-android-x64/Makefile |