diff options
| author | angstsmurf | 2018-08-21 14:57:55 +0200 |
|---|---|---|
| committer | Eugene Sandulenko | 2018-08-28 15:52:23 +0200 |
| commit | d4eca67d2a0b130f05284503349df39c3966af13 (patch) | |
| tree | 14406011e21311d53da870f5ee4ecf4fd408b27b | |
| parent | 8b5f7d247a8d7900e64e3718a13ad890861032e2 (diff) | |
| download | scummvm-rg350-d4eca67d2a0b130f05284503349df39c3966af13.tar.gz scummvm-rg350-d4eca67d2a0b130f05284503349df39c3966af13.tar.bz2 scummvm-rg350-d4eca67d2a0b130f05284503349df39c3966af13.zip | |
MACOSX: Keep the original license files when combining
| -rw-r--r-- | backends/platform/sdl/macosx/appmenu_osx.mm | 2 | ||||
| -rw-r--r-- | ports.mk | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/backends/platform/sdl/macosx/appmenu_osx.mm b/backends/platform/sdl/macosx/appmenu_osx.mm index 9d7279f95c..9bcd84e3f0 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 { @@ -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 |