From: Shamus Hammons <jlhamm@acm.org>
Date: Fri, 3 Oct 2014 17:07:09 +0000 (-0500)
Subject: Added icons to build system for Windows builds.
X-Git-Tag: 2.1.1~9
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;ds=sidebyside;h=33d59f0647c4a08446ff0ddc66fdd98fcd56e9a9;p=virtualjaguar

Added icons to build system for Windows builds.
---

diff --git a/res/vj-icon.ico b/res/vj-icon.ico
new file mode 100644
index 0000000..fa7134f
Binary files /dev/null and b/res/vj-icon.ico differ
diff --git a/res/vj.rc b/res/vj.rc
index edc3331..d19b07a 100644
--- a/res/vj.rc
+++ b/res/vj.rc
@@ -6,4 +6,4 @@
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ICON1               ICON    DISCARDABLE     "vj.ico"
+IDI_ICON1               ICON    DISCARDABLE     "vj-icon.ico"
diff --git a/virtualjaguar.pro b/virtualjaguar.pro
index 635f0c0..5248692 100644
--- a/virtualjaguar.pro
+++ b/virtualjaguar.pro
@@ -38,7 +38,9 @@ else { LIBS += `$(CROSS)sdl-config --libs` }
 
 # Icon on Win32, Mac
 #win32 { LIBS += res/vj-ico.o }
-win32 { ICON = res/vj.ico }
+#win32 { ICON = res/vj.ico }
+#win32 { LIBS += res/vj.o; $(CROSS)windres -i res/vj.rc -o vj.o --include-dir=./res }
+win32 { RC_FILE = res/vj.rc }
 macx  { ICON = res/vj-icon.icns }
 
 # C/C++ flags...