[Scummvm-git-logs] scummvm master -> b19de22053932f61d73e2cd6a17f429000ce7bc3

sev- sev at scummvm.org
Thu Sep 19 17:01:40 CEST 2019


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:
b19de22053 MACOS: Implement 64bit-only bundle target


Commit: b19de22053932f61d73e2cd6a17f429000ce7bc3
    https://github.com/scummvm/scummvm/commit/b19de22053932f61d73e2cd6a17f429000ce7bc3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-09-19T17:01:01+02:00

Commit Message:
MACOS: Implement 64bit-only bundle target

Changed paths:
    ports.mk


diff --git a/ports.mk b/ports.mk
index f161373..f923d8e 100644
--- a/ports.mk
+++ b/ports.mk
@@ -91,15 +91,19 @@ scummvm.docktileplugin: ScummVMDockTilePlugin
 	cp ScummVMDockTilePlugin scummvm.docktileplugin/Contents/MacOS/
 	chmod 644 scummvm.docktileplugin/Contents/MacOS/ScummVMDockTilePlugin
 
+scummvm.docktileplugin64: ScummVMDockTilePlugin64
+	mkdir -p scummvm.docktileplugin/Contents
+	cp $(srcdir)/dists/macosx/dockplugin/Info.plist scummvm.docktileplugin/Contents
+	mkdir -p scummvm.docktileplugin/Contents/MacOS
+	mv ScummVMDockTilePlugin64 ScummVMDockTilePlugin
+	cp ScummVMDockTilePlugin scummvm.docktileplugin/Contents/MacOS/
+	chmod 644 scummvm.docktileplugin/Contents/MacOS/ScummVMDockTilePlugin
+
 endif
 
 bundle_name = ScummVM.app
 
-ifdef USE_DOCKTILEPLUGIN
-bundle: scummvm-static scummvm.docktileplugin
-else
-bundle: scummvm-static
-endif
+bundle-pack:
 	mkdir -p $(bundle_name)/Contents/MacOS
 	mkdir -p $(bundle_name)/Contents/Resources
 	echo "APPL????" > $(bundle_name)/Contents/PkgInfo
@@ -137,6 +141,16 @@ ifdef USE_DOCKTILEPLUGIN
 	cp -r scummvm.docktileplugin $(bundle_name)/Contents/PlugIns/
 endif
 
+ifdef USE_DOCKTILEPLUGIN
+bundle: scummvm-static scummvm.docktileplugin bundle-pack
+
+bundle64: scummvm-static scummvm.docktileplugin64 bundle-pack
+else
+bundle: scummvm-static bundle-pack
+
+bundle64: scummvm-static bundle-pack
+endif
+
 iphonebundle: iphone
 	mkdir -p $(bundle_name)
 	cp $(srcdir)/dists/iphone/Info.plist $(bundle_name)/





More information about the Scummvm-git-logs mailing list