moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed ares-enabled builds with static makefiles.

This commit is contained in:
Guenter Knauf 2013-04-09 17:44:51 +02:00
parent 88535d593e
commit 658ec97055
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Makefile.m32
View File

@ -153,7 +153,7 @@ CFLAGS += -DBUILDING_LIBCURL
ifdef ARES
INCLUDES += -I"$(LIBCARES_PATH)"
CFLAGS += -DUSE_ARES
CFLAGS += -DUSE_ARES -DCARES_STATICLIB
DLL_LIBS += -L"$(LIBCARES_PATH)" -lcares
libcurl_dll_DEPENDENCIES = $(LIBCARES_PATH)/libcares.a
endif

6
lib/config-win32.h
View File

@ -612,7 +612,11 @@
/* #define USE_ARES 1 */
/* Define to enable threaded asynchronous DNS lookups. */
#define USE_THREADS_WIN32 1
#if !defined(USE_ARES) && !defined(USE_THREADS_WIN32)
# define USE_THREADS_WIN32 1
#elif defined(USE_THREADS_WIN32) && USE_THREADS_WIN32 == 0
# undef USE_THREADS_WIN32
#endif
#if defined(USE_ARES) && defined(USE_THREADS_WIN32)
# error "Only one DNS lookup specialty may be defined at most"

2
src/Makefile.m32
View File

@ -177,7 +177,7 @@ ifdef ARES
ifndef DYN
curl_DEPENDENCIES += $(LIBCARES_PATH)/libcares.a
endif
CFLAGS += -DUSE_ARES
CFLAGS += -DUSE_ARES -DCARES_STATICLIB
curl_LDADD += -L"$(LIBCARES_PATH)" -lcares
endif
ifdef RTMP