Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-04 06:00:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r163) Makefile: made compileroutput nicer and added NOVERBOSE to supress all warnings/errors if wanted(default off) (sign_de)

Browse Source
This commit is contained in:
bjarni 2004-09-06 16:45:53 +00:00
parent ed1798de42
commit 9a0f9c37f9
1 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Makefile
View File

@ -61,6 +61,8 @@
# where it normally would print the revision number # where it normally would print the revision number
# MIDI: if set, it will use it as custom path to midi player. # MIDI: if set, it will use it as custom path to midi player.
# If unset, it will use the hardcoded path in the c code # If unset, it will use the hardcoded path in the c code
# NOVERBOSE: supress all warnings and errors during compilation.
# It looks nicer, but you will not know what went wrong. Use it on released (stable) sources only
# #
# DATA_DIR_PREFIX: This sets the dir OpenTTD looks for the needed files. # DATA_DIR_PREFIX: This sets the dir OpenTTD looks for the needed files.
# MUST END WITH / if defined # MUST END WITH / if defined
@ -121,8 +123,17 @@ ifndef CONFIG_INCLUDED
-include $(LIB_DETECTION) -include $(LIB_DETECTION)
endif endif
# Verbose filter
ifdef NOVERBOSE
VERBOSE_FILTER = >/dev/null 2>&1
else
VERBOSE_FILTER =
endif
ifdef DISPLAY_WARNINGS ifdef DISPLAY_WARNINGS
WARNING_DISPLAY:=-fstrict-aliasing WARNING_DISPLAY:=-fstrict-aliasing
VERBOSE_FILTER =
else else
WARNING_DISPLAY:=-fno-strict-aliasing WARNING_DISPLAY:=-fno-strict-aliasing
endif endif
@ -153,7 +164,6 @@ endif
# #
# Compiler configuration # Compiler configuration
# #
CC=gcc CC=gcc
CXX=g++ CXX=g++
@ -475,6 +485,7 @@ CXX_BUILD = $(CXX_COMPILE) -c
C_LINK = $(CC) $(LDFLAGS) -o C_LINK = $(CC) $(LDFLAGS) -o
############################################################################## ##############################################################################
# #
# Targets # Targets
@ -500,7 +511,8 @@ $(ENDIAN_CHECK): endian_check.c
$(TTD): table/strings.h $(ttd_OBJS) $(LANGS) $(MAKE_CONFIG) $(TTD): table/strings.h $(ttd_OBJS) $(LANGS) $(MAKE_CONFIG)
$(C_LINK) $@ $(TTDLDFLAGS) $(ttd_OBJS) $(LIBS) @echo 'Compiling and Linking $@'; \
$(C_LINK) $@ $(TTDLDFLAGS) $(ttd_OBJS) $(LIBS) $(VERBOSE_FILTER)
$(OSX): $(OSX):
@mkdir -p $(OSXAPP)/Contents/MacOS @mkdir -p $(OSXAPP)/Contents/MacOS
@ -512,7 +524,7 @@ $(OSX):
@ls os/macos | grep -q "\.class" || \ @ls os/macos | grep -q "\.class" || \
javac os/macos/OpenTTDMidi.java javac os/macos/OpenTTDMidi.java
@cp os/macos/OpenTTDMidi.class $(OSXAPP)/contents/macos @cp os/macos/OpenTTDMidi.class $(OSXAPP)/contents/macos
@cp $(TTD) $(OSXAPP)/Contents/MacOS/openttd @cp $(TTD) $(OSXAPP)/Contents/MacOS/$(TTD)
$(endwarnings): $(64_bit_warnings) $(endwarnings): $(64_bit_warnings)
@ -521,15 +533,18 @@ $(64_bit_warnings):
$(warning If you see any bugs, include in your bug report that you use a 64 bit CPU) $(warning If you see any bugs, include in your bug report that you use a 64 bit CPU)
$(STRGEN): strgen/strgen.c rev.o $(STRGEN): strgen/strgen.c rev.o
$(CC) $(BASECFLAGS) $(CDEFS) -o $@ $^ @echo 'Compiling and Linking $@'; \
$(CC) $(BASECFLAGS) $(CDEFS) -o $@ $^ $(VERBOSE_FILTER)
lang/english.lng: lang/english.txt $(STRGEN) lang/english.lng: lang/english.txt $(STRGEN)
@echo 'Generating $@'; \
$(STRGEN) $(STRGEN)
table/strings.h: lang/english.lng table/strings.h: lang/english.lng
lang/%.lng: lang/%.txt $(STRGEN) lang/%.lng: lang/%.txt $(STRGEN)
$(STRGEN) $(STRGEN_FLAGS) $< @echo 'Generating $@'; \
$(STRGEN) $(STRGEN_FLAGS) $< $(VERBOSE_FILTER)
winres.o: ttd.rc winres.o: ttd.rc
windres -o $@ $< windres -o $@ $<
@ -554,7 +569,8 @@ FORCE:
# ttd$(EXE) is removed just to make sure people execute the right binary (openttd$(EXE)) # ttd$(EXE) is removed just to make sure people execute the right binary (openttd$(EXE))
# remove this for next release! # remove this for next release!
clean: clean:
rm -rf .deps *~ $(TTD) $(STRGEN) core table/strings.h $(LANGS) $(ttd_OBJS) endian.h $(ENDIAN_CHECK) ttd$(EXE) @echo 'Cleaning up...'; \
rm -rf .deps *~ $(TTD) $(STRGEN) core table/strings.h $(LANGS) $(ttd_OBJS) ttd$(EXE)
mrproper: clean mrproper: clean
rm -rf $(MAKE_CONFIG) rm -rf $(MAKE_CONFIG)
@ -612,9 +628,13 @@ DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
# list at the same time. It is not an issue that they aren't around during the # list at the same time. It is not an issue that they aren't around during the
# first compilation round as we just build everything at that time anyway, # first compilation round as we just build everything at that time anyway,
# therefore we do not need to watch deps. # therefore we do not need to watch deps.
#@echo '$(C_BUILD) $<'; \
%.o: %.c $(MAKE_CONFIG) %.o: %.c $(MAKE_CONFIG)
@echo '$(C_BUILD) $<'; \ @echo 'Compiling $(*F).o'; \
$(C_BUILD) $< -Wp,-MD,.deps/$(*F).pp $(C_BUILD) $< -Wp,-MD,.deps/$(*F).pp $(VERBOSE_FILTER)
@-cp .deps/$(*F).pp .deps/$(*F).P; \ @-cp .deps/$(*F).pp .deps/$(*F).P; \
tr ' ' '\012' < .deps/$(*F).pp \ tr ' ' '\012' < .deps/$(*F).pp \
| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \