Commit 96ffe645 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Enabled MinGW sync resolver builds.

parent c86ea583

lib/Makefile.m32

+12 −5
Original line number Diff line number Diff line
@@ -106,6 +106,9 @@ endif 
ifeq ($(findstring -ares,$(CFG)),-ares)

ARES = 1

endif

ifeq ($(findstring -sync,$(CFG)),-sync)

SYNC = 1

endif

ifeq ($(findstring -rtmp,$(CFG)),-rtmp)

RTMP = 1

SSL = 1
@@ -151,12 +154,16 @@ endif 
INCLUDES = -I. -I../include

CFLAGS += -DBUILDING_LIBCURL



ifdef SYNC

  CFLAGS += -DUSE_SYNC_DNS

else

  ifdef ARES

    INCLUDES += -I"$(LIBCARES_PATH)"

    CFLAGS += -DUSE_ARES -DCARES_STATICLIB

    DLL_LIBS += -L"$(LIBCARES_PATH)" -lcares

    libcurl_dll_DEPENDENCIES = $(LIBCARES_PATH)/libcares.a

  endif

endif

ifdef RTMP

  INCLUDES += -I"$(LIBRTMP_PATH)"

  CFLAGS += -DUSE_LIBRTMP

lib/config-win32.h

+3 −4
Original line number Diff line number Diff line
@@ -611,11 +611,10 @@ 
/* Define to enable c-ares asynchronous DNS lookups. */

/* #define USE_ARES 1 */



/* Define to enable threaded asynchronous DNS lookups. */

#if !defined(USE_ARES) && !defined(USE_THREADS_WIN32)

/* Default define to enable threaded asynchronous DNS lookups. */

#if !defined(USE_SYNC_DNS) && !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)

src/Makefile.m32

+12 −5
Original line number Diff line number Diff line
@@ -120,6 +120,9 @@ endif 
ifeq ($(findstring -ares,$(CFG)),-ares)

ARES = 1

endif

ifeq ($(findstring -sync,$(CFG)),-sync)

SYNC = 1

endif

ifeq ($(findstring -rtmp,$(CFG)),-rtmp)

RTMP = 1

SSL = 1
@@ -173,6 +176,9 @@ else 
  CFLAGS += -DCURL_STATICLIB

  LDFLAGS += -static

endif

ifdef SYNC

  CFLAGS += -DUSE_SYNC_DNS

else

  ifdef ARES

    ifndef DYN

      curl_DEPENDENCIES += $(LIBCARES_PATH)/libcares.a
@@ -180,6 +186,7 @@ ifdef ARES 
    CFLAGS += -DUSE_ARES -DCARES_STATICLIB

    curl_LDADD += -L"$(LIBCARES_PATH)" -lcares

  endif

endif

ifdef RTMP

  CFLAGS += -DUSE_LIBRTMP

  curl_LDADD += -L"$(LIBRTMP_PATH)/librtmp" -lrtmp -lwinmm