]> Shamusworld >> Repos - virtualjaguar/commitdiff
Added icons to build system for Windows builds.
authorShamus Hammons <jlhamm@acm.org>
Fri, 3 Oct 2014 17:07:09 +0000 (12:07 -0500)
committerShamus Hammons <jlhamm@acm.org>
Fri, 3 Oct 2014 17:07:09 +0000 (12:07 -0500)
res/vj-icon.ico [new file with mode: 0644]
res/vj.rc
virtualjaguar.pro

diff --git a/res/vj-icon.ico b/res/vj-icon.ico
new file mode 100644 (file)
index 0000000..fa7134f
Binary files /dev/null and b/res/vj-icon.ico differ
index edc3331e6a49597b1592fbb8f6c729c075801877..d19b07a2f786d5e8584d0d815fc14253fcae4863 100644 (file)
--- 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"
index 635f0c059cd2c2628ad3701b17e3908121be1245..5248692529f00ec2e7c256771b6830045d321088 100644 (file)
@@ -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...