From e51f77df7f0f33be1fe33ac8d2c6c9c3eaefbf57 Mon Sep 17 00:00:00 2001 From: Tropical <42101043+tropicaaal@users.noreply.github.com> Date: Tue, 3 Mar 2026 20:33:38 -0600 Subject: [PATCH] fix: improve some linker errors --- Minecraft.Client/Linux/Stubs/iggy_stubs.h | 4 ++-- Minecraft.Client/Linux/Stubs/winapi_stubs.h | 11 +++++++++++ Minecraft.Client/Linux/Stubs/xbox_stubs.h | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/Minecraft.Client/Linux/Stubs/iggy_stubs.h b/Minecraft.Client/Linux/Stubs/iggy_stubs.h index 81920321a..8f9232f82 100644 --- a/Minecraft.Client/Linux/Stubs/iggy_stubs.h +++ b/Minecraft.Client/Linux/Stubs/iggy_stubs.h @@ -36,7 +36,7 @@ RADEXPFUNC inline void RADEXPLINK IggyPlayerDrawTilesEnd(Iggy *f) { STUBBED; } -int thing = 0; +static int thing = 0; RADEXPFUNC inline Iggy * RADEXPLINK IggyPlayerCreateFromMemory( void const * data, @@ -51,7 +51,7 @@ RADEXPFUNC inline void RADEXPLINK IggyPlayerInitializeAndTickRS(Iggy *player) { STUBBED; } -IggyProperties properties; +static IggyProperties properties; RADEXPFUNC inline IggyProperties * RADEXPLINK IggyPlayerProperties(Iggy *player) { STUBBED; diff --git a/Minecraft.Client/Linux/Stubs/winapi_stubs.h b/Minecraft.Client/Linux/Stubs/winapi_stubs.h index c6a792882..00c7c54b5 100644 --- a/Minecraft.Client/Linux/Stubs/winapi_stubs.h +++ b/Minecraft.Client/Linux/Stubs/winapi_stubs.h @@ -228,6 +228,17 @@ DECLARE_HANDLE(HINSTANCE); typedef HINSTANCE HMODULE; +#define _HRESULT_TYPEDEF_(_sc) _sc + +#define FAILED(Status) ((HRESULT)(Status)<0) +#define MAKE_HRESULT(sev,fac,code) \ + ((HRESULT) (((unsigned int)(sev)<<31) | ((unsigned int)(fac)<<16) | ((unsigned int)(code))) ) +#define MAKE_SCODE(sev,fac,code) \ + ((SCODE) (((unsigned int)(sev)<<31) | ((unsigned int)(fac)<<16) | ((unsigned int)(code))) ) +#define E_FAIL _HRESULT_TYPEDEF_(0x80004005L) +#define E_ABORT _HRESULT_TYPEDEF_(0x80004004L) +#define E_NOINTERFACE _HRESULT_TYPEDEF_(0x80004002L) + typedef pthread_mutex_t RTL_CRITICAL_SECTION; typedef pthread_mutex_t* PRTL_CRITICAL_SECTION; diff --git a/Minecraft.Client/Linux/Stubs/xbox_stubs.h b/Minecraft.Client/Linux/Stubs/xbox_stubs.h index b242a4587..f245d9b50 100644 --- a/Minecraft.Client/Linux/Stubs/xbox_stubs.h +++ b/Minecraft.Client/Linux/Stubs/xbox_stubs.h @@ -20,7 +20,7 @@ typedef unsigned int uint; typedef unsigned long long int uint64; typedef long long int int64; -#define FORCEINLINE +#define FORCEINLINE inline // Content creation/open flags #define XCONTENTFLAG_NONE 0x00