moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

Makefile.m32: allow to customize brotli libs 

It adds the ability to link against static brotli libs.

Also fix brotli include path.
This commit is contained in:
Viktor Szakats 2017-11-05 22:56:39 +00:00
parent c675c40295
commit cc1f443609
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Makefile.m32
View File

@ -289,9 +289,14 @@ ifdef ZLIB
DLL_LIBS += -L"$(ZLIB_PATH)" -lz DLL_LIBS += -L"$(ZLIB_PATH)" -lz
endif endif
ifdef BROTLI ifdef BROTLI
INCLUDES += -I"$(BROTLI_PATH)" INCLUDES += -I"$(BROTLI_PATH)/include"
CFLAGS += -DHAVE_BROTLI 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 endif
ifdef IDN2 ifdef IDN2
INCLUDES += -I"$(LIBIDN2_PATH)/include" INCLUDES += -I"$(LIBIDN2_PATH)/include"

7
src/Makefile.m32
View File

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