[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [gnurl] 54/116: Makefile.m32: add brotli support
From: |
gnunet |
Subject: |
[GNUnet-SVN] [gnurl] 54/116: Makefile.m32: add brotli support |
Date: |
Tue, 05 Dec 2017 14:51:24 +0100 |
This is an automated email from the git hooks/post-receive script.
ng0 pushed a commit to branch master
in repository gnurl.
commit 609aa62f53387f35eaf728c4e4692badbce68ef2
Author: Viktor Szakats <address@hidden>
AuthorDate: Sun Nov 5 15:32:43 2017 +0100
Makefile.m32: add brotli support
---
lib/Makefile.m32 | 15 ++++++++++++++-
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
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [gnurl] 15/116: curl_setup: Improve detection of CURL_WINDOWS_APP, (continued)
- [GNUnet-SVN] [gnurl] 15/116: curl_setup: Improve detection of CURL_WINDOWS_APP, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 42/116: CURLOPT_MAXREDIRS: allow -1 as a value, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 19/116: setopt: fix CURLOPT_SSH_AUTH_TYPES option read, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 38/116: memdebug: use send/recv signature for curl_dosend/curl_dorecv, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 11/116: wildcards: don't use with non-supported protocols, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 24/116: TODO: support multiple Content-Encodings, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 29/116: timeleft: made two more users of Curl_timeleft use timediff_t, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 46/116: CURLOPT_INFILESIZE: accept -1, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 23/116: ROADMAP: cleanup, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 07/116: ftplistparser: free off temporary memory always, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 54/116: Makefile.m32: add brotli support,
gnunet <=
- [GNUnet-SVN] [gnurl] 20/116: appveyor: add a win32 build, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 09/116: time: rename Curl_tvnow to Curl_now, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 28/116: cmake: Export libcurl and curl targets to use by other cmake projects, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 59/116: fnmatch: remove dead code, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 44/116: http2: Fixed OOM handling in upgrade request, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 61/116: content_encoding: fix inflate_stream for no bytes available, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 51/116: url: remove arg value check from CURLOPT_SSH_AUTH_TYPES, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 33/116: INTERNALS: remove curlx_tv* functions no longer provided, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 62/116: curl_multi_fdset.3: emphasize curl_multi_timeout, gnunet, 2017/12/05
- [GNUnet-SVN] [gnurl] 39/116: cookie: avoid NULL dereference, gnunet, 2017/12/05