[BACK]Return to Makefile.mingw CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / libxml2 / win32

Diff for /embedaddon/libxml2/win32/Makefile.mingw between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 23:37:58 version 1.1.1.2, 2013/07/22 01:22:29
Line 41  endif Line 41  endif
 # The compiler and its options.  # The compiler and its options.
 CC = gcc.exe  CC = gcc.exe
 CFLAGS += -DWIN32 -D_WINDOWS -D_MBCS -DNOLIBTOOL   CFLAGS += -DWIN32 -D_WINDOWS -D_MBCS -DNOLIBTOOL 
CFLAGS += -I$(XML_SRCDIR) -I$(XML_SRCDIR)/include -I$(INCPREFIX)CFLAGS += -I$(XML_SRCDIR) -I$(XML_SRCDIR)/include -I$(INCPREFIX) $(INCLUDE)
 ifneq ($(WITH_THREADS),no)  ifneq ($(WITH_THREADS),no)
 CFLAGS += -D_REENTRANT  CFLAGS += -D_REENTRANT
 endif  endif
Line 66  LD = gcc.exe Line 66  LD = gcc.exe
 LDFLAGS += -Wl,--major-image-version,$(LIBXML_MAJOR_VERSION)  LDFLAGS += -Wl,--major-image-version,$(LIBXML_MAJOR_VERSION)
 LDFLAGS += -Wl,--minor-image-version,$(LIBXML_MINOR_VERSION)  LDFLAGS += -Wl,--minor-image-version,$(LIBXML_MINOR_VERSION)
 LDFLAGS += -Wl,-L,$(BINDIR) -Wl,-L,$(LIBPREFIX)  LDFLAGS += -Wl,-L,$(BINDIR) -Wl,-L,$(LIBPREFIX)
LIBS = LIBS =
 ifeq ($(WITH_FTP),1)  ifeq ($(WITH_FTP),1)
 CFLAGS += -D_WINSOCKAPI_  CFLAGS += -D_WINSOCKAPI_
LIBS += -lwsock32LIBS += -lwsock32 -lws2_32
 endif   endif 
 ifeq ($(WITH_HTTP),1)  ifeq ($(WITH_HTTP),1)
 CFLAGS += -D_WINSOCKAPI_  CFLAGS += -D_WINSOCKAPI_
LIBS += -lwsock32LIBS += -lwsock32 -lws2_32
 endif   endif 
 ifeq ($(WITH_ICONV),1)  ifeq ($(WITH_ICONV),1)
 LIBS += -liconv  LIBS += -liconv
 endif   endif 
 ifeq ($(WITH_ZLIB),1)  ifeq ($(WITH_ZLIB),1)
LIBS += -lzdll# Could be named differently
 # LIBS += -lzdll
 LIBS += -lz
 endif  endif
 ifeq ($(WITH_THREADS),posix)  ifeq ($(WITH_THREADS),posix)
 LIBS += -lpthreadGC  LIBS += -lpthreadGC
Line 87  endif Line 89  endif
 ifeq ($(WITH_MODULES),1)  ifeq ($(WITH_MODULES),1)
 LIBS += -lkernel32  LIBS += -lkernel32
 endif  endif
   
   LIBS += $(LIB)
   
 # The archiver and its options.  # The archiver and its options.
 AR = ar.exe  AR = ar.exe
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>