File diff r2575:06bffaec949b → r2576:7fd8df558d87
Makefile
Show inline comments
 
@@ -252,19 +252,12 @@ else
 
REV := $(shell if test -d .svn; then svnversion . | awk '{ print "r"$$0 }'; fi)
 
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
 
@@ -775,13 +768,13 @@ endif
 
ifdef OSX
 
OSX:=OSX
 
OSX_MIDI_PLAYER_FILE:=os/macos/OpenTTDMidi.class
 
endif
 

	
 

	
 
all: endian_target.h endian_host.h $(UPDATECONFIG) $(LANGS) $(TTD) $(OSX) $(endwarnings)
 
all: endian_target.h endian_host.h $(UPDATECONFIG) $(LANGS) $(TTD) $(OSX)
 

	
 
endian_host.h: $(ENDIAN_CHECK)
 
	@echo '===> Testing endianness for host'
 
	$(Q)./$(ENDIAN_CHECK) > $@
 

	
 
endian_target.h: $(ENDIAN_CHECK)
 
@@ -807,18 +800,12 @@ endian_target.h: $(ENDIAN_CHECK)
 
	$(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 lang/*.lng "$(OSXAPP)"/Contents/Lang/
 
	$(Q)cp $(TTD) "$(OSXAPP)"/Contents/MacOS/$(TTD)
 

	
 
$(endwarnings): $(64_bit_warnings)
 

	
 
$(64_bit_warnings):
 
	$(warning 64 bit CPUs will get some 64 bit specific bugs!)
 
	$(warning If you see any bugs, include in your bug report that you use a 64 bit CPU)
 

	
 
$(STRGEN): strgen/strgen.c endian_host.h
 
	@echo '===> Compiling and Linking $@'
 
	$(Q)$(CC_HOST) $(CFLAGS_HOST) $(CDEFS) $< -o $@
 

	
 
table/strings.h: lang/english.txt $(STRGEN)
 
	@echo '===> Generating $@'
 
@@ -979,13 +966,13 @@ install:
 
endif
 

	
 

	
 
love:
 
	@echo "YES! I thought you would never ask. We will have a great time. You can keep me turned on all night"
 

	
 
.PHONY: clean all $(OSX) install $(64_bit_warnings) $(endwarnings) love
 
.PHONY: clean all $(OSX) install love
 

	
 

	
 
### Automatic configuration
 
-include $(CONFIG_WRITER)