Skip to content

fix definition mismatch & better platform exclude #1521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JJminecraftguy wants to merge 4 commits into
base: main
Choose a base branch
from
+3 −3
Open

fix definition mismatch & better platform exclude #1521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
af99e96
Fix mismatch
JJminecraftguy Apr 16, 2026
b474327
more platform inclusive
JJminecraftguy Apr 16, 2026
b666af9
Merge branch 'MCLCE:main' into main
JJminecraftguy Apr 18, 2026
748a078
Merge branch 'MCLCE:main' into main
JJminecraftguy Apr 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Minecraft.Client/Extrax64Stubs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ DWORD XContentGetThumbnail(DWORD dwUserIndex, const XCONTENT_DATA* pContentData,
void XShowAchievementsUI(int i) {}
DWORD XBackgroundDownloadSetMode(XBACKGROUND_DOWNLOAD_MODE Mode) { return 0; }

#if !defined(_DURANGO) && !defined(_WIN64)
#if !defined(_DURANGO) && !defined(_WIN32)
void PIXAddNamedCounter(int a, const char* b, ...) {}
//#define PS3_USE_PIX_EVENTS
//#define PS4_USE_PIX_EVENTS
Expand Down
4 changes: 2 additions & 2 deletions Minecraft.Client/Windows64/Iggy/gdraw/gdraw_d3d11.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ GDrawFunctions *gdraw_D3D11_CreateContext(ID3D11Device *dev, ID3D11DeviceContext
}

// 4J added - interface so we can set the viewport back to the one that Iggy last set up
void gdraw_D3D11_setViewport_4J()
void RADLINK gdraw_D3D11_setViewport_4J()
{
set_viewport();
}
}