mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r3287) Turn the winres.o: openttd.rc special case into a normal %.o: %.rc rule
This commit is contained in:
parent
42d8e8410b
commit
ec2675c2c5
11
Makefile
11
Makefile
|
@ -774,8 +774,7 @@ ifdef BEOS
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef WIN32
|
ifdef WIN32
|
||||||
# Resource file
|
SRCS += ottdres.rc
|
||||||
OBJS += winres.o
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifdef WITH_DIRECTMUSIC
|
ifdef WITH_DIRECTMUSIC
|
||||||
|
@ -854,10 +853,6 @@ lang/%.lng: lang/%.txt $(STRGEN) lang/english.txt
|
||||||
@echo '===> Compiling language $(*F)'
|
@echo '===> Compiling language $(*F)'
|
||||||
$(Q)$(STRGEN) $(STRGEN_FLAGS) $< $(LANG_ERRORS) || rm -f $@
|
$(Q)$(STRGEN) $(STRGEN_FLAGS) $< $(LANG_ERRORS) || rm -f $@
|
||||||
|
|
||||||
winres.o: openttd.rc
|
|
||||||
@echo '===> Compiling resource $<'
|
|
||||||
$(Q)$(WINDRES) -o $@ $<
|
|
||||||
|
|
||||||
ifdef MORPHOS
|
ifdef MORPHOS
|
||||||
release: all
|
release: all
|
||||||
$(Q)rm -fr "/t/openttd-$(RELEASE)-morphos.lha"
|
$(Q)rm -fr "/t/openttd-$(RELEASE)-morphos.lha"
|
||||||
|
@ -1024,6 +1019,10 @@ endif
|
||||||
@echo '===> Compiling $<'
|
@echo '===> Compiling $<'
|
||||||
$(Q)$(CC) $(CFLAGS) $(CDEFS) -c -o $@ $<
|
$(Q)$(CC) $(CFLAGS) $(CDEFS) -c -o $@ $<
|
||||||
|
|
||||||
|
%.o: %.rc
|
||||||
|
@echo '===> Compiling resource $<'
|
||||||
|
$(Q)$(WINDRES) -o $@ $<
|
||||||
|
|
||||||
|
|
||||||
info:
|
info:
|
||||||
@echo 'CFLAGS = $(CFLAGS)'
|
@echo 'CFLAGS = $(CFLAGS)'
|
||||||
|
|
|
@ -327,7 +327,7 @@ SOURCE=.\openttd.c
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=.\openttd.rc
|
SOURCE=.\ottdres.rc
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
|
|
@ -291,7 +291,7 @@
|
||||||
RelativePath=".\openttd.c">
|
RelativePath=".\openttd.c">
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\openttd.rc">
|
RelativePath=".\ottdres.rc">
|
||||||
</File>
|
</File>
|
||||||
<File
|
<File
|
||||||
RelativePath=".\pathfind.c">
|
RelativePath=".\pathfind.c">
|
||||||
|
|
Loading…
Reference in New Issue