dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r1180) Makefile: fixed dependancies so the flag -j can be used. It makes the compilation process into more than one job which makes it able to benefit from multiple CPUs. Using -j without setting a limit of jobs (like -j2) is not a great idea (thanks to ln-- for reporting the need for this one)

Browse Source
This commit is contained in:
bjarni
2004-12-19 23:27:20 +00:00
parent 110b410af4
commit 123acd5a73
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -710,7 +710,7 @@ $(TTD): table/strings.h $(ttd_OBJS) $(MAKE_CONFIG)
$(if $(VERBOSE),@echo '$(C_LINK) $@ $(TTDLDFLAGS) $(ttd_OBJS) $(LIBS)';,@echo 'Compiling and Linking $@';) \ $(if $(VERBOSE),@echo '$(C_LINK) $@ $(TTDLDFLAGS) $(ttd_OBJS) $(LIBS)';,@echo 'Compiling and Linking $@';) \
$(C_LINK) $@ $(TTDLDFLAGS) $(ttd_OBJS) $(LIBS) $(VERBOSE_FILTER) $(C_LINK) $@ $(TTDLDFLAGS) $(ttd_OBJS) $(LIBS) $(VERBOSE_FILTER)
$(OSX): $(OSX): $(TTD)
@rm -fr "$(OSXAPP)" @rm -fr "$(OSXAPP)"
@mkdir -p "$(OSXAPP)"/Contents/MacOS @mkdir -p "$(OSXAPP)"/Contents/MacOS
@mkdir -p "$(OSXAPP)"/Contents/Resources @mkdir -p "$(OSXAPP)"/Contents/Resources
@@ -733,7 +733,7 @@ $(64_bit_warnings):
$(warning 64 bit CPUs will get some 64 bit specific bugs!) $(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) $(warning If you see any bugs, include in your bug report that you use a 64 bit CPU)
$(STRGEN): strgen/strgen.c $(STRGEN): strgen/strgen.c endian.h
@echo 'Compiling and Linking $@'; \ @echo 'Compiling and Linking $@'; \
$(CC) $(BASECFLAGS) $(CDEFS) -o $@ $^ $(VERBOSE_FILTER) $(CC) $(BASECFLAGS) $(CDEFS) -o $@ $^ $(VERBOSE_FILTER)
@@ -849,7 +849,7 @@ endif
love: love:
@echo "YES! I thought you would never ask. We will have a great time. You can keep me turned on all night" @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 $(64_bit_warnings) $(endwarnings) love endian.h
### Automatic configuration ### Automatic configuration
@@ -881,7 +881,7 @@ DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
#@echo '$(C_BUILD) $<'; \ #@echo '$(C_BUILD) $<'; \
%.o: %.c $(MAKE_CONFIG) %.o: %.c $(MAKE_CONFIG) endian.h table/strings.h
$(if $(VERBOSE),@echo '$(C_BUILD) $<',@echo 'Compiling $(*F).o'); \ $(if $(VERBOSE),@echo '$(C_BUILD) $<',@echo 'Compiling $(*F).o'); \
$(C_BUILD) $< -Wp,-MD,.deps/$(*F).pp $(VERBOSE_FILTER) $(C_BUILD) $< -Wp,-MD,.deps/$(*F).pp $(VERBOSE_FILTER)
@-cp .deps/$(*F).pp .deps/$(*F).P; \ @-cp .deps/$(*F).pp .deps/$(*F).P; \
@@ -891,5 +891,5 @@ DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
rm .deps/$(*F).pp rm .deps/$(*F).pp
# For DirectMusic build and BeOS specific parts # For DirectMusic build and BeOS specific parts
%.o: %.cpp $(MAKE_CONFIG) %.o: %.cpp $(MAKE_CONFIG) endian.h table/strings.h
$(CXX_BUILD) $< -o $@ $(CXX_BUILD) $< -o $@