Makefile.m32: allow to customize brotli libs

It adds the ability to link against static brotli libs.

Also fix brotli include path.

diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 325cdc7afebf6312ab2a43683aad7a59ddae45c1..773187ad7f3d686e6f15ca478fcdc61b66e2500c 100644 (file)
--- 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"

diff --git a/src/Makefile.m32 b/src/Makefile.m32
index ffc359149bd183cf469a1a57ba4762ce051a5703..91d1b1d9568c359c318b4cbcde471761048a4be6 100644 (file)
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -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