Merge pull request #374 from ClusterM/new-win-icon

New icon for Windows version
2021-06-15 21:28:15 -04:00 · 2021-06-15 21:28:15 -04:00 · 40046f6e7e
parent e1f67a0a86 db928c2be5
commit 40046f6e7e
6 changed files with 4 additions and 4 deletions
--- a/fceux1.png
+++ b/fceux1.png
--- a/icons/fceux.ico
+++ b/icons/fceux.ico
--- a/src/config.cpp
+++ b/src/config.cpp
@ -41,6 +41,9 @@ const char *FCEUI_GetAboutString(void)
 		"FCEU TAS - blip & nitsuja\n"
 		"FCEU TAS+ - Luke Gustafson\n"
 		"\n"
+		"Logo/icon:\n"
+		"Terwilf\n"
+		"\n"
 		"FCEUX is dedicated to the fallen heroes\n"
 		"of NES emulation. In Memoriam --\n"
 		"ugetab\n"
--- a/src/drivers/win/res.rc
+++ b/src/drivers/win/res.rc
@ -2355,10 +2355,7 @@ IDI_ICON3               ICON                    "res/taseditor-icon.ico"

 IDI_ICON4               ICON                    "res/taseditor-icon32.ico"

-ICON_1                  ICON                    "res/ICON_1.ico"
-
-ICON_2                  ICON                    "res/ICON_2.ico"
-
+ICON_1                  ICON                    "../../../icons/fceux.ico"

 /////////////////////////////////////////////////////////////////////////////
 //
--- a/src/drivers/win/res/ICON_1.ico
+++ b/src/drivers/win/res/ICON_1.ico
--- a/src/drivers/win/res/ICON_2.ico
+++ b/src/drivers/win/res/ICON_2.ico