summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/makefile_tiles.mgw
diff options
context:
space:
mode:
authorennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-12 19:00:48 +0000
committerennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2008-01-12 19:00:48 +0000
commit9df5c52a5634a182e2ab10a260dfe4796e53bdcf (patch)
treec590401e1d5e6cfd10f2d6b56205120bb8bd1d46 /crawl-ref/source/makefile_tiles.mgw
parent5b97fd711a55c1722ca5ffc1723c5222fd8d7a3c (diff)
downloadcrawl-ref-9df5c52a5634a182e2ab10a260dfe4796e53bdcf.tar.gz
crawl-ref-9df5c52a5634a182e2ab10a260dfe4796e53bdcf.zip
Adding Win32 icon.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3261 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/makefile_tiles.mgw')
-rw-r--r--crawl-ref/source/makefile_tiles.mgw14
1 files changed, 12 insertions, 2 deletions
diff --git a/crawl-ref/source/makefile_tiles.mgw b/crawl-ref/source/makefile_tiles.mgw
index d016543627..2141ff66cb 100644
--- a/crawl-ref/source/makefile_tiles.mgw
+++ b/crawl-ref/source/makefile_tiles.mgw
@@ -42,7 +42,6 @@ INCLUDES := -Iutil -I. -I$(LUASRC) -I$(SQLSRC)
CFWARN := -Wall -Wwrite-strings \
-Werror \
-pedantic
-# -Wshadow
CFOTHERS := -fsigned-char \
-fstrict-aliasing \
@@ -88,9 +87,13 @@ ifeq ($(YACC),)
DOYACC :=
endif
+RESOURCE := $(UTIL)crawl.rc
+RESOURCEOBJ := crawlres.o
+WINDRES := windres.exe
+
# Do the levcomp stuff first because that's the most likely to fail.
OBJECTS := levcomp.tab.o levcomp.lex.o \
- $(OBJECTS)
+ $(OBJECTS) $(RESOURCEOBJ)
OBJECTS := $(foreach file,$(OBJECTS),$(OPATH)/$(file))
@@ -241,3 +244,10 @@ $(LUASRC)\$(LUALIBA):
$(FSQLLIBA):
@echo Building SQLite
cd $(SQLSRC) && $(MAKE)
+
+##########################################################################
+# Resources
+#
+
+$(OPATH)/$(RESOURCEOBJ): $(RESOURCE)
+ $(WINDRES) $< $@