From b432abd0e8a142047e33f9098551c42a4aa3d96c Mon Sep 17 00:00:00 2001
From: Adam Borowski <kilobyte@angband.pl>
Date: Sun, 8 Nov 2009 23:51:12 +0100
Subject: Link the Windows icon into crawl.exe

---
 crawl-ref/source/makefile | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'crawl-ref')

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
 #
-- 
cgit v1.2.3-54-g00ecf