cpp/openttd-patchpack/source Changeset - r1168:5cd9dec0a3eb

Changeset - r1168:5cd9dec0a3eb

Parent rev.

Child rev.

[Not reviewed]

master

0 1 0

tron - 20 years ago 2005-01-25 15:59:01
tron@openttd.org

(svn r1670) Garbage collect some variables, because they are only used once and hide magic, like containing -o where a filename must be the next parameter

1 file changed with 3 insertions and 12 deletions:

Makefile

0 comments (0 inline, 0 general)

Makefile

➞

Show inline comments

@@ @@ -680,15 +680,6 @@ DEPS = $(DEPS1:%.o=%.P) @@
 LANG_TXT = $(filter-out %.unfinished.txt,$(wildcard lang/*.txt))
 LANGS = $(LANG_TXT:%.txt=%.lng)
 C_COMPILE = $(CC) $(CFLAGS) $(CDEFS)
 CXX_COMPILE = $(CXX) $(CFLAGS) $(CDEFS)
 C_BUILD = $(C_COMPILE) -c
 CXX_BUILD = $(CXX_COMPILE) -c
 C_LINK = $(CC) $(LDFLAGS) -o
 ##############################################################################
+#
@@ @@ -717,7 +708,7 @@ endian.h: $(ENDIAN_CHECK) @@
 $(TTD): table/strings.h $(OBJS) $(MAKE_CONFIG)
 	@echo '===> Linking $@'
-	@$(C_LINK) $@ $(TTDLDFLAGS) $(OBJS) $(LIBS)
+	@$(CC) $(LDFLAGS) $(TTDLDFLAGS) $(OBJS) $(LIBS) -o $@
 $(OSX): $(TTD)
 	@rm -fr "$(OSXAPP)"
@@ @@ -931,7 +922,7 @@ DEPS_MAGIC := $(shell mkdir .deps > /dev @@
 %.o: %.c $(MAKE_CONFIG) endian.h table/strings.h
 	@echo '===> Compiling $<'
-	@$(C_BUILD) $< -Wp,-MD,.deps/$(*F).pp
+	@$(CC) $(CFLAGS) $(CDEFS) -Wp,-MD,.deps/$(*F).pp -c $< -o $@
 	@-cp .deps/$(*F).pp .deps/$(*F).P; \
 		tr ' ' '\012' < .deps/$(*F).pp \
 		| sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
@@ @@ -941,7 +932,7 @@ DEPS_MAGIC := $(shell mkdir .deps > /dev @@
 # For DirectMusic build and BeOS specific parts
 %.o: %.cpp  $(MAKE_CONFIG) endian.h table/strings.h
 	@echo '===> Compiling $<'
-	@$(CXX_BUILD) $< -o $@
+	@$(CXX) $(CFLAGS) $(CDEFS) -c $< -o $@
 info:

0 comments (0 inline, 0 general)