diff options
| author | Matthew Hoops | 2011-04-13 16:04:29 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-04-13 16:04:29 -0400 |
| commit | 6d153f311c65fe414e31e99f8a9a6503c49a01a5 (patch) | |
| tree | 9173f9964c0fec4215514e622f705810730d0ce9 /ports.mk | |
| parent | 47c2a9adbe8d9e6640a819386f0f34e929937672 (diff) | |
| parent | 66b43f2312578f35e0718d0699de207a7bf77f1a (diff) | |
| download | scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.tar.gz scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.tar.bz2 scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.zip | |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'ports.mk')
| -rw-r--r-- | ports.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -47,7 +47,7 @@ bundle: scummvm-static ifdef DIST_FILES_ENGINEDATA cp $(DIST_FILES_ENGINEDATA) $(bundle_name)/Contents/Resources/ endif - $(srcdir)/tools/credits.pl --rtf > $(bundle_name)/Contents/Resources/Credits.rtf + $(srcdir)/devtools/credits.pl --rtf > $(bundle_name)/Contents/Resources/Credits.rtf chmod 644 $(bundle_name)/Contents/Resources/* cp scummvm-static $(bundle_name)/Contents/MacOS/scummvm chmod 755 $(bundle_name)/Contents/MacOS/scummvm @@ -142,7 +142,7 @@ iphone: $(OBJS) # TODO: Replace AUTHORS by Credits.rtf osxsnap: bundle mkdir ScummVM-snapshot - $(srcdir)/tools/credits.pl --text > $(srcdir)/AUTHORS + $(srcdir)/devtools/credits.pl --text > $(srcdir)/AUTHORS cp $(srcdir)/AUTHORS ./ScummVM-snapshot/Authors cp $(srcdir)/COPYING ./ScummVM-snapshot/License\ \(GPL\) cp $(srcdir)/COPYING.LGPL ./ScummVM-snapshot/License\ \(LGPL\) |