diff --git a/docs/changes.txt b/docs/changes.txt index 14b6c9097..efaf95d5a 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -20,6 +20,7 @@ ## Improvements ## +- Compile ZLIB: Fixed makefile include paths in case USE_SYSTEM_ZLIB is used - Compile macOS: Fixed makefile target 'clean' to correctly remove *.dSYM folders - OpenCL Kernels: Added pure kernels for hash-mode 600 (BLAKE2b-512) - OpenCL Runtime: Reinterpret return code CL_DEVICE_NOT_FOUND from clGetDeviceIDs() as non-fatal diff --git a/include/ext_lzma.h b/include/ext_lzma.h index feaa5d908..a346a8e22 100644 --- a/include/ext_lzma.h +++ b/include/ext_lzma.h @@ -8,8 +8,8 @@ #include #include -#include "contrib/minizip/ioapi.h" -#include "contrib/minizip/unzip.h" +#include "minizip/ioapi.h" +#include "minizip/unzip.h" int hc_lzma1_decompress (const unsigned char *in, SizeT *in_len, unsigned char *out, SizeT *out_len, const char *props); int hc_lzma2_decompress (const unsigned char *in, SizeT *in_len, unsigned char *out, SizeT *out_len, const char *props); diff --git a/src/Makefile b/src/Makefile index 6db1f961f..f81d8bd99 100644 --- a/src/Makefile +++ b/src/Makefile @@ -218,7 +218,7 @@ LFLAGS += -llzmasdk endif # ZLIB -CFLAGS += -I$(DEPS_ZLIB_PATH) +CFLAGS += -I$(DEPS_ZLIB_PATH) -I$(DEPS_ZLIB_PATH)/contrib ifeq ($(USE_SYSTEM_ZLIB),1) LFLAGS += -lz -lminizip endif