diff --git a/Minecraft.Client/Build/Common/zlib/gzguts.h b/Minecraft.Client/Build/Common/zlib/gzguts.h index d87659d03..8661ba63b 100644 --- a/Minecraft.Client/Build/Common/zlib/gzguts.h +++ b/Minecraft.Client/Build/Common/zlib/gzguts.h @@ -1,3 +1,4 @@ +#pragma once /* gzguts.h -- zlib internal header definitions for gz* operations * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h diff --git a/Minecraft.Client/Build/Common/zlib/inflate.h b/Minecraft.Client/Build/Common/zlib/inflate.h index 95f4986d4..1ae81275e 100644 --- a/Minecraft.Client/Build/Common/zlib/inflate.h +++ b/Minecraft.Client/Build/Common/zlib/inflate.h @@ -1,3 +1,4 @@ +#pragma once /* inflate.h -- internal inflate state definition * Copyright (C) 1995-2009 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h diff --git a/Minecraft.Client/meson.build b/Minecraft.Client/meson.build index 194cda742..f9e00e7ec 100644 --- a/Minecraft.Client/meson.build +++ b/Minecraft.Client/meson.build @@ -3,6 +3,7 @@ exclude_sources = [ ' ! -path "*/Platform/*"', ' ! -path "*/Build/Common/Network/Sony/*"', ' ! -path "*/Build/Common/XUI/*"', + ' ! -path "*/Build/Common/zlib/*"', ] # get all those files @@ -42,6 +43,7 @@ executable('Minecraft.Client', glfw_dep, thread_dep, dl_dep, + dependency('zlib'), ], cpp_args : global_cpp_args + global_cpp_defs + [ '-DUNICODE', '-D_UNICODE', diff --git a/Minecraft.World/meson.build b/Minecraft.World/meson.build index c8f48c68c..c0c2455ee 100644 --- a/Minecraft.World/meson.build +++ b/Minecraft.World/meson.build @@ -10,7 +10,7 @@ exclude_sources = [ '! -name NbtSlotFile.cpp', '! -name ZonedChunkStorage.cpp', '! -name ZoneFile.cpp', - '! -name ZoneIo.cpp', + '! -name ZoneIO.cpp', ] # GET IT ALLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL