[Scummvm-git-logs] scummvm master -> 6b5c7e6928b9e432c7ca3102221acea25b80766a

sev- sev at scummvm.org
Tue Aug 28 15:53:55 CEST 2018 

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

Summary:
9686d8c8e6 MACOSX: Put documentation links in Help menu
cb28ebcd1f MACOSX: Combine the license files into a single file when packaging
8b5f7d247a MACOSX: Fix compilation with the 10.9 SDK and below
d4eca67d2a MACOSX: Keep the original license files when combining
ebedc15437 MACOSX: Give every license file a menu item
6b5c7e6928 MACOSX: Update link to documentation


Commit: 9686d8c8e6c729f37b2842502fce5b6be18b0acf
    https://github.com/scummvm/scummvm/commit/9686d8c8e6c729f37b2842502fce5b6be18b0acf
Author: Colin Snover (github.com at zetafleet.com)
Date: 2018-08-28T15:52:23+02:00

Commit Message:
MACOSX: Put documentation links in Help menu

The local documents are not currently internationalised simply
because the internationalised resources are not put into the right
places (NSBundle will handle this automatically when they are);
Trac#10464 is a tracking bug for this outstanding issue.

Fixes Trac#10437.

Changed paths:
    backends/platform/sdl/macosx/appmenu_osx.h
    backends/platform/sdl/macosx/appmenu_osx.mm
    backends/platform/sdl/macosx/macosx.cpp
    backends/platform/sdl/macosx/macosx.h
    devtools/create_project/xcode.cpp
    ports.mk


diff --git a/backends/platform/sdl/macosx/appmenu_osx.h b/backends/platform/sdl/macosx/appmenu_osx.h
index 2208818..15dd76d 100644
--- a/backends/platform/sdl/macosx/appmenu_osx.h
+++ b/backends/platform/sdl/macosx/appmenu_osx.h
@@ -26,6 +26,7 @@
 #if defined(MACOSX)
 
 void replaceApplicationMenuItems();
+void releaseMenu();
 
 #endif // MACOSX
 
diff --git a/backends/platform/sdl/macosx/appmenu_osx.mm b/backends/platform/sdl/macosx/appmenu_osx.mm
index 64b8e2b..c839c20 100644
--- a/backends/platform/sdl/macosx/appmenu_osx.mm
+++ b/backends/platform/sdl/macosx/appmenu_osx.mm
@@ -28,6 +28,7 @@
 
 #include "backends/platform/sdl/macosx/macosx-compat.h"
 #include <Cocoa/Cocoa.h>
+#include <AppKit/NSWorkspace.h>
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_12
 #define NSEventModifierFlagCommand NSCommandKeyMask
@@ -50,17 +51,97 @@
 // In SnowLeopard, this workaround is unnecessary and should not be used. Under SnowLeopard, the first menu
 // is always identified as the application menu.
 
+static void openFromBundle(NSString *file) {
+	NSString *path = [[NSBundle mainBundle] pathForResource:file ofType:@"rtf"];
+	if (!path) {
+		path = [[NSBundle mainBundle] pathForResource:file ofType:@""];
+	}
+
+	if (path) {
+		[[NSWorkspace sharedWorkspace] openFile:path];
+	}
+}
+
+ at interface ScummVMMenuHandler : NSObject {
+}
+- (void) openReadme;
+- (void) openLicense;
+- (void) openNews;
+- (void) openUserManual;
+- (void) openCredits;
+ at end
+
+ at implementation ScummVMMenuHandler : NSObject
+- (void)openReadme {
+	openFromBundle(@"README");
+}
+
+- (void)openLicense {
+	openFromBundle(@"COPYING");
+}
+
+- (void)openNews {
+	openFromBundle(@"NEWS");
+}
+
+- (void)openUserManual {
+	[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://www.scummvm.org/manual"]];
+}
+
+- (void)openCredits {
+	openFromBundle(@"AUTHORS");
+}
+ at end
 
 NSString *constructNSStringFromCString(const char *rawCString, CFStringEncoding stringEncoding) {
 	return (NSString *)CFStringCreateWithCString(NULL, rawCString, stringEncoding);
 }
 
-void replaceApplicationMenuItems() {
+static NSMenu *addMenu(const char *title, CFStringEncoding encoding, NSString *key, SEL setAs) {
+	NSString *str = constructNSStringFromCString(title, encoding);
+	NSMenu *menu = [[NSMenu alloc] initWithTitle:str];
 
-	// Code mainly copied and adapted from SDLmain.m
-	NSMenu *appleMenu;
-	NSMenu *windowMenu;
-	NSMenuItem *menuItem;
+	NSMenuItem *menuItem = [[NSMenuItem alloc] initWithTitle:str action:nil keyEquivalent:key];
+	[menuItem setSubmenu:menu];
+	[[NSApp mainMenu] addItem:menuItem];
+
+	if (setAs) {
+		[NSApp performSelector:setAs withObject:menu];
+	}
+
+	[str release];
+	[menuItem release];
+
+	return menu;
+}
+
+static void addMenuItem(const char *title, CFStringEncoding encoding, id target, SEL selector, NSString *key, NSMenu *parent, NSEventModifierFlags flags = 0) {
+	NSString *nsString = constructNSStringFromCString(title, encoding);
+	NSMenuItem *menuItem = [[NSMenuItem alloc]
+							initWithTitle:nsString
+							action:selector
+							keyEquivalent:key];
+	if (target) {
+		[menuItem setTarget:target];
+	}
+	if (flags) {
+		[menuItem setKeyEquivalentModifierMask:flags];
+	}
+	[parent addItem:menuItem];
+	[nsString release];
+}
+
+static ScummVMMenuHandler *delegate = nullptr;
+
+void releaseMenu() {
+	[delegate release];
+	delegate = nullptr;
+}
+
+void replaceApplicationMenuItems() {
+	if (!delegate) {
+		delegate = [[ScummVMMenuHandler alloc] init];
+	}
 
 	// We cannot use [[NSApp mainMenu] removeAllItems] as removeAllItems was added in OS X 10.6
 	// So remove the SDL generated menus one by one instead.
@@ -68,9 +149,6 @@ void replaceApplicationMenuItems() {
 		[[NSApp mainMenu] removeItemAtIndex:0];
 	}
 
-	// Create new application menu
-	appleMenu = [[NSMenu alloc] initWithTitle:@"ScummVM"];
-
 	NSString *nsString = NULL;
 
 	// Get current encoding
@@ -82,69 +160,28 @@ void replaceApplicationMenuItems() {
 	CFStringEncoding stringEncoding = kCFStringEncodingASCII;
 #endif
 
-	// Add "About ScummVM" menu item
-	nsString = constructNSStringFromCString(_("About ScummVM"), stringEncoding);
-	[appleMenu addItemWithTitle:nsString action:@selector(orderFrontStandardAboutPanel:) keyEquivalent:@""];
-	[nsString release];
-
-	// Add separator
+	NSMenu *appleMenu = addMenu("ScummVM", kCFStringEncodingASCII, @"", @selector(setAppleMenu:));
+	addMenuItem(_("About ScummVM"), stringEncoding, nil, @selector(orderFrontStandardAboutPanel:), @"", appleMenu);
 	[appleMenu addItem:[NSMenuItem separatorItem]];
-
-	// Add "Hide ScummVM" menu item
-	nsString = constructNSStringFromCString(_("Hide ScummVM"), stringEncoding);
-	[appleMenu addItemWithTitle:nsString action:@selector(hide:) keyEquivalent:@"h"];
-	[nsString release];
-
-	// Add "Hide Others" menu item
-	nsString = constructNSStringFromCString(_("Hide Others"), stringEncoding);
-	menuItem = (NSMenuItem *)[appleMenu addItemWithTitle:nsString action:@selector(hideOtherApplications:) keyEquivalent:@"h"];
-	[menuItem setKeyEquivalentModifierMask:(NSEventModifierFlagOption|NSEventModifierFlagCommand)];
-
-	// Add "Show All" menu item
-	nsString = constructNSStringFromCString(_("Show All"), stringEncoding);
-	[appleMenu addItemWithTitle:nsString action:@selector(unhideAllApplications:) keyEquivalent:@""];
-	[nsString release];
-
-	// Add separator
+	addMenuItem(_("Hide ScummVM"), stringEncoding, nil, @selector(hide:), @"h", appleMenu);
+	addMenuItem(_("Hide Others"), stringEncoding, nil, @selector(hideOtherApplications:), @"h", appleMenu, (NSEventModifierFlagOption|NSEventModifierFlagCommand));
+	addMenuItem(_("Show All"), stringEncoding, nil, @selector(unhideAllApplications:), @"", appleMenu);
 	[appleMenu addItem:[NSMenuItem separatorItem]];
+	addMenuItem(_("Quit ScummVM"), stringEncoding, nil, @selector(terminate:), @"q", appleMenu);
 
-	// Add "Quit ScummVM" menu item
-	nsString = constructNSStringFromCString(_("Quit ScummVM"), stringEncoding);
-	[appleMenu addItemWithTitle:nsString action:@selector(terminate:) keyEquivalent:@"q"];
-	[nsString release];
-
-	// Put application menu into the menubar
-	menuItem = [[NSMenuItem alloc] initWithTitle:@"" action:nil keyEquivalent:@""];
-	[menuItem setSubmenu:appleMenu];
-	[[NSApp mainMenu] addItem:menuItem];
-
-	// Tell the application object that this is now the application menu
-	[NSApp setAppleMenu:appleMenu];
-
-
-	// Create new "Window" menu
-	nsString = constructNSStringFromCString(_("Window"), stringEncoding);
-	windowMenu = [[NSMenu alloc] initWithTitle:nsString];
-	[nsString release];
+	NSMenu *windowMenu = addMenu(_("Window"), stringEncoding, @"", @selector(setWindowsMenu:));
+	addMenuItem(_("Minimize"), stringEncoding, nil, @selector(performMiniaturize:), @"m", windowMenu);
 
-	// Add "Minimize" menu item
-	nsString = constructNSStringFromCString(_("Minimize"), stringEncoding);
-	menuItem = [[NSMenuItem alloc] initWithTitle:nsString action:@selector(performMiniaturize:) keyEquivalent:@"m"];
-	[windowMenu addItem:menuItem];
-	[nsString release];
+	NSMenu *helpMenu = addMenu(_("Help"), stringEncoding, @"", @selector(setHelpMenu:));
+	addMenuItem(_("User Manual"), stringEncoding, delegate, @selector(openUserManual), @"", helpMenu);
+	[helpMenu addItem:[NSMenuItem separatorItem]];
+	addMenuItem(_("General Information"), stringEncoding, delegate, @selector(openReadme), @"", helpMenu);
+	addMenuItem(_("What's New in ScummVM"), stringEncoding, delegate, @selector(openNews), @"", helpMenu);
+	[helpMenu addItem:[NSMenuItem separatorItem]];
+	addMenuItem(_("Credits"), stringEncoding, delegate, @selector(openCredits), @"", helpMenu);
+	addMenuItem(_("Licensing Information"), stringEncoding, delegate, @selector(openLicense), @"", helpMenu);
 
-	// Put menu into the menubar
-	nsString = constructNSStringFromCString(_("Window"), stringEncoding);
-	menuItem = [[NSMenuItem alloc] initWithTitle:nsString action:nil keyEquivalent:@""];
-	[menuItem setSubmenu:windowMenu];
-	[[NSApp mainMenu] addItem:menuItem];
-	[nsString release];
-
-	// Tell the application object that this is now the window menu.
-	[NSApp setWindowsMenu:windowMenu];
-
-	// Finally give up our references to the objects
 	[appleMenu release];
 	[windowMenu release];
-	[menuItem release];
+	[helpMenu release];
 }
diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp
index 6203720..d83a8bc 100644
--- a/backends/platform/sdl/macosx/macosx.cpp
+++ b/backends/platform/sdl/macosx/macosx.cpp
@@ -47,6 +47,10 @@ OSystem_MacOSX::OSystem_MacOSX()
 	OSystem_POSIX("Library/Preferences/ScummVM Preferences") {
 }
 
+OSystem_MacOSX::~OSystem_MacOSX() {
+	releaseMenu();
+}
+
 void OSystem_MacOSX::init() {
 	// Use an iconless window on OS X, as we use a nicer external icon there.
 	_window = new SdlIconlessWindow();
diff --git a/backends/platform/sdl/macosx/macosx.h b/backends/platform/sdl/macosx/macosx.h
index 5ef30ba..6f960db 100644
--- a/backends/platform/sdl/macosx/macosx.h
+++ b/backends/platform/sdl/macosx/macosx.h
@@ -28,6 +28,7 @@
 class OSystem_MacOSX : public OSystem_POSIX {
 public:
 	OSystem_MacOSX();
+	~OSystem_MacOSX();
 
 	virtual bool hasFeature(Feature f);
 
diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index fb459da..e6ba6a8 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -767,6 +767,13 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles() const {
 		files.push_back("dists/engine-data/xeen.ccs");
 		files.push_back("dists/pred.dic");
 		files.push_back("icons/scummvm.icns");
+		files.push_back("AUTHORS");
+		files.push_back("COPYING");
+		files.push_back("COPYING.LGPL");
+		files.push_back("COPYING.BSD");
+		files.push_back("COPYING.FREEFONT");
+		files.push_back("NEWS");
+		files.push_back("README");
 	}
 	return files;
 }
diff --git a/ports.mk b/ports.mk
index 5f34031..0091b7f 100644
--- a/ports.mk
+++ b/ports.mk
@@ -111,7 +111,7 @@ ifdef USE_SPARKLE
 	cp -R $(SPARKLEPATH)/Sparkle.framework $(bundle_name)/Contents/Frameworks/
 endif
 	cp $(srcdir)/icons/scummvm.icns $(bundle_name)/Contents/Resources/
-	cp $(DIST_FILES_DOCS) $(bundle_name)/
+	cp $(DIST_FILES_DOCS) $(bundle_name)/Contents/Resources/
 	cp $(DIST_FILES_THEMES) $(bundle_name)/Contents/Resources/
 ifdef DIST_FILES_NETWORKING
 	cp $(DIST_FILES_NETWORKING) $(bundle_name)/Contents/Resources/
@@ -119,7 +119,8 @@ endif
 ifdef DIST_FILES_ENGINEDATA
 	cp $(DIST_FILES_ENGINEDATA) $(bundle_name)/Contents/Resources/
 endif
-	$(srcdir)/devtools/credits.pl --rtf > $(bundle_name)/Contents/Resources/Credits.rtf
+	$(srcdir)/devtools/credits.pl --rtf > $(bundle_name)/Contents/Resources/AUTHORS.rtf
+	rm $(bundle_name)/Contents/Resources/AUTHORS
 	chmod 644 $(bundle_name)/Contents/Resources/*
 	cp scummvm-static $(bundle_name)/Contents/MacOS/scummvm
 	chmod 755 $(bundle_name)/Contents/MacOS/scummvm


Commit: cb28ebcd1f1515aecd1b3bc81fe7b389dfa1ce6c
    https://github.com/scummvm/scummvm/commit/cb28ebcd1f1515aecd1b3bc81fe7b389dfa1ce6c
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-08-28T15:52:23+02:00

Commit Message:
MACOSX: Combine the license files into a single file when packaging

Changed paths:
    ports.mk


diff --git a/ports.mk b/ports.mk
index 0091b7f..d54e5dc 100644
--- a/ports.mk
+++ b/ports.mk
@@ -121,6 +121,10 @@ ifdef DIST_FILES_ENGINEDATA
 endif
 	$(srcdir)/devtools/credits.pl --rtf > $(bundle_name)/Contents/Resources/AUTHORS.rtf
 	rm $(bundle_name)/Contents/Resources/AUTHORS
+	echo "\n---\n" | cat - $(bundle_name)/Contents/Resources/COPYING.LGPL >> $(bundle_name)/Contents/Resources/COPYING
+	echo "\n---\n" | cat - $(bundle_name)/Contents/Resources/COPYING.FREEFONT >> $(bundle_name)/Contents/Resources/COPYING
+	echo "\n---\n" | cat - $(bundle_name)/Contents/Resources/COPYING.BSD >> $(bundle_name)/Contents/Resources/COPYING
+	rm $(bundle_name)/Contents/Resources/COPYING.LGPL $(bundle_name)/Contents/Resources/COPYING.FREEFONT $(bundle_name)/Contents/Resources/COPYING.BSD
 	chmod 644 $(bundle_name)/Contents/Resources/*
 	cp scummvm-static $(bundle_name)/Contents/MacOS/scummvm
 	chmod 755 $(bundle_name)/Contents/MacOS/scummvm


Commit: 8b5f7d247a8d7900e64e3718a13ad890861032e2
    https://github.com/scummvm/scummvm/commit/8b5f7d247a8d7900e64e3718a13ad890861032e2
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-08-28T15:52:23+02:00

Commit Message:
MACOSX: Fix compilation with the 10.9 SDK and below

Changed paths:
    backends/platform/sdl/macosx/appmenu_osx.mm
    backends/platform/sdl/macosx/macosx-compat.h


diff --git a/backends/platform/sdl/macosx/appmenu_osx.mm b/backends/platform/sdl/macosx/appmenu_osx.mm
index c839c20..9d7279f 100644
--- a/backends/platform/sdl/macosx/appmenu_osx.mm
+++ b/backends/platform/sdl/macosx/appmenu_osx.mm
@@ -35,6 +35,10 @@
 #define NSEventModifierFlagOption  NSAlternateKeyMask
 #endif
 
+#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_10
+#define NSEventModifierFlags NSUInteger
+#endif
+
 // Apple added setAppleMenu in 10.5 and removed it in 10.6.
 // But as the method still exists we declare it ourselves here.
 // Yes, this works :)
diff --git a/backends/platform/sdl/macosx/macosx-compat.h b/backends/platform/sdl/macosx/macosx-compat.h
index 9bf1600..4741bec 100644
--- a/backends/platform/sdl/macosx/macosx-compat.h
+++ b/backends/platform/sdl/macosx/macosx-compat.h
@@ -29,6 +29,10 @@
 #define MAC_OS_X_VERSION_10_5    1050
 #endif
 
+#ifndef MAC_OS_X_VERSION_10_10
+#define MAC_OS_X_VERSION_10_10 101000
+#endif
+
 #ifndef MAC_OS_X_VERSION_10_12
 #define MAC_OS_X_VERSION_10_12 101200
 #endif


Commit: d4eca67d2a0b130f05284503349df39c3966af13
    https://github.com/scummvm/scummvm/commit/d4eca67d2a0b130f05284503349df39c3966af13
Author: angstsmurf (ignalina at me.com)
Date: 2018-08-28T15:52:23+02:00

Commit Message:
MACOSX: Keep the original license files when combining

Changed paths:
    backends/platform/sdl/macosx/appmenu_osx.mm
    ports.mk


diff --git a/backends/platform/sdl/macosx/appmenu_osx.mm b/backends/platform/sdl/macosx/appmenu_osx.mm
index 9d7279f..9bcd84e 100644
--- a/backends/platform/sdl/macosx/appmenu_osx.mm
+++ b/backends/platform/sdl/macosx/appmenu_osx.mm
@@ -81,7 +81,7 @@ static void openFromBundle(NSString *file) {
 }
 
 - (void)openLicense {
-	openFromBundle(@"COPYING");
+	openFromBundle(@"COPYING-COMBINED");
 }
 
 - (void)openNews {
diff --git a/ports.mk b/ports.mk
index d54e5dc..358ee4d 100644
--- a/ports.mk
+++ b/ports.mk
@@ -121,10 +121,10 @@ ifdef DIST_FILES_ENGINEDATA
 endif
 	$(srcdir)/devtools/credits.pl --rtf > $(bundle_name)/Contents/Resources/AUTHORS.rtf
 	rm $(bundle_name)/Contents/Resources/AUTHORS
-	echo "\n---\n" | cat - $(bundle_name)/Contents/Resources/COPYING.LGPL >> $(bundle_name)/Contents/Resources/COPYING
-	echo "\n---\n" | cat - $(bundle_name)/Contents/Resources/COPYING.FREEFONT >> $(bundle_name)/Contents/Resources/COPYING
-	echo "\n---\n" | cat - $(bundle_name)/Contents/Resources/COPYING.BSD >> $(bundle_name)/Contents/Resources/COPYING
-	rm $(bundle_name)/Contents/Resources/COPYING.LGPL $(bundle_name)/Contents/Resources/COPYING.FREEFONT $(bundle_name)/Contents/Resources/COPYING.BSD
+	cp $(bundle_name)/Contents/Resources/COPYING $(bundle_name)/Contents/Resources/COPYING-COMBINED
+	echo "\n---\n" | cat - $(bundle_name)/Contents/Resources/COPYING.LGPL >> $(bundle_name)/Contents/Resources/COPYING-COMBINED
+	echo "\n---\n" | cat - $(bundle_name)/Contents/Resources/COPYING.FREEFONT >> $(bundle_name)/Contents/Resources/COPYING-COMBINED
+	echo "\n---\n" | cat - $(bundle_name)/Contents/Resources/COPYING.BSD >> $(bundle_name)/Contents/Resources/COPYING-COMBINED
 	chmod 644 $(bundle_name)/Contents/Resources/*
 	cp scummvm-static $(bundle_name)/Contents/MacOS/scummvm
 	chmod 755 $(bundle_name)/Contents/MacOS/scummvm


Commit: ebedc154377b9229a8cb0389483db19afbb52891
    https://github.com/scummvm/scummvm/commit/ebedc154377b9229a8cb0389483db19afbb52891
Author: angstsmurf (ignalina at me.com)
Date: 2018-08-28T15:52:23+02:00

Commit Message:
MACOSX: Give every license file a menu item

We make a renamed copy of the three license files with non-standard
suffixes, to make them open in TextEdit by default.

Changed paths:
    backends/platform/sdl/macosx/appmenu_osx.mm
    ports.mk


diff --git a/backends/platform/sdl/macosx/appmenu_osx.mm b/backends/platform/sdl/macosx/appmenu_osx.mm
index 9bcd84e..a606bdc 100644
--- a/backends/platform/sdl/macosx/appmenu_osx.mm
+++ b/backends/platform/sdl/macosx/appmenu_osx.mm
@@ -69,7 +69,10 @@ static void openFromBundle(NSString *file) {
 @interface ScummVMMenuHandler : NSObject {
 }
 - (void) openReadme;
-- (void) openLicense;
+- (void) openLicenseGPL;
+- (void) openLicenseLGPL;
+- (void) openLicenseFreefont;
+- (void) openLicenseBSD;
 - (void) openNews;
 - (void) openUserManual;
 - (void) openCredits;
@@ -80,8 +83,20 @@ static void openFromBundle(NSString *file) {
 	openFromBundle(@"README");
 }
 
-- (void)openLicense {
-	openFromBundle(@"COPYING-COMBINED");
+- (void)openLicenseGPL {
+	openFromBundle(@"COPYING");
+}
+
+- (void)openLicenseLGPL {
+	openFromBundle(@"COPYING-LGPL");
+}
+
+- (void)openLicenseFreefont {
+	openFromBundle(@"COPYING-FREEFONT");
+}
+
+- (void)openLicenseBSD {
+	openFromBundle(@"COPYING-BSD");
 }
 
 - (void)openNews {
@@ -183,7 +198,11 @@ void replaceApplicationMenuItems() {
 	addMenuItem(_("What's New in ScummVM"), stringEncoding, delegate, @selector(openNews), @"", helpMenu);
 	[helpMenu addItem:[NSMenuItem separatorItem]];
 	addMenuItem(_("Credits"), stringEncoding, delegate, @selector(openCredits), @"", helpMenu);
-	addMenuItem(_("Licensing Information"), stringEncoding, delegate, @selector(openLicense), @"", helpMenu);
+	addMenuItem(_("GPL License"), stringEncoding, delegate, @selector(openLicenseGPL), @"", helpMenu);
+	addMenuItem(_("LGPL License"), stringEncoding, delegate, @selector(openLicenseLGPL), @"", helpMenu);
+	addMenuItem(_("Freefont License"), stringEncoding, delegate, @selector(openLicenseFreefont), @"", helpMenu);
+	addMenuItem(_("BSD License"), stringEncoding, delegate, @selector(openLicenseBSD), @"", helpMenu);
+
 
 	[appleMenu release];
 	[windowMenu release];
diff --git a/ports.mk b/ports.mk
index 358ee4d..2674aaf 100644
--- a/ports.mk
+++ b/ports.mk
@@ -121,10 +121,9 @@ ifdef DIST_FILES_ENGINEDATA
 endif
 	$(srcdir)/devtools/credits.pl --rtf > $(bundle_name)/Contents/Resources/AUTHORS.rtf
 	rm $(bundle_name)/Contents/Resources/AUTHORS
-	cp $(bundle_name)/Contents/Resources/COPYING $(bundle_name)/Contents/Resources/COPYING-COMBINED
-	echo "\n---\n" | cat - $(bundle_name)/Contents/Resources/COPYING.LGPL >> $(bundle_name)/Contents/Resources/COPYING-COMBINED
-	echo "\n---\n" | cat - $(bundle_name)/Contents/Resources/COPYING.FREEFONT >> $(bundle_name)/Contents/Resources/COPYING-COMBINED
-	echo "\n---\n" | cat - $(bundle_name)/Contents/Resources/COPYING.BSD >> $(bundle_name)/Contents/Resources/COPYING-COMBINED
+	cp $(bundle_name)/Contents/Resources/COPYING.LGPL $(bundle_name)/Contents/Resources/COPYING-LGPL
+	cp $(bundle_name)/Contents/Resources/COPYING.FREEFONT $(bundle_name)/Contents/Resources/COPYING-FREEFONT
+	cp $(bundle_name)/Contents/Resources/COPYING.BSD $(bundle_name)/Contents/Resources/COPYING-BSD
 	chmod 644 $(bundle_name)/Contents/Resources/*
 	cp scummvm-static $(bundle_name)/Contents/MacOS/scummvm
 	chmod 755 $(bundle_name)/Contents/MacOS/scummvm


Commit: 6b5c7e6928b9e432c7ca3102221acea25b80766a
    https://github.com/scummvm/scummvm/commit/6b5c7e6928b9e432c7ca3102221acea25b80766a
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-08-28T15:52:23+02:00

Commit Message:
MACOSX: Update link to documentation

Changed paths:
    backends/platform/sdl/macosx/appmenu_osx.mm


diff --git a/backends/platform/sdl/macosx/appmenu_osx.mm b/backends/platform/sdl/macosx/appmenu_osx.mm
index a606bdc..4e0e11a 100644
--- a/backends/platform/sdl/macosx/appmenu_osx.mm
+++ b/backends/platform/sdl/macosx/appmenu_osx.mm
@@ -104,7 +104,7 @@ static void openFromBundle(NSString *file) {
 }
 
 - (void)openUserManual {
-	[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://www.scummvm.org/manual"]];
+	[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"https://www.scummvm.org/documentation"]];
 }
 
 - (void)openCredits {

More information about the Scummvm-git-logs mailing list