diff options
| author | Viktor Szakats <vszakats@users.noreply.github.com> | 2017-11-05 22:56:39 +0000 |
|---|---|---|
| committer | Viktor Szakats <vszakats@users.noreply.github.com> | 2017-11-05 23:02:05 +0000 |
| commit | cc1f4436099decb9d1a7034b2bb773a9f8379d31 (patch) | |
| tree | 029fa3a0ca35dedd1ca4cd8fa6d7230b3956a87e | |
| parent | c675c40295045d4988eeb6291c54eb48f138822f (diff) | |
| download | curl-cc1f4436099decb9d1a7034b2bb773a9f8379d31.tar.gz | |
Makefile.m32: allow to customize brotli libs
It adds the ability to link against static brotli libs.
Also fix brotli include path.
| -rw-r--r-- | lib/Makefile.m32 | 9 | ||||
| -rw-r--r-- | src/Makefile.m32 | 7 |
2 files changed, 13 insertions, 3 deletions
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" diff --git a/src/Makefile.m32 b/src/Makefile.m32 index ffc359149..91d1b1d95 100644 --- 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 |