diff options
| author | rubidium <rubidium@openttd.org> | 2009-12-07 20:22:33 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-12-07 20:22:33 +0000 |
| commit | 151ac000b0c1439125c687e346bfff86d6bd683c (patch) | |
| tree | cd28bc904824347a1e1fe1d5710b0ef55e927d23 /Makefile.src.in | |
| parent | 6c6f2272b003f5eaa3411878ba6d28ed38768a57 (diff) | |
| download | openttd-151ac000b0c1439125c687e346bfff86d6bd683c.tar.xz | |
(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?
Diffstat (limited to 'Makefile.src.in')
| -rw-r--r-- | Makefile.src.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.src.in b/Makefile.src.in index 3b32cc824..21317ebce 100644 --- a/Makefile.src.in +++ b/Makefile.src.in @@ -149,7 +149,7 @@ $(OBJS_MM:%.o=%.d): %.d: $(SRC_DIR)/%.mm $(FILE_DEP) $(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_MM): %.o: $(SRC_DIR)/%.mm $(DEP_MASK) $(FILE_DEP) $(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 $< $@ |