thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Thierry Crozat 2022-06-05 15:08:03 +01:00
parent c50da0a193
commit 4ce8636640
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
configure vendored
View file

@ -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`

16
ports.mk
View file

@ -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