diff options
| author | tron <tron@openttd.org> | 2005-12-11 07:36:49 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-12-11 07:36:49 +0000 |
| commit | 0d1c59883376ec1b909d5770c8712dbb17145e94 (patch) | |
| tree | bfdfa7df52675707fb0de4c5fc6c5478ba901b0b | |
| parent | 1adc1738f71db328568a830e384185bd47c4a0fe (diff) | |
| download | openttd-0d1c59883376ec1b909d5770c8712dbb17145e94.tar.xz | |
(svn r3287) Turn the winres.o: openttd.rc special case into a normal %.o: %.rc rule
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | openttd.dsp | 2 | ||||
| -rw-r--r-- | openttd.vcproj | 2 | ||||
| -rw-r--r-- | ottdres.rc (renamed from openttd.rc) | 0 |
4 files changed, 7 insertions, 8 deletions
@@ -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)' diff --git a/openttd.dsp b/openttd.dsp index 152fd46f9..1323ed45a 100644 --- a/openttd.dsp +++ b/openttd.dsp @@ -327,7 +327,7 @@ SOURCE=.\openttd.c # End Source File # Begin Source File -SOURCE=.\openttd.rc +SOURCE=.\ottdres.rc # End Source File # Begin Source File diff --git a/openttd.vcproj b/openttd.vcproj index 18aabf929..a6afa2ffa 100644 --- a/openttd.vcproj +++ b/openttd.vcproj @@ -291,7 +291,7 @@ RelativePath=".\openttd.c"> </File> <File - RelativePath=".\openttd.rc"> + RelativePath=".\ottdres.rc"> </File> <File RelativePath=".\pathfind.c"> diff --git a/openttd.rc b/ottdres.rc index 433b6b40f..433b6b40f 100644 --- a/openttd.rc +++ b/ottdres.rc |