diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-11-08 23:51:12 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-11-09 13:38:39 +0100 |
| commit | b432abd0e8a142047e33f9098551c42a4aa3d96c (patch) | |
| tree | 58830024b2f5073b5bb83e39008749fb1a5b70fc /crawl-ref/source/makefile | |
| parent | 2633544c49534e75bdc777f9262789c628a965c4 (diff) | |
| download | crawl-ref-b432abd0e8a142047e33f9098551c42a4aa3d96c.tar.gz crawl-ref-b432abd0e8a142047e33f9098551c42a4aa3d96c.zip | |
Link the Windows icon into crawl.exe
Diffstat (limited to 'crawl-ref/source/makefile')
| -rw-r--r-- | crawl-ref/source/makefile | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index 1dfc7db00a..e901b3a354 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -45,6 +45,7 @@ CXX = $(GXX) RM = rm -f COPY = cp STRIP = strip +WINDRES = windres export AR export RANLIB @@ -152,6 +153,10 @@ endif # Works for Mac OS X and Linux. OBJECTS += crash-u.o +ifdef WIN32 +EXTRA_OBJECTS += icon.o +endif + ifdef TILES OBJECTS += libgui.o tile2.o tilereg.o tilepick.o tilesdl.o tilefont.o tiletex.o tilemcache.o tilebuf.o else @@ -259,6 +264,7 @@ GXX := $(CROSSHOST)-g++ AR := $(CROSSHOST)-ar RANLIB := $(CROSSHOST)-ranlib STRIP := $(CROSSHOST)-strip +WINDRES := $(CROSSHOST)-windres endif GCC_GTE_4_0_0 := $(shell util/gcc-gte.pl $(GCC) 4.0.0) @@ -533,6 +539,7 @@ ifndef V QUIET_GEN = @echo ' ' GEN $@; QUIET_COPY = @echo ' ' COPY $@; QUIET_DEPEND = @echo ' ' DEPEND $@; + QUIET_WINDRES = @echo ' ' WINDRES $@; export V endif endif @@ -771,6 +778,9 @@ $(OBJECTS:%.o=%.cc): $(CC_DEP) $(TILEDEFHDRS) $(CONTRIB_LIBS) %.o: %.cc .cflags $(QUIET_CXX)$(CXX) $(ALL_CFLAGS) -c $< -o $@ +icon.o: util/crawl.rc util/crawl.ico + $(QUIET_WINDRES)$(WINDRES) util/crawl.rc icon.o + # # Contribs # |