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 r1669) Rename all ttd_XXX to just XXX, because we already know who we are (;

Browse Source
This commit is contained in:
tron 2005-01-25 15:46:32 +00:00
parent f564fa528f
commit 489f68a083
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@ -658,7 +658,7 @@ else
C_SOURCES += extmidi.c unix.c C_SOURCES += extmidi.c unix.c
endif endif
ttd_OBJS = $(C_SOURCES:%.c=%.o) $(CXX_SOURCES:%.cpp=%.o) OBJS = $(C_SOURCES:%.c=%.o) $(CXX_SOURCES:%.cpp=%.o)
ifdef BEOS ifdef BEOS
CXX_SOURCES += os/beos/bemidi.cpp CXX_SOURCES += os/beos/bemidi.cpp
@ -667,15 +667,15 @@ endif
ifdef WIN32 ifdef WIN32
# Resource file # Resource file
ttd_OBJS += winres.o OBJS += winres.o
endif endif
ifdef WITH_DIRECTMUSIC ifdef WITH_DIRECTMUSIC
CXX_SOURCES += w32dm2.cpp CXX_SOURCES += w32dm2.cpp
endif endif
ttd_DEPS1 = $(foreach obj,$(ttd_OBJS),.deps/$(obj)) DEPS1 = $(foreach obj,$(OBJS),.deps/$(obj))
ttd_DEPS = $(ttd_DEPS1:%.o=%.P) DEPS = $(DEPS1:%.o=%.P)
LANG_TXT = $(filter-out %.unfinished.txt,$(wildcard lang/*.txt)) LANG_TXT = $(filter-out %.unfinished.txt,$(wildcard lang/*.txt))
LANGS = $(LANG_TXT:%.txt=%.lng) LANGS = $(LANG_TXT:%.txt=%.lng)
@ -715,9 +715,9 @@ $(ENDIAN_CHECK): endian_check.c
@$(CC) $(BASECFLAGS) $(CDEFS) endian_check.c -o $@ @$(CC) $(BASECFLAGS) $(CDEFS) endian_check.c -o $@
$(TTD): table/strings.h $(ttd_OBJS) $(MAKE_CONFIG) $(TTD): table/strings.h $(OBJS) $(MAKE_CONFIG)
@echo '===> Linking $@' @echo '===> Linking $@'
@$(C_LINK) $@ $(TTDLDFLAGS) $(ttd_OBJS) $(LIBS) @$(C_LINK) $@ $(TTDLDFLAGS) $(OBJS) $(LIBS)
$(OSX): $(TTD) $(OSX): $(TTD)
@rm -fr "$(OSXAPP)" @rm -fr "$(OSXAPP)"
@ -848,7 +848,7 @@ FORCE:
clean: clean:
@echo '===> Cleaning up' @echo '===> Cleaning up'
@rm -rf .deps *~ $(TTD) $(STRGEN) core table/strings.h $(LANGS) $(ttd_OBJS) endian.h $(ENDIAN_CHECK) @rm -rf .deps *~ $(TTD) $(STRGEN) core table/strings.h $(LANGS) $(OBJS) endian.h $(ENDIAN_CHECK)
mrproper: clean mrproper: clean
@rm -rf $(MAKE_CONFIG) @rm -rf $(MAKE_CONFIG)
@ -921,7 +921,7 @@ upgradeconf: $(MAKE_CONFIG)
DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :) DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
# Introduce the dependencies # Introduce the dependencies
-include $(ttd_DEPS) -include $(DEPS)
# This compiles the object file as well as silently updating its dependencies # This compiles the object file as well as silently updating its dependencies
# 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