Permalink
Browse files

MACOSX: Keep the original license files when combining

  • Loading branch information...
angstsmurf committed Aug 21, 2018
1 parent 52c35e3 commit 62d29e1ed81c2b0c7b9df0a1dfef6186554a2fcc
Showing with 5 additions and 5 deletions.
  1. +1 −1 backends/platform/sdl/macosx/appmenu_osx.mm
  2. +4 −4 ports.mk
@@ -81,7 +81,7 @@ - (void)openReadme {
}

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

0 comments on commit 62d29e1

Please sign in to comment.