summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authortron <tron@openttd.org>2005-12-11 07:36:49 +0000
committertron <tron@openttd.org>2005-12-11 07:36:49 +0000
commit0d1c59883376ec1b909d5770c8712dbb17145e94 (patch)
treebfdfa7df52675707fb0de4c5fc6c5478ba901b0b /Makefile
parent1adc1738f71db328568a830e384185bd47c4a0fe (diff)
downloadopenttd-0d1c59883376ec1b909d5770c8712dbb17145e94.tar.xz
(svn r3287) Turn the winres.o: openttd.rc special case into a normal %.o: %.rc rule
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 5 insertions, 6 deletions
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)'