equal
deleted
inserted
replaced
772 ifdef BEOS |
772 ifdef BEOS |
773 SRCS += music/bemidi.cpp |
773 SRCS += music/bemidi.cpp |
774 endif |
774 endif |
775 |
775 |
776 ifdef WIN32 |
776 ifdef WIN32 |
777 # Resource file |
777 SRCS += ottdres.rc |
778 OBJS += winres.o |
|
779 endif |
778 endif |
780 |
779 |
781 ifdef WITH_DIRECTMUSIC |
780 ifdef WITH_DIRECTMUSIC |
782 SRCS += music/dmusic.cpp |
781 SRCS += music/dmusic.cpp |
783 endif |
782 endif |
851 $(Q)$(STRGEN) |
850 $(Q)$(STRGEN) |
852 |
851 |
853 lang/%.lng: lang/%.txt $(STRGEN) lang/english.txt |
852 lang/%.lng: lang/%.txt $(STRGEN) lang/english.txt |
854 @echo '===> Compiling language $(*F)' |
853 @echo '===> Compiling language $(*F)' |
855 $(Q)$(STRGEN) $(STRGEN_FLAGS) $< $(LANG_ERRORS) || rm -f $@ |
854 $(Q)$(STRGEN) $(STRGEN_FLAGS) $< $(LANG_ERRORS) || rm -f $@ |
856 |
|
857 winres.o: openttd.rc |
|
858 @echo '===> Compiling resource $<' |
|
859 $(Q)$(WINDRES) -o $@ $< |
|
860 |
855 |
861 ifdef MORPHOS |
856 ifdef MORPHOS |
862 release: all |
857 release: all |
863 $(Q)rm -fr "/t/openttd-$(RELEASE)-morphos.lha" |
858 $(Q)rm -fr "/t/openttd-$(RELEASE)-morphos.lha" |
864 $(Q)mkdir -p "/t/" |
859 $(Q)mkdir -p "/t/" |
1022 |
1017 |
1023 %.o: %.m $(MAKE_CONFIG) |
1018 %.o: %.m $(MAKE_CONFIG) |
1024 @echo '===> Compiling $<' |
1019 @echo '===> Compiling $<' |
1025 $(Q)$(CC) $(CFLAGS) $(CDEFS) -c -o $@ $< |
1020 $(Q)$(CC) $(CFLAGS) $(CDEFS) -c -o $@ $< |
1026 |
1021 |
|
1022 %.o: %.rc |
|
1023 @echo '===> Compiling resource $<' |
|
1024 $(Q)$(WINDRES) -o $@ $< |
|
1025 |
1027 |
1026 |
1028 info: |
1027 info: |
1029 @echo 'CFLAGS = $(CFLAGS)' |
1028 @echo 'CFLAGS = $(CFLAGS)' |
1030 @echo 'LDFLAGS = $(LDFLAGS)' |
1029 @echo 'LDFLAGS = $(LDFLAGS)' |
1031 @echo 'LIBS = $(LIBS)' |
1030 @echo 'LIBS = $(LIBS)' |