Renamed the SDL icon file

Turns out it has an actual name in the original EXE
This commit is contained in:
Clownacy 2019-02-10 17:03:55 +00:00
parent d4c0cde748
commit 4e61be56d0
5 changed files with 10 additions and 10 deletions

View file

@ -182,7 +182,7 @@ else
endif endif
ifneq ($(WINDOWS), 1) ifneq ($(WINDOWS), 1)
RESOURCES += ICON/4.bmp RESOURCES += ICON/ICON_MINI.bmp
endif endif
OBJECTS = $(addprefix obj/$(FILENAME)/, $(addsuffix .o, $(SOURCES))) OBJECTS = $(addprefix obj/$(FILENAME)/, $(addsuffix .o, $(SOURCES)))

View file

Before

Width:  |  Height:  |  Size: 282 B

After

Width:  |  Height:  |  Size: 282 B

View file

@ -104,9 +104,9 @@ int main(int argc, char *argv[])
memcpy(&gDataPath[strlen(gDataPath)], "/data", 6); //Pixel didn't use a strcat memcpy(&gDataPath[strlen(gDataPath)], "/data", 6); //Pixel didn't use a strcat
#ifdef WINDOWS #ifdef WINDOWS
// Set the window icons. See icon.rc. // Set the window icons. See res/ICON/ICON.rc.
SDL_SetHint(SDL_HINT_WINDOWS_INTRESOURCE_ICON, "101"); SDL_SetHint(SDL_HINT_WINDOWS_INTRESOURCE_ICON, "101");
SDL_SetHint(SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL, "102"); SDL_SetHint(SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL, "102");
#endif #endif
//Initialize SDL //Initialize SDL
@ -293,7 +293,7 @@ int main(int argc, char *argv[])
#ifndef WINDOWS #ifndef WINDOWS
//Load icon //Load icon
SDL_RWops *fp = FindResource("ICON4"); SDL_RWops *fp = FindResource("ICON_MINI");
if (fp) if (fp)
{ {

View file

@ -70,7 +70,7 @@
#include "Resource/BITMAP/PIXEL.bmp.h" #include "Resource/BITMAP/PIXEL.bmp.h"
#endif #endif
#ifndef WINDOWS #ifndef WINDOWS
#include "Resource/ICON/4.bmp.h" #include "Resource/ICON/ICON_MINI.bmp.h"
#endif #endif
#include "Resource/CURSOR/CURSOR_IKA.bmp.h" #include "Resource/CURSOR/CURSOR_IKA.bmp.h"
#include "Resource/CURSOR/CURSOR_NORMAL.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 #ifndef WINDOWS
//ICON //ICON
if (!strcmp(name, "ICON4")) if (!strcmp(name, "ICON_MINI"))
{ {
*size = sizeof(r4); *size = sizeof(rICON_MINI);
return r4; return rICON_MINI;
} }
#endif #endif

View file

@ -1,6 +1,6 @@
#pragma once #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, 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, 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, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x23, 0x2E, 0x00, 0x00, 0x23, 0x2E, 0x00, 0x00, 0x08, 0x00,