From cf37629d0d713dd3f481b5c4983f4cc4378a1ae3 Mon Sep 17 00:00:00 2001
From: Themaister <maister@archlinux.us>
Date: Thu, 11 Oct 2012 00:09:24 +0200
Subject: [PATCH] Add icon to WGL.

---
 Makefile.win             |   8 +++++++-
 gfx/context/wgl_ctx.c    |   4 ++++
 media/rarch.rc           |   1 +
 media/retroarch-icon.ico | Bin 0 -> 9662 bytes
 retroarch-mingw-build.sh |   8 ++++----
 5 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 media/rarch.rc
 create mode 100644 media/retroarch-icon.ico

diff --git a/Makefile.win b/Makefile.win
index 000242afea..b6b47eef2c 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -21,7 +21,8 @@ OBJ = retroarch.o \
 		audio/null.o \
 		input/null.o \
 		fifo_buffer.o \
-		gfx/null.o
+		gfx/null.o \
+      media/rarch.o
 
 JOBJ := conf/config_file.o \
 	tools/retroarch-joyconfig.o \
@@ -31,6 +32,7 @@ JOBJ := conf/config_file.o \
 
 CC = gcc
 CXX = g++
+WINDRES = windres
 
 HAVE_DINPUT = 1
 HAVE_XAUDIO = 1
@@ -226,6 +228,10 @@ $(TARGET): $(OBJ)
 	$(Q)$(CC) $(CFLAGS) $(DEFINES) -c -o $@ $<
 	@$(if $(Q), $(shell echo echo CC $<),)
 
+%.o: %.rc
+	$(Q)$(WINDRES) -o $@ $<
+	@$(if $(Q), $(shell echo echo WINDRES $<),)
+
 $(JTARGET): $(JOBJ)
 ifeq ($(CXX_BUILD), 1)
 	$(Q)$(CXX) -o $@ $(JOBJ) -lSDL -ldxguid -ldinput8 -lole32 $(LDFLAGS)
diff --git a/gfx/context/wgl_ctx.c b/gfx/context/wgl_ctx.c
index cac79093d7..36e63e4ed9 100644
--- a/gfx/context/wgl_ctx.c
+++ b/gfx/context/wgl_ctx.c
@@ -22,6 +22,8 @@
 #include "../gfx_common.h"
 #include <windows.h>
 
+#define IDI_ICON 1
+
 static HWND g_hwnd;
 static HGLRC g_hrc;
 static HDC g_hdc;
@@ -198,6 +200,8 @@ static bool gfx_ctx_init(void)
    wndclass.hInstance = GetModuleHandle(NULL);
    wndclass.hCursor = LoadCursor(NULL, IDC_ARROW);
    wndclass.lpszClassName = "RetroArch";
+   wndclass.hIcon = LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_ICON));
+   wndclass.hIconSm = (HICON)LoadImage(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_ICON), IMAGE_ICON, 16, 16, 0);
 
    if (!RegisterClassEx(&wndclass))
       return false;
diff --git a/media/rarch.rc b/media/rarch.rc
new file mode 100644
index 0000000000..eff7f81817
--- /dev/null
+++ b/media/rarch.rc
@@ -0,0 +1 @@
+1 ICON DISCARDABLE retroarch-icon.ico
diff --git a/media/retroarch-icon.ico b/media/retroarch-icon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..5c18b9448c0130d027716b18c2d997d519627250
GIT binary patch
literal 9662
zcmeHMNlPt96mH}2G|mHxE>sLc6h-4g1Q#yy3k;&*EKeLBf~%}tm@Ja5;KGFq#fdyb
zR0v3RFAK#41wp}$-~{3n$A#ilU--(~_3E}>t#|Kzl05GRMRj%8Ip^!sU8hf<vaBF0
z$SN$ftRO4XdY^4s$(Ch(YgtyIWm%2Z{rLa_2q1s}J|6&t0eB1GCji|Z8n2ZD_{v{Q
zgb?`ve(_+>$>Uc~b^*iy_#4k-3_z$SJ)a68M2!&Qd8;mX(hndSz&xi>-}Uu1uCA_R
z<FRIg{J-Ws_}YXJK|+Xnn;UK1+}tR;w6EEfFyViCdWyETHq_MA$kyH6jf;y5+sry3
z?_mV+xeWuDwH1?lUtb@ptE*94TZ{7YavUBW+Lt9v`0wrQAt51wb7d<oF2>o}8Rg}J
zcKXB@xO7Rq^f$TNcG+)kZn~*A<)4(4r1X@Ol-T?~E6AUI_m%(d?k++@LzSL_f`SLU
z{qYPQ(@|AbrR?%P*4O#EeuRntZ*On0y}d1;-PYC?W@cuPlaqt=^mL@8q@b&->!U&+
zF+DvkpEY%7Wo4nizhBzqdqeJA6FN-zJ25{$kLc)V<(KyMcIOnYF*Y`)^zxaHj4&*C
z#%tuiva*7hm>A`!&dyHH4*En)PEIPl^#8=f#FH9y{{x5@LL{>R_y)itg}Hvi!orkZ
zJs!ODv19$}AL<nVe*icEz>mZ~0ItcO@n4UhFU?uE=Zyavm@E9nG2@sP%f$bPzsz@t
zot+(QY;4H;U0hs5e0;o{A9SC*<ni3xoaAK3Qw`*<_-AHjz9=tmeW1aOe|~<x*E+rB
z;*Fe!SIa*;I~(=&^)lCD&#|d5<Kp7b*w`p#>+0%IT3Tu>OB))z_J2!Di&VpWk>J>r
ze_mdmlD)gT!_d%>v8=!NJM$loP5E=3>Cp2Z6CE17_P;ZK;Ml}A=M)weY7~H}sVQSw
z%4_h*KQS>8OG`^K<}!b#ji{(7WrxQZ85uI?Wv^d*?mn2~Fjg~PrYvpQG9e)$=;`TE
zx%=_)G1Ah~)OAz-$;ruX|DDeK*|z8J{;~X-_o>^_;L-nI8vohZSvMc({_ywlz`%g!
zV)*QTEw57;92|7x&9Nz%59{~b(9rNeRJZAm_s0p=Xmk!7n__u+*-e)9lBe)m_?MNH
z$(j|{Zf<Taj*gC$TUbBb-`|)2H76%0=<V&5c>w3e#>T4m$MxJ<=-Shp5MtMUCstQi
zWxS;<V`o!S6VA`irEc1|yu4I)iK3z+IhXUp!^8D!Zt;h)mbE%Ia_6_*#=^pajM@Ar
zV;!QSqeIrSIQQV-K(8$lKLUsXkYqO@M3~K=^$^NXmNvO|A|fKB?$p#&jE|4oW+lkQ
z=0!OTiodPf3H!V={yXyr!k!DDP5;NX;h3YK=MVgT>Gcy$r-F7)@qZ5F9~l{`)?I6B
zt1hDdQ&ayto3jqhE}>*bM@N<3;NV~k53{6e1Y`bdYinq3Zk9Q3Wo6}q7!Amp^q>&p
zJ%I0Z-Zq2~EQ|~bA%54{@&B-*qC)CsEakVx5XStu7MLsB%~{g}@EdswAz0IYbZ>@x
z1+IGkclxt%>ekoYGa!GH{gx-;;v)H*fcr%{e;+{Z-0%9?aPP^v7bV9+2+IFp!kuu{
z%S`vX9<}M>{MOWF00Df7xL^DBPo;T(a|vu*TGnYW@aG$?r;|ALrT<Uj&E`EVPkqMi
Q{q_6)13uj0?s<Ry3(T-zuK)l5

literal 0
HcmV?d00001

diff --git a/retroarch-mingw-build.sh b/retroarch-mingw-build.sh
index 107e626771..f10fa46123 100755
--- a/retroarch-mingw-build.sh
+++ b/retroarch-mingw-build.sh
@@ -96,8 +96,8 @@ do_build()
    fi
 
    make -f Makefile.win clean || die "Failed to clean ..."
-   make -f Makefile.win $MAKEARGS CC="$C_COMPILER" CXX="$CXX_COMPILER" -j4 all SLIM=1 || die "Failed to build ..."
-   make -f Makefile.win $MAKEARGS CC="$C_COMPILER" CXX="$CXX_COMPILER" dist_${BUILDTYPE} SLIM=1 || die "Failed to dist ..."
+   make -f Makefile.win $MAKEARGS CC="$C_COMPILER" CXX="$CXX_COMPILER" WINDRES="$WINDRES" -j4 all SLIM=1 || die "Failed to build ..."
+   make -f Makefile.win $MAKEARGS CC="$C_COMPILER" CXX="$CXX_COMPILER" WINDRES="$WINDRES" dist_${BUILDTYPE} SLIM=1 || die "Failed to dist ..."
    if [ -z "`find . | grep "retroarch-win"`" ]; then
       die "Did not find build ..."
    fi
@@ -116,8 +116,8 @@ do_build()
    mv -v "$ZIP_BASE" "../$ZIP_SLIM" || die "Failed to move final build ..."
 
    make -f Makefile.win clean || die "Failed to clean ..."
-   make -f Makefile.win $MAKEARGS CC="$C_COMPILER" CXX="$CXX_COMPILER" -j4 all || die "Failed to build ..."
-   make -f Makefile.win $MAKEARGS CC="$C_COMPILER" CXX="$CXX_COMPILER" dist_${BUILDTYPE} || die "Failed to dist ..."
+   make -f Makefile.win $MAKEARGS CC="$C_COMPILER" CXX="$CXX_COMPILER" WINDRES="$WINDRES" -j4 all || die "Failed to build ..."
+   make -f Makefile.win $MAKEARGS CC="$C_COMPILER" CXX="$CXX_COMPILER" WINDRES="$WINDRES" dist_${BUILDTYPE} || die "Failed to dist ..."
 
    if [ "$BUILD_PHOENIX_GUI" = "yes" ]; then
       zip "$ZIP_BASE" retroarch-phoenix.exe retroarch-phoenix.cfg