From 1f6d0282ee28cb9ae69d84aa3aa72312fb1f073e Mon Sep 17 00:00:00 2001
From: Yamagi Burmeister <yamagi@yamagi.org>
Date: Mon, 11 Jun 2012 11:13:10 +0200
Subject: [PATCH] Add an application icon for Windows

The Windows icon is embedded into the executable. It's the same as under
Unix platforms, just converted into .ico.
---
 Makefile                        |  24 ++++++++++++++++++++----
 stuff/icon/Quake2.ico           | Bin 0 -> 9662 bytes
 {icon => stuff/icon}/Quake2.png | Bin
 stuff/icon/icon.rc              |   1 +
 4 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 stuff/icon/Quake2.ico
 rename {icon => stuff/icon}/Quake2.png (100%)
 create mode 100644 stuff/icon/icon.rc

diff --git a/Makefile b/Makefile
index e293477e..baf9ce41 100644
--- a/Makefile
+++ b/Makefile
@@ -185,11 +185,27 @@ endif
 
 # ----------
 
+# Phony targets
+.PHONY : all client game icon refresher server
+
+# ----------
+
 # Builds everything
 all: client server refresher game
 
 # ----------
 
+# Special target to compile
+# the icon on Windows
+ifeq ($(OSTYPE), Windows)
+icon:
+	@echo "===> WR build/icon/icon.res"
+	${Q}stuff/misc/mkdir -p build/icon
+	${Q}windres stuff\icon\icon.rc -O COFF -o build\icon\icon.res
+endif
+
+# ----------
+
 # Cleanup
 ifeq ($(OSTYPE), Windows)
 clean:
@@ -641,9 +657,9 @@ GAME_DEPS= $(GAME_OBJS:.o=.d)
 
 # release/quake2
 ifeq ($(OSTYPE), Windows)
-release/quake2.exe : $(CLIENT_OBJS)
+release/quake2.exe : $(CLIENT_OBJS) icon
 	@echo "===> LD $@"
-	${Q}$(CC) $(CLIENT_OBJS) $(LDFLAGS) $(SDLLDFLAGS) -o $@
+	${Q}$(CC) build/icon/icon.res $(CLIENT_OBJS) $(LDFLAGS) $(SDLLDFLAGS) -o $@
 else
 release/quake2 : $(CLIENT_OBJS)
 	@echo "===> LD $@"
@@ -652,9 +668,9 @@ endif
  
 # release/q2ded
 ifeq ($(OSTYPE), Windows)
-release/q2ded.exe : $(SERVER_OBJS)
+release/q2ded.exe : $(SERVER_OBJS) icon
 	@echo "===> LD $@.exe"
-	${Q}$(CC) $(SERVER_OBJS) $(LDFLAGS) -o $@
+	${Q}$(CC) build/icon/icon.res $(SERVER_OBJS) $(LDFLAGS) -o $@
 else
 release/q2ded : $(SERVER_OBJS)
 	@echo "===> LD $@"
diff --git a/stuff/icon/Quake2.ico b/stuff/icon/Quake2.ico
new file mode 100644
index 0000000000000000000000000000000000000000..9879706cdcd314aecf453d6da66b8efc38783fd2
GIT binary patch
literal 9662
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

literal 0
HcmV?d00001

diff --git a/icon/Quake2.png b/stuff/icon/Quake2.png
similarity index 100%
rename from icon/Quake2.png
rename to stuff/icon/Quake2.png
diff --git a/stuff/icon/icon.rc b/stuff/icon/icon.rc
new file mode 100644
index 00000000..fca3d2e9
--- /dev/null
+++ b/stuff/icon/icon.rc
@@ -0,0 +1 @@
+id ICON "stuff/icon/Quake2.ico"