moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-15 14:05:03 -05:00
Code Issues Releases Wiki Activity

Makefile.m32: add ability to override zstd libs [ci skip]

Browse Source 
Similarly to brotli, where this was already possible.
E.g. it allows to link zstd statically to libcurl.dll.

Ref: https://github.com/curl/curl-for-win/issues/12
Ref: d9b266afd2

Closes https://github.com/curl/curl/pull/5840
This commit is contained in:
Viktor Szakats 2020-08-22 21:06:06 +00:00
parent 327bd5d026
commit 38039da764
No known key found for this signature in database
GPG Key ID: 9C01E9B68B91DE4D
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/examples/Makefile.m32
View File

@ -294,7 +294,12 @@ endif
ifdef ZSTD ifdef ZSTD
INCLUDES += -I"$(ZSTD_PATH)/include" INCLUDES += -I"$(ZSTD_PATH)/include"
CFLAGS += -DHAVE_ZSTD CFLAGS += -DHAVE_ZSTD
curl_LDADD += -L"$(ZSTD_PATH)/lib" -lzstd curl_LDADD += -L"$(ZSTD_PATH)/lib"
ifdef ZSTD_LIBS
curl_LDADD += $(ZSTD_LIBS)
else
curl_LDADD += -lzstd
endif
endif endif
ifdef BROTLI ifdef BROTLI
INCLUDES += -I"$(BROTLI_PATH)/include" INCLUDES += -I"$(BROTLI_PATH)/include"

7
lib/Makefile.m32
View File

@ -298,7 +298,12 @@ endif
ifdef ZSTD ifdef ZSTD
INCLUDES += -I"$(ZSTD_PATH)/include" INCLUDES += -I"$(ZSTD_PATH)/include"
CFLAGS += -DHAVE_ZSTD CFLAGS += -DHAVE_ZSTD
DLL_LIBS += -L"$(ZSTD_PATH)/lib" -lzstd DLL_LIBS += -L"$(ZSTD_PATH)/lib"
ifdef ZSTD_LIBS
DLL_LIBS += $(ZSTD_LIBS)
else
DLL_LIBS += -lzstd
endif
endif endif
ifdef BROTLI ifdef BROTLI
INCLUDES += -I"$(BROTLI_PATH)/include" INCLUDES += -I"$(BROTLI_PATH)/include"

7
src/Makefile.m32
View File

@ -312,7 +312,12 @@ endif
ifdef ZSTD ifdef ZSTD
INCLUDES += -I"$(ZSTD_PATH)/include" INCLUDES += -I"$(ZSTD_PATH)/include"
CFLAGS += -DHAVE_ZSTD CFLAGS += -DHAVE_ZSTD
curl_LDADD += -L"$(ZSTD_PATH)/lib" -lzstd curl_LDADD += -L"$(ZSTD_PATH)/lib"
ifdef ZSTD_LIBS
curl_LDADD += $(ZSTD_LIBS)
else
curl_LDADD += -lzstd
endif
endif endif
ifdef BROTLI ifdef BROTLI
INCLUDES += -I"$(BROTLI_PATH)/include" INCLUDES += -I"$(BROTLI_PATH)/include"