[Scummvm-git-logs] scummvm master -> 4ce86366406ce83570ae0d354837b34c77c53033

[criezy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4ce8636640 MACOSX: Build ARM version of Dock plugin when building ARM version of ScummVM


Commit: 4ce86366406ce83570ae0d354837b34c77c53033
    https://github.com/scummvm/scummvm/commit/4ce86366406ce83570ae0d354837b34c77c53033
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2022-06-05T15:08:44+01:00

Commit Message:
MACOSX: Build ARM version of Dock plugin when building ARM version of ScummVM

Changed paths:
    configure
    ports.mk


diff --git a/configure b/configure
index 26b2a71ab26..1f304390438 100755
--- a/configure
+++ b/configure
@@ -2812,6 +2812,9 @@ EOF
 				add_line_to_config_mk 'MACOSX_64_BITS_ONLY = 1'
 			fi
 		fi
+		if test "$_host_cpu" = "aarch64" ; then
+			add_line_to_config_mk 'MACOSX_ARM64 = 1'
+		fi
 
 		# Avoid "file has no symbols" noise from ranlib, if it's new enough
 		ranlib_version=`$_ranlib -V 2>/dev/null`
diff --git a/ports.mk b/ports.mk
index 3f1bd8c310c..6418cfdefab 100644
--- a/ports.mk
+++ b/ports.mk
@@ -86,6 +86,16 @@ ifdef USE_DOCKTILEPLUGIN
 # The NsDockTilePlugIn needs to be compiled in both 32 and 64 bits irrespective of how ScummVM itself is compiled.
 # Therefore do not use $(CXXFLAGS) and $(LDFLAGS).
 
+ifdef MACOSX_ARM64
+
+ScummVMDockTilePlugin.o:
+	$(CXX) -mmacosx-version-min=11.0 -arch arm64 -O2 -c $(srcdir)/backends/taskbar/macosx/dockplugin/dockplugin.m -o ScummVMDockTilePlugin.o
+
+ScummVMDockTilePlugin: ScummVMDockTilePlugin.o
+	$(CXX) -mmacosx-version-min=11.0 -arch arm64 -bundle -framework Foundation -framework AppKit -fobjc-link-runtime ScummVMDockTilePlugin.o -o ScummVMDockTilePlugin
+
+else  # MACOSX_ARM64
+
 ScummVMDockTilePlugin32.o:
 	$(CXX) -mmacosx-version-min=10.6 -arch i386 -O2 -c $(srcdir)/backends/taskbar/macosx/dockplugin/dockplugin.m -o ScummVMDockTilePlugin32.o
 
@@ -101,10 +111,12 @@ ScummVMDockTilePlugin64: ScummVMDockTilePlugin64.o
 ifdef MACOSX_64_BITS_ONLY
 ScummVMDockTilePlugin: ScummVMDockTilePlugin64
 	cp ScummVMDockTilePlugin64 ScummVMDockTilePlugin
-else
+else  # MACOSX_64_BITS_ONLY
 ScummVMDockTilePlugin: ScummVMDockTilePlugin32 ScummVMDockTilePlugin64
 	lipo -create ScummVMDockTilePlugin32 ScummVMDockTilePlugin64 -output ScummVMDockTilePlugin
-endif
+endif # MACOSX_64_BITS_ONLY
+
+endif # MACOSX_ARM64
 
 scummvm.docktileplugin: ScummVMDockTilePlugin
 	mkdir -p scummvm.docktileplugin/Contents