(rcore_desktop_rgfw.c) fix errors when compiling with mingw (#4282)

* (rcore_desktop_rgfw.c) fix errors when compiling with mingw * define WideCharToMultiByte
raysan5 · Aug 24, 2024 · bc0bd98 · bc0bd98
1 parent dfd8055
commit bc0bd98
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/src/external/RGFW.h b/src/external/RGFW.h
@@ -4999,7 +4999,9 @@ static const struct wl_callback_listener wl_surface_frame_listener = {
 	#define WIN32_LEAN_AND_MEAN
 	#define OEMRESOURCE
 	#include <windows.h>
-
+
+	__declspec(dllimport) int __stdcall WideCharToMultiByte( UINT CodePage, DWORD dwFlags, const WCHAR* lpWideCharStr, int cchWideChar,  LPSTR lpMultiByteStr, int cbMultiByte, LPCCH lpDefaultChar, LPBOOL lpUsedDefaultChar);
+
 	#include <processthreadsapi.h>
 	#include <wchar.h>
 	#include <locale.h>

diff --git a/src/platforms/rcore_desktop_rgfw.c b/src/platforms/rcore_desktop_rgfw.c
@@ -76,9 +76,7 @@ void CloseWindow(void);
     #define Size NSSIZE
 #endif
 
-#if defined(_MSC_VER)
 __declspec(dllimport) int __stdcall MultiByteToWideChar(unsigned int CodePage, unsigned long dwFlags, const char *lpMultiByteStr, int cbMultiByte, wchar_t *lpWideCharStr, int cchWideChar);
-#endif
 
 #include "../external/RGFW.h"
 
@@ -538,10 +536,8 @@ void *GetWindowHandle(void)
 {
 #ifdef RGFW_WEBASM
     return (void*)platform.window->src.ctx;
-#elif !defined(RGFW_WINDOWS)
-    return (void *)platform.window->src.window;
 #else
-    return platform.window->src.hwnd;
+    return (void*)platform.window->src.window;
 #endif
 }