@@ -225,63 +225,52 @@ endif
ifdef OSX
LDFLAGS+=-framework Cocoa
endif
##############################################################################
#
# Compiler configuration
# Executable file extension
ifdef WIN32
EXE=.exe
else
EXE=
# Set output executable names
TTD=openttd$(EXE)
ENDIAN_CHECK=endian_check$(EXE)
STRGEN=strgen/strgen$(EXE)
OSXAPP="OpenTTD.app"
# What revision are we compiling, if we have an idea?
REV_NUMBER := $(shell if test -d .svn; then svnversion . | tr -dc 0-9; fi)
ifdef RELEASE
REV:=$(RELEASE)
REV := $(shell if test -d .svn; then svnversion . | awk '{ print "r"$$0 }'; fi)
tmp_test:=$(shell echo "$(REV)" | grep "M" )
ifdef tmp_test
REV_NUMBER:=1
ifndef REV_NUMBER
REV_NUMBER:=0
# MorphOS needs builddate
BUILDDATE=`date +%d.%m.%y`
# AMD64 needs a little more settings to work
ifeq ($(shell uname -m), x86_64)
endwarnings:=endwarnings
64_bit_warnings:=64_bit_warnings
BASECFLAGS += -m64
# Check if there is a windres override
ifndef WINDRES
WINDRES = windres
# Check if we have a new target
ifdef CC_TARGET
CC = $(CC_TARGET)
# Check if CC_HOST is defined. If not, it is CC
ifndef CC_HOST
@@ -908,49 +897,48 @@ release: all
$(Q)/usr/bin/hdiutil create -ov -format UDZO -srcfolder "OpenTTD $(RELEASE)" openttd-"$(RELEASE)"-osx.dmg
$(Q)rm -fr "OpenTTD $(RELEASE)"
nightly_build: all
$(Q)mkdir -p "OpenTTD_nightly_$(DATE)"
$(Q)mkdir -p "OpenTTD_nightly_$(DATE)"/docs
$(Q)cp -R $(OSXAPP) "OpenTTD_nightly_$(DATE)"/
$(Q)cp docs/OSX_where_did_the_package_go.txt "OpenTTD_nightly_$(DATE)"/Where\ did\ the\ package\ go.txt
$(Q)cp readme.txt "OpenTTD_nightly_$(DATE)"/docs/
$(Q)cp docs/README_if_game_crashed_on_OSX.txt "OpenTTD_nightly_$(DATE)"/docs/readme\ if\ crashed\ on\ OSX.txt
$(Q)cp docs/console.txt "OpenTTD_nightly_$(DATE)"/docs/
$(Q)cp COPYING "OpenTTD_nightly_$(DATE)"/docs/
$(Q)cp revisionlog.txt "OpenTTD_nightly_$(DATE)"/revisionlog.txt
$(Q)cp docs/README_if_game_crashed_on_OSX.txt "OpenTTD_nightly_$(DATE)"/docs/
$(Q)cp os/macosx/*.webloc "OpenTTD_nightly_$(DATE)"/
$(Q)/usr/bin/hdiutil create -ov -format UDZO -srcfolder "OpenTTD_nightly_$(DATE)" openttd-nightly-"$(DATE)".dmg
$(Q)rm -fr "OpenTTD_nightly_$(DATE)"
.PHONY: release nightly_build
rev.c: FORCE
@# setting the revision number in a place, there the binary can read it
@echo 'const char _openttd_revision[] = "$(REV)";' >>rev.c.new
@echo 'const int _revision_number = $(REV_NUMBER);' >>rev.c.new
@# some additions for MorphOS versions tag
@echo '#ifdef __MORPHOS__' >>rev.c.new
@echo 'const char morphos_versions_tag[] = "\\0$$VER: OpenTTD $(REV) ('${BUILDDATE}') © OpenTTD Team [MorphOS, PowerPC]";' >>rev.c.new
@echo '#endif' >>rev.c.new
@# Only update the real rev.c if it actually changed, to prevent
@# useless rebuilds.
@cmp -s rev.c rev.c.new 2>/dev/null || mv rev.c.new rev.c
@rm -f rev.c.new
FORCE:
clean:
@echo '===> Cleaning up'
# endian.h is out-dated and no longer in use, so it can be removed soon
$(Q)rm -rf .deps *~ $(TTD) $(STRGEN) core table/strings.h $(LANGS) $(OBJS) $(OSX_MIDI_PLAYER_FILE) endian.h endian_host.h endian_target.h $(ENDIAN_CHECK)
mrproper: clean
$(Q)rm -rf $(MAKE_CONFIG)
ifndef OSX
ifndef MORPHOS
install:
ifeq ($(INSTALL),)
Status change: