cpp/openttd-patchpack/source Changeset - r2576:7fd8df558d87

Changeset - r2576:7fd8df558d87

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

truelight - 18 years ago 2005-10-31 18:29:21
truelight@openttd.org

(svn r3113) -Fix: The Makefile had 64bit code which was obsolete, not to say wrong.
This removes all the 64bit stuff from the Makefile. Everything should
work just fine. Also removed the warning on amd64, 64bit OpenTTD is
stable. Tnx to dst for commenting and testing on this subject.

1 file changed with 2 insertions and 15 deletions:

Makefile

0 comments (0 inline, 0 general)

Makefile

➞

Show inline comments

@@ @@ -255,13 +255,6 @@ 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
 _bit_warnings:=64_bit_warnings
 BASECFLAGS += -m64
 endif
 # Check if there is a windres override
 ifndef WINDRES
 WINDRES = windres
@@ @@ -778,7 +771,7 @@ OSX_MIDI_PLAYER_FILE:=os/macos/OpenTTDMi @@
 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'
@@ @@ -810,12 +803,6 @@ endian_target.h: $(ENDIAN_CHECK) @@
 	$(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 $@
@@ @@ -982,7 +969,7 @@ 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

0 comments (0 inline, 0 general)