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

Diff for /embedaddon/libxml2/win32/Makefile.msvc 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 58  CFLAGS = $(CFLAGS) /D "HAVE_PTHREAD_H" Line 58  CFLAGS = $(CFLAGS) /D "HAVE_PTHREAD_H"
 !if "$(WITH_ZLIB)" == "1"  !if "$(WITH_ZLIB)" == "1"
 CFLAGS = $(CFLAGS) /D "HAVE_ZLIB_H"  CFLAGS = $(CFLAGS) /D "HAVE_ZLIB_H"
 !endif  !endif
   !if "$(WITH_LZMA)" == "1"
   CFLAGS = $(CFLAGS) /D "HAVE_LZMA_H"
   !endif
 CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE  CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE
   
 # The linker and its options.  # The linker and its options.
Line 71  LIBS = $(LIBS) wsock32.lib ws2_32.lib Line 74  LIBS = $(LIBS) wsock32.lib ws2_32.lib
 !if "$(WITH_ICONV)" == "1"  !if "$(WITH_ICONV)" == "1"
 LIBS = $(LIBS) iconv.lib  LIBS = $(LIBS) iconv.lib
 !endif   !endif 
+!if "$(WITH_ICU)" == "1"!if "$(WITH_ICU)" == "1"
+LIBS = $(LIBS) icu.libLIBS = $(LIBS) icu.lib
+!endif!endif
 !if "$(WITH_ZLIB)" == "1"  !if "$(WITH_ZLIB)" == "1"
LIBS = $(LIBS) zdll.lib# could be named differently zdll or zlib
 # LIBS = $(LIBS) zdll.lib
 LIBS = $(LIBS) zlib.lib
 !endif  !endif
   !if "$(WITH_LZMA)" == "1"
   LIBS = $(LIBS) liblzma.lib
   !endif
 !if "$(WITH_THREADS)" == "posix"  !if "$(WITH_THREADS)" == "posix"
 LIBS = $(LIBS) pthreadVC.lib  LIBS = $(LIBS) pthreadVC.lib
 !endif  !endif
Line 94  CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7 Line 102  CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7
 LDFLAGS = $(LDFLAGS) /DEBUG  LDFLAGS = $(LDFLAGS) /DEBUG
 !else  !else
 CFLAGS = $(CFLAGS) /D "NDEBUG" /O2   CFLAGS = $(CFLAGS) /D "NDEBUG" /O2 
LDFLAGS = $(LDFLAGS) /OPT:NOWIN98# commented out as this break VC10 c.f. 634846
 # LDFLAGS = $(LDFLAGS) /OPT:NOWIN98
 LDFLAGS = $(LDFLAGS)
 !endif  !endif
   
 # Libxml object files.  # Libxml object files.
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

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