diff --git a/Makefile b/Makefile index 99bc70bc..2f91fa1b 100644 --- a/Makefile +++ b/Makefile @@ -182,7 +182,7 @@ else endif ifneq ($(WINDOWS), 1) - RESOURCES += ICON/4.bmp + RESOURCES += ICON/ICON_MINI.bmp endif OBJECTS = $(addprefix obj/$(FILENAME)/, $(addsuffix .o, $(SOURCES))) diff --git a/res/ICON/4.bmp b/res/ICON/ICON_MINI.bmp similarity index 100% rename from res/ICON/4.bmp rename to res/ICON/ICON_MINI.bmp diff --git a/src/Main.cpp b/src/Main.cpp index 0d91786c..326b9a4c 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -104,9 +104,9 @@ int main(int argc, char *argv[]) memcpy(&gDataPath[strlen(gDataPath)], "/data", 6); //Pixel didn't use a strcat #ifdef WINDOWS - // Set the window icons. See icon.rc. - SDL_SetHint(SDL_HINT_WINDOWS_INTRESOURCE_ICON, "101"); - SDL_SetHint(SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL, "102"); + // Set the window icons. See res/ICON/ICON.rc. + SDL_SetHint(SDL_HINT_WINDOWS_INTRESOURCE_ICON, "101"); + SDL_SetHint(SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL, "102"); #endif //Initialize SDL @@ -293,7 +293,7 @@ int main(int argc, char *argv[]) #ifndef WINDOWS //Load icon - SDL_RWops *fp = FindResource("ICON4"); + SDL_RWops *fp = FindResource("ICON_MINI"); if (fp) { diff --git a/src/Resource.cpp b/src/Resource.cpp index 4db11132..4ab54a9e 100644 --- a/src/Resource.cpp +++ b/src/Resource.cpp @@ -70,7 +70,7 @@ #include "Resource/BITMAP/PIXEL.bmp.h" #endif #ifndef WINDOWS -#include "Resource/ICON/4.bmp.h" +#include "Resource/ICON/ICON_MINI.bmp.h" #endif #include "Resource/CURSOR/CURSOR_IKA.bmp.h" #include "Resource/CURSOR/CURSOR_NORMAL.bmp.h" @@ -395,10 +395,10 @@ const unsigned char* GetResource(const char *name, size_t *size) #ifndef WINDOWS //ICON - if (!strcmp(name, "ICON4")) + if (!strcmp(name, "ICON_MINI")) { - *size = sizeof(r4); - return r4; + *size = sizeof(rICON_MINI); + return rICON_MINI; } #endif diff --git a/src/Resource/ICON/4.bmp.h b/src/Resource/ICON/ICON_MINI.bmp.h similarity index 97% rename from src/Resource/ICON/4.bmp.h rename to src/Resource/ICON/ICON_MINI.bmp.h index e4a42eb0..0fa84f4d 100644 --- a/src/Resource/ICON/4.bmp.h +++ b/src/Resource/ICON/ICON_MINI.bmp.h @@ -1,6 +1,6 @@ #pragma once -const unsigned char r4[0x11A] = { +const unsigned char rICON_MINI[0x11A] = { 0x42, 0x4D, 0x1A, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A, 0x00, 0x00, 0x00, 0x6C, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x23, 0x2E, 0x00, 0x00, 0x23, 0x2E, 0x00, 0x00, 0x08, 0x00,