backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-06-08 16:12:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: use system zlib in Minecraft.World to avoid Byte typedef conflict with clang unity build

Browse source
This commit is contained in:
JuiceyDev 2026-03-06 08:24:07 +01:00
parent bafbdc62a1
commit e7f98a2410
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Minecraft.World/IO/Streams/Compression.cpp
View file

@ -1,7 +1,7 @@
#include "../../Build/stdafx.h"
#include "Compression.h"
#if defined __ORBIS__ || defined __PS3__ || defined _DURANGO || defined _WIN64 || defined __linux__
#include "../../../Minecraft.Client/Build/Common/zlib/zlib.h"
#include <zlib.h>
#endif
#if defined __PSVITA__

4
Minecraft.World/meson.build
View file

@ -32,11 +32,11 @@ lib_world = static_library('Minecraft.World',
],
)
# dep_zlib = dependency('zlib') # using in-tree zlib for the time being
dep_zlib = dependency('zlib')
dep_crypto = dependency('libcrypto') # for MD5 in Hasher.cpp on Linux
world_dep = declare_dependency(
link_with : lib_world,
dependencies : [dep_crypto],
dependencies : [dep_crypto, dep_zlib],
include_directories : include_directories('Build/x64headers'),
)