diff options
| author | Viktor Szakats <vszakats@users.noreply.github.com> | 2017-11-05 15:32:43 +0100 |
|---|---|---|
| committer | Patrick Monnerat <patrick@monnerat.net> | 2017-11-05 15:32:43 +0100 |
| commit | 609aa62f53387f35eaf728c4e4692badbce68ef2 (patch) | |
| tree | 3250462da59e469d0124f4350d1958db66b31222 | |
| parent | 11bf1796cd015373a996e6eb26212e2e1aadb066 (diff) | |
| download | curl-609aa62f53387f35eaf728c4e4692badbce68ef2.tar.gz | |
Makefile.m32: add brotli support
| -rw-r--r-- | lib/Makefile.m32 | 15 | ||||
| -rw-r--r-- | src/Makefile.m32 | 15 |
2 files changed, 28 insertions, 2 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 1389b8539..325cdc7af 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -23,7 +23,8 @@ ########################################################################### # ## Makefile for building libcurl.a with MingW (GCC-3.2 or later or LLVM/Clang) -## and optionally OpenSSL (1.0.2a), libssh2 (1.5), zlib (1.2.8), librtmp (2.4) +## and optionally OpenSSL (1.0.2a), libssh2 (1.5), zlib (1.2.8), librtmp (2.4), +## brotli (1.0.1) ## ## Usage: mingw32-make -f Makefile.m32 CFG=-feature1[-feature2][-feature3][...] ## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-sspi-winidn @@ -38,6 +39,10 @@ ifndef ZLIB_PATH ZLIB_PATH = ../../zlib-1.2.8 endif +# Edit the path below to point to the base of your Brotli sources. +ifndef BROTLI_PATH +BROTLI_PATH = ../../brotli-1.0.1 +endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH OPENSSL_PATH = ../../openssl-1.0.2a @@ -175,6 +180,9 @@ endif ifeq ($(findstring -zlib,$(CFG)),-zlib) ZLIB = 1 endif +ifeq ($(findstring -brotli,$(CFG)),-brotli) +BROTLI = 1 +endif ifeq ($(findstring -idn2,$(CFG)),-idn2) IDN2 = 1 endif @@ -280,6 +288,11 @@ ifdef ZLIB CFLAGS += -DHAVE_LIBZ -DHAVE_ZLIB_H DLL_LIBS += -L"$(ZLIB_PATH)" -lz endif +ifdef BROTLI + INCLUDES += -I"$(BROTLI_PATH)" + CFLAGS += -DHAVE_BROTLI + DLL_LIBS += -L"$(BROTLI_PATH)/lib" -lbrotlidec +endif ifdef IDN2 INCLUDES += -I"$(LIBIDN2_PATH)/include" CFLAGS += -DUSE_LIBIDN2 diff --git a/src/Makefile.m32 b/src/Makefile.m32 index 728c814a4..ffc359149 100644 --- a/src/Makefile.m32 +++ b/src/Makefile.m32 @@ -23,7 +23,8 @@ ########################################################################### # ## Makefile for building curl.exe with MingW (GCC-3.2 or later or LLVM/Clang) -## and optionally OpenSSL (1.0.2a), libssh2 (1.5), zlib (1.2.8), librtmp (2.4) +## and optionally OpenSSL (1.0.2a), libssh2 (1.5), zlib (1.2.8), librtmp (2.4), +## brotli (1.0.1) ## ## Usage: mingw32-make -f Makefile.m32 CFG=-feature1[-feature2][-feature3][...] ## Example: mingw32-make -f Makefile.m32 CFG=-zlib-ssl-sspi-winidn @@ -38,6 +39,10 @@ ifndef ZLIB_PATH ZLIB_PATH = ../../zlib-1.2.8 endif +# Edit the path below to point to the base of your Brotli sources. +ifndef BROTLI_PATH +BROTLI_PATH = ../../brotli-1.0.1 +endif # Edit the path below to point to the base of your OpenSSL package. ifndef OPENSSL_PATH OPENSSL_PATH = ../../openssl-1.0.2a @@ -184,6 +189,9 @@ endif ifeq ($(findstring -zlib,$(CFG)),-zlib) ZLIB = 1 endif +ifeq ($(findstring -brotli,$(CFG)),-brotli) +BROTLI = 1 +endif ifeq ($(findstring -idn2,$(CFG)),-idn2) IDN2 = 1 endif @@ -294,6 +302,11 @@ ifdef ZLIB CFLAGS += -DHAVE_LIBZ -DHAVE_ZLIB_H curl_LDADD += -L"$(ZLIB_PATH)" -lz endif +ifdef BROTLI + INCLUDES += -I"$(BROTLI_PATH)" + CFLAGS += -DHAVE_BROTLI + curl_LDADD += -L"$(BROTLI_PATH)/lib" -lbrotlidec +endif ifdef IDN2 CFLAGS += -DUSE_LIBIDN2 curl_LDADD += -L"$(LIBIDN2_PATH)/lib" -lidn2 |