# HG changeset patch
# User bjarni
# Date 1102442286 0
# Node ID a6ef8e441cd61778f71dfb5390fc91db2afad04f
# Parent  66cddf7eeb5f5ea6cb9c5efb40f64775fa9d2b17
(svn r972) Makefile: added make release (currently only works on mac)
Mac: sets the STATIC flag if no makefile.config is found

diff -r 66cddf7eeb5f -r a6ef8e441cd6 Makefile
--- a/Makefile	Tue Dec 07 17:27:55 2004 +0000
+++ b/Makefile	Tue Dec 07 17:58:06 2004 +0000
@@ -36,6 +36,7 @@
 # mrproper: remove intermediate files and makefile configuration
 # upgradeconf: add new options to old Makefile.config
 # osx: OS X application
+# release: used by OSX to make a dmg file ready to release
 
 # Options:
 #
@@ -622,7 +623,7 @@
 	$(if $(VERBOSE),@echo '$(C_LINK) $@ $(TTDLDFLAGS) $(ttd_OBJS) $(LIBS)';,@echo 'Compiling and Linking $@';) \
  		$(C_LINK) $@ $(TTDLDFLAGS) $(ttd_OBJS) $(LIBS) $(VERBOSE_FILTER)
 
-$(OSX):
+$(OSX): 
 	@rm -fr $(OSXAPP)
 	@mkdir -p $(OSXAPP)/Contents/MacOS
 	@mkdir -p $(OSXAPP)/Contents/Resources
@@ -638,8 +639,6 @@
 	@cp data/* $(OSXAPP)/Contents/data/
 	@cp lang/*.lng $(OSXAPP)/Contents/lang/
 	@cp $(TTD) $(OSXAPP)/Contents/MacOS/$(TTD)
-	
-	
 
 $(endwarnings): $(64_bit_warnings)
 
@@ -662,6 +661,24 @@
 winres.o: ttd.rc
 	windres -o $@ $<
 
+ifdef OSX
+release: all
+	@mkdir -p OpenTTD\ $(RELEASE)
+	@mkdir -p OpenTTD\ $(RELEASE)/docs
+	@cp -R $(OSXAPP) OpenTTD\ $(RELEASE)/
+	@cp docs/OSX_where_did_the_package_go.txt OpenTTD\ $(RELEASE)/Where\ did\ the\ package\ go.txt
+	@cp readme.txt OpenTTD\ $(RELEASE)/docs/
+	@cp docs/README_if_game_crashed_on_OSX.txt OpenTTD\ $(RELEASE)/docs/readme\ if\ crashed\ on\ OSX.txt
+	@cp docs/console.txt OpenTTD\ $(RELEASE)/docs/
+	@cp COPYING OpenTTD\ $(RELEASE)/docs/
+	@cp changelog.txt OpenTTD\ $(RELEASE)/docs/
+	@cp docs/README_if_game_crashed_on_OSX.txt OpenTTD\ $(RELEASE)/docs/
+	@cp os/macos/*.webloc OpenTTD\ $(RELEASE)/
+	@hdiutil create -ov -format UDZO -srcfolder OpenTTD\ $(RELEASE) openttd-$(RELEASE)-osx.dmg
+	@rm -fr OpenTTD\ $(RELEASE)
+
+.PHONY: release
+endif
 
 rev.c: FORCE
 	@# setting the revision number in a place, there the binary can read it
diff -r 66cddf7eeb5f -r a6ef8e441cd6 makefiledir/Makefile.libdetection
--- a/makefiledir/Makefile.libdetection	Tue Dec 07 17:27:55 2004 +0000
+++ b/makefiledir/Makefile.libdetection	Tue Dec 07 17:58:06 2004 +0000
@@ -23,6 +23,8 @@
 OSX:=1
 # OSX uses the unix setup too
 UNIX:=1
+# OSX generally uses static since so few computers actually have all the libs installed in unix style
+STATIC:=1
 endif
 
 # Automatically recognize if building on MorphOS