summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuenter Knauf <lists@gknw.net>2014-10-24 04:22:04 +0200
committerGuenter Knauf <lists@gknw.net>2014-10-24 04:22:04 +0200
commitede9884c59dd8586e1041372270e3e1b54f33327 (patch)
tree10eca779e02c814554cc0d0c5e2a7bf3368ff7e9
parent226e61437801bee7894e72a6a4bf34650d7e9c69 (diff)
downloadcurl-ede9884c59dd8586e1041372270e3e1b54f33327.tar.gz
Added MinGW support to build with nghttp2.
-rw-r--r--lib/Makefile.m3212
-rw-r--r--src/Makefile.m3211
2 files changed, 23 insertions, 0 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 6b4c94a3d..c28d4526c 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -42,6 +42,10 @@ endif
ifndef LDAP_SDK
LDAP_SDK = c:/novell/ndk/cldapsdk/win32
endif
+# Edit the path below to point to the base of your nghttp2 package.
+ifndef NGHTTP2_PATH
+NGHTTP2_PATH = ../../nghttp2-0.6.4
+endif
PROOT = ..
@@ -147,6 +151,9 @@ ifeq ($(findstring -winssl,$(CFG)),-winssl)
WINSSL = 1
SSPI = 1
endif
+ifeq ($(findstring -nghttp2,$(CFG)),-nghttp2)
+NGHTTP2 = 1
+endif
INCLUDES = -I. -I../include
CFLAGS += -DBUILDING_LIBCURL
@@ -166,6 +173,11 @@ ifdef RTMP
CFLAGS += -DUSE_LIBRTMP
DLL_LIBS += -L"$(LIBRTMP_PATH)/librtmp" -lrtmp -lwinmm
endif
+ifdef NGHTTP2
+ INCLUDES += -I"$(NGHTTP2_PATH)/include"
+ CFLAGS += -DUSE_NGHTTP2
+ DLL_LIBS += -L"$(NGHTTP2_PATH)/lib" -lnghttp2
+endif
ifdef SSH2
INCLUDES += -I"$(LIBSSH2_PATH)/include" -I"$(LIBSSH2_PATH)/win32"
CFLAGS += -DUSE_LIBSSH2 -DHAVE_LIBSSH2_H
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 91b38a150..ddfed417a 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -54,6 +54,10 @@ endif
ifndef LDAP_SDK
LDAP_SDK = c:/novell/ndk/cldapsdk/win32
endif
+# Edit the path below to point to the base of your nghttp2 package.
+ifndef NGHTTP2_PATH
+NGHTTP2_PATH = ../../nghttp2-0.6.4
+endif
PROOT = ..
@@ -161,6 +165,9 @@ ifeq ($(findstring -winssl,$(CFG)),-winssl)
WINSSL = 1
SSPI = 1
endif
+ifeq ($(findstring -nghttp2,$(CFG)),-nghttp2)
+NGHTTP2 = 1
+endif
INCLUDES = -I. -I../include -I../lib
@@ -188,6 +195,10 @@ ifdef RTMP
CFLAGS += -DUSE_LIBRTMP
curl_LDADD += -L"$(LIBRTMP_PATH)/librtmp" -lrtmp -lwinmm
endif
+ifdef NGHTTP2
+ CFLAGS += -DUSE_NGHTTP2
+ curl_LDADD += -L"$(NGHTTP2_PATH)/lib" -lnghttp2
+endif
ifdef SSH2
CFLAGS += -DUSE_LIBSSH2 -DHAVE_LIBSSH2_H
curl_LDADD += -L"$(LIBSSH2_PATH)/win32" -lssh2