From cc1f4436099decb9d1a7034b2bb773a9f8379d31 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Sun, 5 Nov 2017 22:56:39 +0000 Subject: Makefile.m32: allow to customize brotli libs It adds the ability to link against static brotli libs. Also fix brotli include path. --- lib/Makefile.m32 | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 325cdc7af..773187ad7 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -289,9 +289,14 @@ ifdef ZLIB DLL_LIBS += -L"$(ZLIB_PATH)" -lz endif ifdef BROTLI - INCLUDES += -I"$(BROTLI_PATH)" + INCLUDES += -I"$(BROTLI_PATH)/include" CFLAGS += -DHAVE_BROTLI - DLL_LIBS += -L"$(BROTLI_PATH)/lib" -lbrotlidec + DLL_LIBS += -L"$(BROTLI_PATH)/lib" + ifdef BROTLI_LIBS + DLL_LIBS += $(BROTLI_LIBS) + else + DLL_LIBS += -lbrotlidec + endif endif ifdef IDN2 INCLUDES += -I"$(LIBIDN2_PATH)/include" -- cgit v1.2.3