Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(52)

Side by Side Diff: third_party/libxml/win32/Makefile.msvc

Issue 2951008: Update libxml to 2.7.7. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Makefile for libxml2, specific for Windows, MSVC and NMAKE. 1 # Makefile for libxml2, specific for Windows, MSVC and NMAKE.
2 # 2 #
3 # Take a look at the beginning and modify the variables to suit your 3 # Take a look at the beginning and modify the variables to suit your
4 # environment. Having done that, you can do a 4 # environment. Having done that, you can do a
5 # 5 #
6 # nmake [all] to build the libxml and the accompanying utilities. 6 # nmake [all] to build the libxml and the accompanying utilities.
7 # nmake clean to remove all compiler output files and return to a 7 # nmake clean to remove all compiler output files and return to a
8 # clean state. 8 # clean state.
9 # nmake rebuild to rebuild everything from scratch. This basically does 9 # nmake rebuild to rebuild everything from scratch. This basically does
10 # a 'nmake clean' and then a 'nmake all'. 10 # a 'nmake clean' and then a 'nmake all'.
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 LD = link.exe 64 LD = link.exe
65 LDFLAGS = /nologo /VERSION:$(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION) 65 LDFLAGS = /nologo /VERSION:$(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION)
66 LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX) 66 LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX)
67 LIBS = 67 LIBS =
68 !if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1" 68 !if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1"
69 LIBS = $(LIBS) wsock32.lib ws2_32.lib 69 LIBS = $(LIBS) wsock32.lib ws2_32.lib
70 !endif 70 !endif
71 !if "$(WITH_ICONV)" == "1" 71 !if "$(WITH_ICONV)" == "1"
72 LIBS = $(LIBS) iconv.lib 72 LIBS = $(LIBS) iconv.lib
73 !endif 73 !endif
74 +!if "$(WITH_ICU)" == "1"
75 +LIBS = $(LIBS) icu.lib
76 +!endif
77 !if "$(WITH_ZLIB)" == "1" 74 !if "$(WITH_ZLIB)" == "1"
78 LIBS = $(LIBS) zdll.lib 75 LIBS = $(LIBS) zdll.lib
79 !endif 76 !endif
80 !if "$(WITH_THREADS)" == "posix" 77 !if "$(WITH_THREADS)" == "posix"
81 LIBS = $(LIBS) pthreadVC.lib 78 LIBS = $(LIBS) pthreadVC.lib
82 !endif 79 !endif
83 !if "$(WITH_MODULES)" == "1" 80 !if "$(WITH_MODULES)" == "1"
84 LIBS = $(LIBS) kernel32.lib 81 LIBS = $(LIBS) kernel32.lib
85 !endif 82 !endif
86 83
(...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 fc result.%%~nxI result2.%%~nxI & \ 453 fc result.%%~nxI result2.%%~nxI & \
457 del result.%%~nxI result2.%%~nxI\ 454 del result.%%~nxI result2.%%~nxI\
458 ) \ 455 ) \
459 ) 456 )
460 457
461 458
462 459
463 460
464 461
465 462
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698