generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enabled MinGW sync resolver builds.

Browse Source
This commit is contained in:
Guenter Knauf 2013-04-11 14:05:08 +02:00
parent c86ea58304
commit 96ffe645fd
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Makefile.m32
View File

@ -106,6 +106,9 @@ endif
ifeq ($(findstring -ares,$(CFG)),-ares) ifeq ($(findstring -ares,$(CFG)),-ares)
ARES = 1 ARES = 1
endif endif
ifeq ($(findstring -sync,$(CFG)),-sync)
SYNC = 1
endif
ifeq ($(findstring -rtmp,$(CFG)),-rtmp) ifeq ($(findstring -rtmp,$(CFG)),-rtmp)
RTMP = 1 RTMP = 1
SSL = 1 SSL = 1
@ -151,11 +154,15 @@ endif
INCLUDES = -I. -I../include INCLUDES = -I. -I../include
CFLAGS += -DBUILDING_LIBCURL CFLAGS += -DBUILDING_LIBCURL
ifdef ARES ifdef SYNC
INCLUDES += -I"$(LIBCARES_PATH)" CFLAGS += -DUSE_SYNC_DNS
CFLAGS += -DUSE_ARES -DCARES_STATICLIB else
DLL_LIBS += -L"$(LIBCARES_PATH)" -lcares ifdef ARES
libcurl_dll_DEPENDENCIES = $(LIBCARES_PATH)/libcares.a INCLUDES += -I"$(LIBCARES_PATH)"
CFLAGS += -DUSE_ARES -DCARES_STATICLIB
DLL_LIBS += -L"$(LIBCARES_PATH)" -lcares
libcurl_dll_DEPENDENCIES = $(LIBCARES_PATH)/libcares.a
endif
endif endif
ifdef RTMP ifdef RTMP
INCLUDES += -I"$(LIBRTMP_PATH)" INCLUDES += -I"$(LIBRTMP_PATH)"

7
lib/config-win32.h
View File

@ -611,11 +611,10 @@
/* Define to enable c-ares asynchronous DNS lookups. */ /* Define to enable c-ares asynchronous DNS lookups. */
/* #define USE_ARES 1 */ /* #define USE_ARES 1 */
/* Define to enable threaded asynchronous DNS lookups. */ /* Default define to enable threaded asynchronous DNS lookups. */
#if !defined(USE_ARES) && !defined(USE_THREADS_WIN32) #if !defined(USE_SYNC_DNS) && !defined(USE_ARES) && \
!defined(USE_THREADS_WIN32)
# define USE_THREADS_WIN32 1 # define USE_THREADS_WIN32 1
#elif defined(USE_THREADS_WIN32) && USE_THREADS_WIN32 == 0
# undef USE_THREADS_WIN32
#endif #endif
#if defined(USE_ARES) && defined(USE_THREADS_WIN32) #if defined(USE_ARES) && defined(USE_THREADS_WIN32)

17
src/Makefile.m32
View File

@ -120,6 +120,9 @@ endif
ifeq ($(findstring -ares,$(CFG)),-ares) ifeq ($(findstring -ares,$(CFG)),-ares)
ARES = 1 ARES = 1
endif endif
ifeq ($(findstring -sync,$(CFG)),-sync)
SYNC = 1
endif
ifeq ($(findstring -rtmp,$(CFG)),-rtmp) ifeq ($(findstring -rtmp,$(CFG)),-rtmp)
RTMP = 1 RTMP = 1
SSL = 1 SSL = 1
@ -173,12 +176,16 @@ else
CFLAGS += -DCURL_STATICLIB CFLAGS += -DCURL_STATICLIB
LDFLAGS += -static LDFLAGS += -static
endif endif
ifdef ARES ifdef SYNC
ifndef DYN CFLAGS += -DUSE_SYNC_DNS
curl_DEPENDENCIES += $(LIBCARES_PATH)/libcares.a else
ifdef ARES
ifndef DYN
curl_DEPENDENCIES += $(LIBCARES_PATH)/libcares.a
endif
CFLAGS += -DUSE_ARES -DCARES_STATICLIB
curl_LDADD += -L"$(LIBCARES_PATH)" -lcares
endif endif
CFLAGS += -DUSE_ARES -DCARES_STATICLIB
curl_LDADD += -L"$(LIBCARES_PATH)" -lcares
endif endif
ifdef RTMP ifdef RTMP
CFLAGS += -DUSE_LIBRTMP CFLAGS += -DUSE_LIBRTMP