Mercurial > hg > openttd
changeset 13897:a12398584dcf draft
(svn r18427) -Fix (r18423): ofcourse that broke the GCC build... not determining 'inclusion' using the relative path from the .rc that has the 'include' but from the include directories... how useful/sensible is that?
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Mon, 07 Dec 2009 20:22:33 +0000 |
| parents | 7dc6099a0e68 |
| children | e05224459a9f |
| files | Makefile.src.in |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.src.in +++ b/Makefile.src.in @@ -149,7 +149,7 @@ $(Q)$(CC_HOST) $(CFLAGS) -MM $< | sed 's@^$(@F:%.d=%.o):@$@ $(@:%.d=%.o):@' > $@ $(OBJS_RC:%.o=%.d): %.d: $(SRC_DIR)/%.rc $(FILE_DEP) - $(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.mm=%.mm)' + $(E) '$(STAGE) DEP $(<:$(SRC_DIR)/%.rc=%.rc)' $(Q)touch $@ else @@ -242,7 +242,7 @@ $(OBJS_RC): %.o: $(SRC_DIR)/%.rc $(FILE_DEP) $(E) '$(STAGE) Compiling resource $(<:$(SRC_DIR)/%.rc=%.rc)' - $(Q)$(WINDRES) -o $@ -I $(MEDIA_DIR) $< + $(Q)$(WINDRES) -o $@ -I `basename $<` $< $(BIN_DIR)/$(TTD): $(TTD) $(Q)cp $< $@