From ec2675c2c532609fb66df237de8f3e971bfb101a Mon Sep 17 00:00:00 2001 From: tron Date: Sun, 11 Dec 2005 07:36:49 +0000 Subject: (svn r3287) Turn the winres.o: openttd.rc special case into a normal %.o: %.rc rule --- Makefile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 2680cbd49..9cb7c4a97 100644 --- a/Makefile +++ b/Makefile @@ -774,8 +774,7 @@ ifdef BEOS endif ifdef WIN32 - # Resource file - OBJS += winres.o + SRCS += ottdres.rc endif ifdef WITH_DIRECTMUSIC @@ -854,10 +853,6 @@ lang/%.lng: lang/%.txt $(STRGEN) lang/english.txt @echo '===> Compiling language $(*F)' $(Q)$(STRGEN) $(STRGEN_FLAGS) $< $(LANG_ERRORS) || rm -f $@ -winres.o: openttd.rc - @echo '===> Compiling resource $<' - $(Q)$(WINDRES) -o $@ $< - ifdef MORPHOS release: all $(Q)rm -fr "/t/openttd-$(RELEASE)-morphos.lha" @@ -1024,6 +1019,10 @@ endif @echo '===> Compiling $<' $(Q)$(CC) $(CFLAGS) $(CDEFS) -c -o $@ $< +%.o: %.rc + @echo '===> Compiling resource $<' + $(Q)$(WINDRES) -o $@ $< + info: @echo 'CFLAGS = $(CFLAGS)' -- cgit v1.2.3-54-g00ecf