Changeset - r2302:369e3d3adaa8
[Not reviewed]
master
0 1 0
tron - 19 years ago 2005-08-06 22:12:45
tron@openttd.org
(svn r2826) Remove another write-only variable, thanks glx
1 file changed with 0 insertions and 12 deletions:
0 comments (0 inline, 0 general)
Makefile
Show inline comments
 
@@ -201,111 +201,100 @@ ifndef STATIC
 
endif
 
endif
 
endif
 

	
 
# Force SDL on UNIX platforms
 
ifndef WITH_SDL
 
ifdef UNIX
 
ifndef DEDICATED
 
$(error You need to have SDL installed in order to run OpenTTD on UNIX. Use DEDICATED if you want to compile a CLI based server)
 
endif
 
endif
 
endif
 

	
 
# remove the dependancy for sdl if DEDICALTED is used
 
# and add -lpthread to LDFLAGS, because SDL normally adds that...
 
ifdef DEDICATED
 
WITH_SDL:=
 
ifndef WIN32
 
ifndef MORPHOS
 
ifndef OSX
 
LDFLAGS+=-lpthread
 
endif
 
endif
 
endif
 
ifdef OSX
 
LDFLAGS+=-framework Cocoa
 
endif
 
endif
 

	
 

	
 
##############################################################################
 
#
 
# Compiler configuration
 
#
 

	
 
# Executable file extension
 
ifdef WIN32
 
EXE=.exe
 
else
 
EXE=
 
endif
 

	
 
# 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)
 
else
 
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
 
endif
 
endif
 

	
 
ifndef REV_NUMBER
 
REV_NUMBER:=0
 
endif
 

	
 
# 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
 
endif
 

	
 
# Check if there is a windres override
 
ifndef WINDRES
 
WINDRES = windres
 
endif
 

	
 
# Check if we have a new target
 
ifdef CC_TARGET
 
CC = $(CC_TARGET)
 
endif
 

	
 
# Check if CC_HOST is defined. If not, it is CC
 
ifndef CC_HOST
 
CC_HOST = $(CC)
 
endif
 
ifndef CFLAGS_HOST
 
CFLAGS_HOST = $(BASECFLAGS)
 
endif
 

	
 

	
 
CC_VERSION = $(shell $(CC) -dumpversion | cut -c 1,3)
 

	
 
# GNU make can only test for (in)equality
 
# this is a workaround to test for >=
 
ifeq ($(shell expr $(CC_VERSION) \>= 29), 1)
 
  CFLAGS += -O -Wall -Wno-multichar -Wsign-compare -Wstrict-prototypes
 
  CFLAGS += -Wwrite-strings -Wpointer-arith
 
endif
 
ifeq ($(shell expr $(CC_VERSION) \>= 30), 1)
 
  CFLAGS += -W -Wno-unused-parameter
 
endif
 
ifeq ($(shell expr $(CC_VERSION) \>= 34), 1)
 
  CFLAGS += -Wdeclaration-after-statement -Wold-style-definition
 
endif
 

	
 
ifdef DEBUG
 
  ifeq ($(shell expr $(DEBUG) \>= 1), 1)
 
@@ -884,97 +873,96 @@ release: all
 
	$(Q)lha a    "t:openttd-$(RELEASE)-morphos.lha" "t:openttd-$(RELEASE)-morphos.info"
 
	$(Q)rm -fr "/t/openttd-$(RELEASE)-morphos"
 
	$(Q)rm -fr "/t/openttd-$(RELEASE)-morphos.info"
 
	@echo "Release archive can be found in RAM:t/ now."
 

	
 
.PHONY: release
 
endif
 

	
 
ifdef OSX
 
release: all
 
	$(Q)mkdir -p "OpenTTD $(RELEASE)"
 
	$(Q)mkdir -p "OpenTTD $(RELEASE)"/docs
 
	$(Q)mkdir -p "OpenTTD $(RELEASE)"/scenario
 
	$(Q)cp -R $(OSXAPP) "OpenTTD $(RELEASE)"/
 
	$(Q)cp docs/OSX_where_did_the_package_go.txt "OpenTTD $(RELEASE)"/Where\ did\ the\ package\ go.txt
 
	$(Q)cp readme.txt "OpenTTD $(RELEASE)"/docs/
 
	$(Q)cp docs/README_if_game_crashed_on_OSX.txt "OpenTTD $(RELEASE)"/docs/readme\ if\ crashed\ on\ OSX.txt
 
	$(Q)cp docs/console.txt "OpenTTD $(RELEASE)"/docs/
 
	$(Q)cp COPYING "OpenTTD $(RELEASE)"/docs/
 
	$(Q)cp changelog.txt "OpenTTD $(RELEASE)"/docs/
 
	$(Q)cp docs/README_if_game_crashed_on_OSX.txt "OpenTTD $(RELEASE)"/docs/
 
	$(Q)cp os/macosx/*.webloc "OpenTTD $(RELEASE)"
 
	$(Q)cp known-bugs.txt "OpenTTD $(RELEASE)"/known-bugs.txt
 
	$(Q)cp scenario/* "OpenTTD $(RELEASE)"/scenario/
 
	$(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
 
endif
 

	
 
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),)
 
	$(error make install is highly experimental at his state and not\
 
	tested very much - use at your own risk - to use run \"make install INSTALL:=1\" - make sure Makefile.config\
 
	is set correctly up - run \"make upgradeconf\")
 
endif
 

	
 
ifeq ($(PREFIX), )
 
	$(error no prefix set - check Makefile.config)
 
endif
 
#	We compare against the non prefixed version here, so we won't install
 
#	if only the prefix has been set
 
ifeq ($(DATA_DIR),)
 
	$(error no data path set - check Makefile.config)
 
endif
 
ifeq ($(BINARY_DIR),)
 
	$(error no binary path set - check Makefile.config)
 
endif
 
# We'll install in $DEST_DIR instead of root if it is set (we don't
 
# care about extra /'s
 
	install -d $(DATA_DIR_INSTALL)/lang \
 
	           $(DATA_DIR_INSTALL)/data \
 
	           $(DATA_DIR_INSTALL)/gm \
 
	           $(BINARY_DIR_INSTALL)
 
ifndef USE_HOMEDIR
 
	mkdir -p $(PERSONAL_DIR)/scenario
0 comments (0 inline, 0 general)