Commit ede9884c authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Added MinGW support to build with nghttp2.

parent 226e6143

lib/Makefile.m32

+12 −0
Original line number Diff line number Diff line
@@ -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

src/Makefile.m32

+11 −0
Original line number Diff line number Diff line
@@ -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