mirror/raylib
1
0
Fork 0
mirror of https://github.com/raysan5/raylib.git synced 2025-12-06 06:13:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't undefine the versions of LoadImage that don't conflict with raylib so that the Win32 platform can use them. (#5299)

Browse Source
This commit is contained in:
Jeffery Myers 2025-10-25 00:49:31 -07:00 committed by GitHub
parent 39242dba23
commit 4bb8c89084
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/platforms/rcore_desktop_win32.c
View File

@ -49,8 +49,6 @@
#define CloseWindow CloseWindowWin32 #define CloseWindow CloseWindowWin32
#define Rectangle RectangleWin32 #define Rectangle RectangleWin32
#define ShowCursor ShowCursorWin32 #define ShowCursor ShowCursorWin32
#define LoadImageA LoadImageAWin32
#define LoadImageW LoadImageWin32
#define DrawTextA DrawTextAWin32 #define DrawTextA DrawTextAWin32
#define DrawTextW DrawTextWin32 #define DrawTextW DrawTextWin32
#define DrawTextExA DrawTextExAWin32 #define DrawTextExA DrawTextExAWin32
@ -63,8 +61,6 @@
#undef Rectangle // raylib symbol collision #undef Rectangle // raylib symbol collision
#undef ShowCursor // raylib symbol collision #undef ShowCursor // raylib symbol collision
#undef LoadImage // raylib symbol collision #undef LoadImage // raylib symbol collision
#undef LoadImageA
#undef LoadImageW
#undef DrawText // raylib symbol collision #undef DrawText // raylib symbol collision
#undef DrawTextA #undef DrawTextA
#undef DrawTextW #undef DrawTextW
@ -1529,7 +1525,7 @@ int InitPlatform(void)
// Load user-provided icon if available // Load user-provided icon if available
// NOTE: raylib resource file defaults to GLFW_ICON id, so looking for same identifier // NOTE: raylib resource file defaults to GLFW_ICON id, so looking for same identifier
windowClass.hIcon = LoadImageW(hInstance, L"GLFW_ICON", IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | LR_SHARED); windowClass.hIcon = LoadImageW(hInstance, L"GLFW_ICON", IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | LR_SHARED);
if (!windowClass.hIcon) windowClass.hIcon = LoadImageW(NULL, IDI_APPLICATION, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | LR_SHARED); if (!windowClass.hIcon) windowClass.hIcon = LoadImageW(NULL, (LPCWSTR)IDI_APPLICATION, IMAGE_ICON, 0, 0, LR_DEFAULTSIZE | LR_SHARED);
// Register window class // Register window class
result = (int)RegisterClassExW(&windowClass); result = (int)RegisterClassExW(&windowClass);