diff options
Diffstat (limited to 'win32/Makefile.msvc')
| -rw-r--r-- | win32/Makefile.msvc | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc index bd0eb9d..cc93372 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc @@ -58,6 +58,9 @@ CFLAGS = $(CFLAGS) /D "HAVE_PTHREAD_H" !if "$(WITH_ZLIB)" == "1" CFLAGS = $(CFLAGS) /D "HAVE_ZLIB_H" !endif +!if "$(WITH_LZMA)" == "1" +CFLAGS = $(CFLAGS) /D "HAVE_LZMA_H" +!endif CFLAGS = $(CFLAGS) /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE # The linker and its options. @@ -71,11 +74,16 @@ LIBS = $(LIBS) wsock32.lib ws2_32.lib !if "$(WITH_ICONV)" == "1" LIBS = $(LIBS) iconv.lib !endif -+!if "$(WITH_ICU)" == "1" -+LIBS = $(LIBS) icu.lib -+!endif +!if "$(WITH_ICU)" == "1" +LIBS = $(LIBS) icu.lib +!endif !if "$(WITH_ZLIB)" == "1" -LIBS = $(LIBS) zdll.lib +# could be named differently zdll or zlib +# LIBS = $(LIBS) zdll.lib +LIBS = $(LIBS) zlib.lib +!endif +!if "$(WITH_LZMA)" == "1" +LIBS = $(LIBS) liblzma.lib !endif !if "$(WITH_THREADS)" == "posix" LIBS = $(LIBS) pthreadVC.lib @@ -94,7 +102,9 @@ CFLAGS = $(CFLAGS) /D "_DEBUG" /Od /Z7 LDFLAGS = $(LDFLAGS) /DEBUG !else 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 # Libxml object files. |