shithub: cstory

Info  •  Files  •  Log  •  Branches

Get window icon working in GLFW

Amazingly, this actually works in SDL2, so now they both use this
method.

--- a/assets/resources/CSE2.rc

+++ b/assets/resources/CSE2.rc

@@ -66,8 +66,7 @@

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-101                       ICON                    "ICON/0.ico"

-102                       ICON                    "ICON/ICON_MINI.ico"

+GLFW_ICON                 ICON                    "ICON/GLFW_ICON.ico"

 #endif    // Japanese resources

 /////////////////////////////////////////////////////////////////////////////

binary files a/assets/resources/ICON/0.ico /dev/null differ

binary files /dev/null b/assets/resources/ICON/GLFW_ICON.ico differ

binary files a/assets/resources/ICON/ICON_MINI.ico /dev/null differ

--- a/src/Backends/Platform/SDL2.cpp

+++ b/src/Backends/Platform/SDL2.cpp

@@ -27,11 +27,6 @@

 {

 	SDL_Init(SDL_INIT_EVENTS);

-#ifdef _WIN32	// On Windows, we use native icons instead (so we can give the taskbar and window separate icons, like the original EXE does)

-	SDL_SetHint(SDL_HINT_WINDOWS_INTRESOURCE_ICON, "101");

-	SDL_SetHint(SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL, "102");

-#endif

-

 	SDL_InitSubSystem(SDL_INIT_VIDEO);

 	puts("Available SDL2 video drivers:");

--- a/src/Main.cpp

+++ b/src/Main.cpp

@@ -273,7 +273,6 @@

 #endif

 	// Set up window icon

-	// TODO - GLFW_ICON

 #ifndef _WIN32	// On Windows, we use native icons instead (so we can give the taskbar and window separate icons, like the original EXE does)

 	size_t window_icon_resource_size;

 	const unsigned char *window_icon_resource_data = FindResource("ICON_MINI", "ICON", &window_icon_resource_size);