diff --git a/Src/Common/MWR/CppTools/Compression.cpp b/Src/Common/MWR/CppTools/Compression.cpp index a168b78..1d1fb2f 100644 --- a/Src/Common/MWR/CppTools/Compression.cpp +++ b/Src/Common/MWR/CppTools/Compression.cpp @@ -1,14 +1,21 @@ #include "StdAfx.h" - #include "Compression.h" - #include "Common/zlib/include/zlib.h" + #if defined _WIN64 -#pragma comment(lib, "Common/zlib/lib/x64/zlib.lib") +#define Z_PLATFORM "x64/" #else -#pragma comment(lib, "Common/zlib/lib/x86/zlib.lib") +#define Z_PLATFORM "x86/" #endif +#if defined _DEBUG +#define Z_DEBUG "d" +#else +#define Z_DEBUG "" +#endif + +#pragma comment(lib, "Common/zlib/lib/" Z_PLATFORM "zlibstatic" Z_DEBUG ".lib") + namespace MWR::Compression { template <> diff --git a/Src/Common/zlib/lib/x64/zlib.lib b/Src/Common/zlib/lib/x64/zlib.lib deleted file mode 100644 index 85748b2..0000000 Binary files a/Src/Common/zlib/lib/x64/zlib.lib and /dev/null differ diff --git a/Src/Common/zlib/lib/x64/zlibstatic.lib b/Src/Common/zlib/lib/x64/zlibstatic.lib new file mode 100644 index 0000000..1790fe0 Binary files /dev/null and b/Src/Common/zlib/lib/x64/zlibstatic.lib differ diff --git a/Src/Common/zlib/lib/x64/zlibstaticd.lib b/Src/Common/zlib/lib/x64/zlibstaticd.lib new file mode 100644 index 0000000..4891934 Binary files /dev/null and b/Src/Common/zlib/lib/x64/zlibstaticd.lib differ diff --git a/Src/Common/zlib/lib/x86/zlib.lib b/Src/Common/zlib/lib/x86/zlib.lib deleted file mode 100644 index b50f2d5..0000000 Binary files a/Src/Common/zlib/lib/x86/zlib.lib and /dev/null differ diff --git a/Src/Common/zlib/lib/x86/zlibstatic.lib b/Src/Common/zlib/lib/x86/zlibstatic.lib new file mode 100644 index 0000000..33c220f Binary files /dev/null and b/Src/Common/zlib/lib/x86/zlibstatic.lib differ diff --git a/Src/Common/zlib/lib/x86/zlibstaticd.lib b/Src/Common/zlib/lib/x86/zlibstaticd.lib new file mode 100644 index 0000000..d69745a Binary files /dev/null and b/Src/Common/zlib/lib/x86/zlibstaticd.lib differ