Added build bits for librtmp to MingW32 makefiles. (6a90aa3f) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP curl

lib/Makefile.m32

+11 −2

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		## and optionally OpenSSL (0.9.8), libssh2 (1.2), zlib (1.2.5)
		##
		## Usage:
		## mingw32-make -f Makefile.m32 [SSL=1] [SSH2=1] [ZLIB=1] [IDN=1] [SSPI=1] [IPV6=1] [LDAPS=1] [DYN=1]
		## mingw32-make -f Makefile.m32 [SSL=1] [SSH2=1] [ZLIB=1] [IDN=1] [SSPI=1] [IPV6=1] [LDAPS=1] [RTMP=1] [DYN=1]
		##
		## Hint: you can also set environment vars to control the build, f.e.:
		## set ZLIB_PATH=c:/zlib-1.2.5
		@@ -24,12 +24,16 @@ OPENSSL_PATH = ../../openssl-0.9.8o
		endif
		# Edit the path below to point to the base of your LibSSH2 package.
		ifndef LIBSSH2_PATH
		LIBSSH2_PATH = ../../libssh2-1.2.6
		LIBSSH2_PATH = ../../libssh2-1.2.7
		endif
		# Edit the path below to point to the base of your libidn package.
		ifndef LIBIDN_PATH
		LIBIDN_PATH = ../../libidn-1.18
		endif
		# Edit the path below to point to the base of your librtmp package.
		ifndef LIBRTMP_PATH
		LIBRTMP_PATH = ../../librtmp-2.3
		endif
		# Edit the path below to point to the base of your Novell LDAP NDK.
		ifndef LDAP_SDK
		LDAP_SDK = c:/novell/ndk/cldapsdk/win32
		@@ -61,6 +65,11 @@ ifdef ARES
		DLL_LIBS += -L$(LIBCARES_PATH) -lcares
		libcurl_dll_DEPENDENCIES = $(LIBCARES_PATH)/libcares.a
		endif
		ifdef RTMP
		INCLUDES += -I"$(LIBRTMP_PATH)"
		CFLAGS += -DUSE_LIBRTMP
		DLL_LIBS += -L"$(LIBRTMP_PATH)/librtmp" -lrtmp -lwinmm
		endif
		ifdef SSH2
		INCLUDES += -I"$(LIBSSH2_PATH)/include" -I"$(LIBSSH2_PATH)/win32"
		CFLAGS += -DUSE_LIBSSH2 -DHAVE_LIBSSH2_H

+10 −2

Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		## and optionally OpenSSL (0.9.8), libssh2 (1.2), zlib (1.2.5)
		##
		## Usage:
		## mingw32-make -f Makefile.m32 [SSL=1] [SSH2=1] [ZLIB=1] [IDN=1] [SSPI=1] [IPV6=1] [LDAPS=1] [DYN=1]
		## mingw32-make -f Makefile.m32 [SSL=1] [SSH2=1] [ZLIB=1] [IDN=1] [SSPI=1] [IPV6=1] [LDAPS=1] [RTMP=1] [DYN=1]
		##
		## Hint: you can also set environment vars to control the build, f.e.:
		## set ZLIB_PATH=c:/zlib-1.2.5
		@@ -24,12 +24,16 @@ OPENSSL_PATH = ../../openssl-0.9.8o
		endif
		# Edit the path below to point to the base of your LibSSH2 package.
		ifndef LIBSSH2_PATH
		LIBSSH2_PATH = ../../libssh2-1.2.6
		LIBSSH2_PATH = ../../libssh2-1.2.7
		endif
		# Edit the path below to point to the base of your libidn package.
		ifndef LIBIDN_PATH
		LIBIDN_PATH = ../../libidn-1.18
		endif
		# Edit the path below to point to the base of your librtmp package.
		ifndef LIBRTMP_PATH
		LIBRTMP_PATH = ../../librtmp-2.3
		endif
		# Edit the path below to point to the base of your Novell LDAP NDK.
		ifndef LDAP_SDK
		LDAP_SDK = c:/novell/ndk/cldapsdk/win32
		@@ -75,6 +79,10 @@ ifdef ARES
		CFLAGS += -DUSE_ARES
		curl_LDADD += -L$(LIBCARES_PATH) -lcares
		endif
		ifdef RTMP
		CFLAGS += -DUSE_LIBRTMP
		curl_LDADD += -L"$(LIBRTMP_PATH)/librtmp" -lrtmp -lwinmm
		endif
		ifdef SSH2
		CFLAGS += -DUSE_LIBSSH2 -DHAVE_LIBSSH2_H
		curl_LDADD += -L$(LIBSSH2_PATH)/win32 -lssh2