mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 23:58:49 -05:00
added libidn build.
This commit is contained in:
parent
d31802ed98
commit
e0af4a15d0
@ -28,6 +28,11 @@ ifndef LIBSSH2_PATH
|
|||||||
LIBSSH2_PATH = ../../libssh2-0.18
|
LIBSSH2_PATH = ../../libssh2-0.18
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# Edit the path below to point to the base of your libidn package.
|
||||||
|
ifndef LIBIDN_PATH
|
||||||
|
LIBIDN_PATH = ../../libidn-1.9
|
||||||
|
endif
|
||||||
|
|
||||||
ifndef INSTDIR
|
ifndef INSTDIR
|
||||||
INSTDIR = ..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw
|
INSTDIR = ..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw
|
||||||
endif
|
endif
|
||||||
@ -183,6 +188,10 @@ else
|
|||||||
IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp
|
IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
ifdef WITH_IDN
|
||||||
|
INCLUDES += -I$(LIBIDN_PATH)/include
|
||||||
|
LDLIBS += $(LIBIDN_PATH)/lib/libidn.$(LIBEXT)
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(LIBARCH),LIBC)
|
ifeq ($(LIBARCH),LIBC)
|
||||||
INCLUDES += -I$(SDK_LIBC)/include
|
INCLUDES += -I$(SDK_LIBC)/include
|
||||||
@ -536,6 +545,9 @@ endif
|
|||||||
ifdef WITH_SSH2
|
ifdef WITH_SSH2
|
||||||
@echo $(DL)#define USE_LIBSSH2 1$(DL) >> $@
|
@echo $(DL)#define USE_LIBSSH2 1$(DL) >> $@
|
||||||
@echo $(DL)#define HAVE_LIBSSH2_H 1$(DL) >> $@
|
@echo $(DL)#define HAVE_LIBSSH2_H 1$(DL) >> $@
|
||||||
|
endif
|
||||||
|
ifdef WITH_IDN
|
||||||
|
@echo $(DL)#define USE_LIBIDN 1$(DL) >> $@
|
||||||
endif
|
endif
|
||||||
@echo $(DL)#ifdef __GNUC__$(DL) >> $@
|
@echo $(DL)#ifdef __GNUC__$(DL) >> $@
|
||||||
@echo $(DL)#define HAVE_VARIADIC_MACROS_GCC 1$(DL) >> $@
|
@echo $(DL)#define HAVE_VARIADIC_MACROS_GCC 1$(DL) >> $@
|
||||||
|
@ -28,6 +28,11 @@ ifndef LIBSSH2_PATH
|
|||||||
LIBSSH2_PATH = ../../libssh2-0.18
|
LIBSSH2_PATH = ../../libssh2-0.18
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# Edit the path below to point to the base of your libidn package.
|
||||||
|
ifndef LIBIDN_PATH
|
||||||
|
LIBIDN_PATH = ../../libidn-1.9
|
||||||
|
endif
|
||||||
|
|
||||||
ifndef INSTDIR
|
ifndef INSTDIR
|
||||||
INSTDIR = ..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw
|
INSTDIR = ..$(DS)curl-$(LIBCURL_VERSION_STR)-bin-nw
|
||||||
endif
|
endif
|
||||||
@ -181,6 +186,10 @@ else
|
|||||||
IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp
|
IMPORTS += @$(ZLIB_PATH)/nw/$(LIBARCH)/libz.imp
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
ifdef WITH_IDN
|
||||||
|
# INCLUDES += -I$(LIBIDN_PATH)/include
|
||||||
|
LDLIBS += $(LIBIDN_PATH)/lib/libidn.$(LIBEXT)
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(LIBARCH),LIBC)
|
ifeq ($(LIBARCH),LIBC)
|
||||||
INCLUDES += -I$(SDK_LIBC)/include
|
INCLUDES += -I$(SDK_LIBC)/include
|
||||||
@ -524,6 +533,9 @@ endif
|
|||||||
ifdef WITH_SSH2
|
ifdef WITH_SSH2
|
||||||
@echo $(DL)#define USE_LIBSSH2 1$(DL) >> $@
|
@echo $(DL)#define USE_LIBSSH2 1$(DL) >> $@
|
||||||
@echo $(DL)#define HAVE_LIBSSH2_H 1$(DL) >> $@
|
@echo $(DL)#define HAVE_LIBSSH2_H 1$(DL) >> $@
|
||||||
|
endif
|
||||||
|
ifdef WITH_IDN
|
||||||
|
@echo $(DL)#define USE_LIBIDN 1$(DL) >> $@
|
||||||
endif
|
endif
|
||||||
@echo $(DL)#ifdef __GNUC__$(DL) >> $@
|
@echo $(DL)#ifdef __GNUC__$(DL) >> $@
|
||||||
@echo $(DL)#define HAVE_VARIADIC_MACROS_GCC 1$(DL) >> $@
|
@echo $(DL)#define HAVE_VARIADIC_MACROS_GCC 1$(DL) >> $@
|
||||||
|
Loading…
Reference in New Issue
Block a user