[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.3

version 1.1.1.1, 2012/02/21 23:37:58 version 1.1.1.3, 2014/06/15 19:53:38
Line 43  CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT" Line 43  CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT"
   
 # The compiler and its options.  # The compiler and its options.
 CC = cl.exe  CC = cl.exe
CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS"  /D "NOLIBTOOL" /W1 $(CRUNTIME)CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "HAVE_CONFIG_H" /D "NOLIBTOOL" /W1 $(CRUNTIME)
 CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX)  CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX)
 !if "$(WITH_THREADS)" != "no"  !if "$(WITH_THREADS)" != "no"
 CFLAGS = $(CFLAGS) /D "_REENTRANT"  CFLAGS = $(CFLAGS) /D "_REENTRANT"
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.
XML_OBJS = $(XML_INTDIR)\c14n.obj\XML_OBJS = $(XML_INTDIR)\buf.obj\
         $(XML_INTDIR)\c14n.obj\
         $(XML_INTDIR)\catalog.obj\          $(XML_INTDIR)\catalog.obj\
         $(XML_INTDIR)\chvalid.obj\          $(XML_INTDIR)\chvalid.obj\
         $(XML_INTDIR)\debugXML.obj\          $(XML_INTDIR)\debugXML.obj\
Line 143  XML_OBJS = $(XML_INTDIR)\c14n.obj\ Line 154  XML_OBJS = $(XML_INTDIR)\c14n.obj\
         $(XML_INTDIR)\xmlstring.obj          $(XML_INTDIR)\xmlstring.obj
   
 # Static libxml object files.  # Static libxml object files.
XML_OBJS_A = $(XML_INTDIR_A)\c14n.obj\XML_OBJS_A = $(XML_INTDIR_A)\buf.obj\
         $(XML_INTDIR_A)\c14n.obj\
         $(XML_INTDIR_A)\catalog.obj\          $(XML_INTDIR_A)\catalog.obj\
         $(XML_INTDIR_A)\chvalid.obj\          $(XML_INTDIR_A)\chvalid.obj\
         $(XML_INTDIR_A)\debugXML.obj\          $(XML_INTDIR_A)\debugXML.obj\
Line 188  XML_OBJS_A = $(XML_INTDIR_A)\c14n.obj\ Line 200  XML_OBJS_A = $(XML_INTDIR_A)\c14n.obj\
         $(XML_INTDIR_A)\xmlstring.obj          $(XML_INTDIR_A)\xmlstring.obj
   
 # Static libxml object files.  # Static libxml object files.
XML_OBJS_A_DLL = $(XML_INTDIR_A_DLL)\c14n.obj\XML_OBJS_A_DLL = $(XML_INTDIR_A_DLL)\buf.obj\
         $(XML_INTDIR_A_DLL)\c14n.obj\
         $(XML_INTDIR_A_DLL)\catalog.obj\          $(XML_INTDIR_A_DLL)\catalog.obj\
         $(XML_INTDIR_A_DLL)\chvalid.obj\          $(XML_INTDIR_A_DLL)\chvalid.obj\
         $(XML_INTDIR_A_DLL)\debugXML.obj\          $(XML_INTDIR_A_DLL)\debugXML.obj\
Line 249  UTILS = $(BINDIR)\xmllint.exe\ Line 262  UTILS = $(BINDIR)\xmllint.exe\
         $(BINDIR)\testXPath.exe\          $(BINDIR)\testXPath.exe\
         $(BINDIR)\runtest.exe\          $(BINDIR)\runtest.exe\
         $(BINDIR)\runsuite.exe\          $(BINDIR)\runsuite.exe\
        $(BINDIR)\testapi.exe        $(BINDIR)\testapi.exe\
         $(BINDIR)\testlimits.exe\
         $(BINDIR)\testrecurse.exe
                   
 !if "$(WITH_THREADS)" == "yes" || "$(WITH_THREADS)" == "ctls" || "$(WITH_THREADS)" == "native"  !if "$(WITH_THREADS)" == "yes" || "$(WITH_THREADS)" == "ctls" || "$(WITH_THREADS)" == "native"
 UTILS = $(UTILS) $(BINDIR)\testThreadsWin32.exe  UTILS = $(UTILS) $(BINDIR)\testThreadsWin32.exe
Line 289  distclean : clean Line 304  distclean : clean
 rebuild : clean all  rebuild : clean all
   
 install-libs : all  install-libs : all
        if not exist $(INCPREFIX)\libxml mkdir $(INCPREFIX)\libxml        if not exist $(INCPREFIX)\libxml2 mkdir $(INCPREFIX)\libxml2
         if not exist $(INCPREFIX)\libxml2\libxml mkdir $(INCPREFIX)\libxml2\libxml
         if not exist $(BINPREFIX) mkdir $(BINPREFIX)          if not exist $(BINPREFIX) mkdir $(BINPREFIX)
         if not exist $(LIBPREFIX) mkdir $(LIBPREFIX)          if not exist $(LIBPREFIX) mkdir $(LIBPREFIX)
         if not exist $(SOPREFIX) mkdir $(SOPREFIX)          if not exist $(SOPREFIX) mkdir $(SOPREFIX)
        copy $(XML_SRCDIR)\include\libxml\*.h $(INCPREFIX)\libxml        copy $(XML_SRCDIR)\include\libxml\*.h $(INCPREFIX)\libxml2\libxml
         copy $(BINDIR)\$(XML_SO) $(SOPREFIX)          copy $(BINDIR)\$(XML_SO) $(SOPREFIX)
         copy $(BINDIR)\$(XML_A) $(LIBPREFIX)          copy $(BINDIR)\$(XML_A) $(LIBPREFIX)
         copy $(BINDIR)\$(XML_A_DLL) $(LIBPREFIX)          copy $(BINDIR)\$(XML_A_DLL) $(LIBPREFIX)
Line 401  $(UTILS) : $(UTILS_INTDIR) $(BINDIR) libxml libxmla li Line 417  $(UTILS) : $(UTILS_INTDIR) $(BINDIR) libxml libxmla li
   
 # TESTS  # TESTS
   
tests :  XPathteststests : checktests XPathtests
 
 checktests : $(UTILS)
         cd .. && win32\$(BINDIR)\runtest.exe
         cd .. && win32\$(BINDIR)\testrecurse.exe
         cd .. && win32\$(BINDIR)\testapi.exe
         cd .. && win32\$(BINDIR)\testchar.exe
         cd .. && win32\$(BINDIR)\testdict.exe
         cd .. && win32\$(BINDIR)\runxmlconf.exe
   
 XPathtests : $(BINDIR)\testXPath.exe  XPathtests : $(BINDIR)\testXPath.exe
         @echo. 2> .memdump          @echo. 2> .memdump
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.3

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