summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2006-08-04 22:26:44 +0000
committerbjarni <bjarni@openttd.org>2006-08-04 22:26:44 +0000
commit2ad99348bf078a33e8c74d0cc56316d39de999bc (patch)
tree486894b0a094d5ad9358a33b313fed01d1e052c0
parent59cc2177b48beef575d6338cb36ba05f6f5d1483 (diff)
downloadopenttd-2ad99348bf078a33e8c74d0cc56316d39de999bc.tar.xz
(svn r5759) -Fix: [OSX] fixed issue where the bundle was not build if the data dir contained subdirs (now copies the subdirs as well)
-Fix: [OSX] allow subdirs in scenario when using make release (copies the subdirs as well) -Fix: [OSX] removed an outdated line in make release that prevented the creation of the dmg file
-rw-r--r--os/macosx/Makefile5
1 files changed, 2 insertions, 3 deletions
diff --git a/os/macosx/Makefile b/os/macosx/Makefile
index e782e9b6c..c788e6def 100644
--- a/os/macosx/Makefile
+++ b/os/macosx/Makefile
@@ -123,7 +123,7 @@ BUILD_OSX_BUNDLE: $(TTD) $(OSX_STRIP)
$(Q)echo "APPL????" > "$(OSXAPP)"/Contents/PkgInfo
$(Q)cp os/macosx/openttd.icns "$(OSXAPP)"/Contents/Resources/openttd.icns
$(Q)os/macosx/plistgen.sh "$(OSXAPP)" "$(REV)"
- $(Q)cp data/* "$(OSXAPP)"/Contents/Data/
+ $(Q)cp -R data/* "$(OSXAPP)"/Contents/Data/
$(Q)cp os/macosx/splash.png "$(OSXAPP)"/Contents/Data/
$(Q)cp lang/*.lng "$(OSXAPP)"/Contents/Lang/
$(Q)cp $(TTD) "$(OSXAPP)"/Contents/MacOS/$(TTD)
@@ -141,10 +141,9 @@ release: all
$(Q)cp docs/console.txt "OpenTTD $(REV)/docs/"
$(Q)cp COPYING "OpenTTD $(REV)/docs/"
$(Q)cp changelog.txt "OpenTTD $(REV)/docs/"
- $(Q)cp docs/README_if_game_crashed_on_OSX.txt "OpenTTD $(REV)/docs/"
$(Q)cp os/macosx/*.webloc "OpenTTD $(REV)"
$(Q)cp known-bugs.txt "OpenTTD $(REV)/known-bugs.txt"
- $(Q)cp scenario/* "OpenTTD $(REV)/scenario/"
+ $(Q)cp -R scenario/* "OpenTTD $(REV)/scenario/"
$(Q)hdiutil create -ov -format UDZO -srcfolder "OpenTTD $(REV)" openttd-"$(REV)"-osx"$(JAGUAR_POSTFIX)".dmg
$(Q)rm -fr "OpenTTD $(REV)"