Commit cc1f4436 authored Nov 05, 2017 by Viktor Szakats

Makefile.m32: allow to customize brotli libs

It adds the ability to link against static brotli libs.

Also fix brotli include path.

parent c675c402

lib/Makefile.m32

+7 −2

Original line number	Diff line number	Diff line
		@@ -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"

src/Makefile.m32

+6 −1

Original line number	Diff line number	Diff line
		@@ -303,9 +303,14 @@ ifdef ZLIB
		curl_LDADD += -L"$(ZLIB_PATH)" -lz
		endif
		ifdef BROTLI
		INCLUDES += -I"$(BROTLI_PATH)"
		INCLUDES += -I"$(BROTLI_PATH)/include"
		CFLAGS += -DHAVE_BROTLI
		curl_LDADD += -L"$(BROTLI_PATH)/lib" -lbrotlidec
		ifdef BROTLI_LIBS
		curl_LDADD += $(BROTLI_LIBS)
		else
		curl_LDADD += -lbrotlidec
		endif
		endif
		ifdef IDN2
		CFLAGS += -DUSE_LIBIDN2