fix: use system zlib in Minecraft.World to avoid Byte typedef conflict with clang unity build
This commit is contained in:
@@ -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__
|
||||
|
||||
@@ -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'),
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user