diff options
Diffstat (limited to 'win32/Makefile.bcb')
| -rw-r--r-- | win32/Makefile.bcb | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/win32/Makefile.bcb b/win32/Makefile.bcb index 7129c61..d612e2d 100644 --- a/win32/Makefile.bcb +++ b/win32/Makefile.bcb @@ -68,9 +68,6 @@ CFLAGS = $(CFLAGS) -DHAVE_PTHREAD_H !if "$(WITH_ZLIB)" == "1" CFLAGS = $(CFLAGS) -DHAVE_ZLIB_H !endif -!if "$(WITH_LZMA)" == "1" -CFLAGS = $(CFLAGS) -DHAVE_LZMA_H -!endif # The linker and its options. LD = ilink32.exe @@ -95,9 +92,6 @@ LIBS = $(LIBS) iconvomf.lib !if "$(WITH_ZLIB)" == "1" LIBS = $(LIBS) zlibomf.lib !endif -!if "$(WITH_LZMA)" == "1" -LIBS = $(LIBS) liblzma.lib -!endif !if "$(WITH_THREADS)" == "posix" LIBS = $(LIBS) pthreadVC.lib !endif @@ -119,8 +113,7 @@ LDFLAGS = $(LDFLAGS) !endif # Libxml object files. -XML_OBJS = $(XML_INTDIR)\buf.obj\ - $(XML_INTDIR)\c14n.obj\ +XML_OBJS = $(XML_INTDIR)\c14n.obj\ $(XML_INTDIR)\catalog.obj\ $(XML_INTDIR)\chvalid.obj\ $(XML_INTDIR)\debugXML.obj\ @@ -165,8 +158,7 @@ XML_OBJS = $(XML_INTDIR)\buf.obj\ $(XML_INTDIR)\xmlstring.obj # Static libxml object files. -XML_OBJS_A = $(XML_INTDIR_A)\buf.obj\ - $(XML_INTDIR_A)\c14n.obj\ +XML_OBJS_A = $(XML_INTDIR_A)\c14n.obj\ $(XML_INTDIR_A)\catalog.obj\ $(XML_INTDIR_A)\chvalid.obj\ $(XML_INTDIR_A)\debugXML.obj\ @@ -227,8 +219,7 @@ UTILS = $(BINDIR)\xmllint.exe\ $(BINDIR)\testXPath.exe\ $(BINDIR)\runtest.exe\ $(BINDIR)\runsuite.exe\ - $(BINDIR)\testapi.exe\ - $(BINDIR)\testlimits.exe + $(BINDIR)\testapi.exe !if "$(WITH_THREADS)" == "yes" || "$(WITH_THREADS)" == "ctls" || "$(WITH_THREADS)" == "native" @@ -259,11 +250,10 @@ distclean : clean rebuild : clean all install-libs : all - if not exist "$(INCPREFIX)\libxml2" mkdir "$(INCPREFIX)\libxml2" - if not exist "$(INCPREFIX)\libxml2\libxml" mkdir "$(INCPREFIX)\libxml2\libxml" + if not exist "$(INCPREFIX)\libxml" mkdir "$(INCPREFIX)\libxml" if not exist "$(BINPREFIX)" mkdir "$(BINPREFIX)" if not exist "$(LIBPREFIX)" mkdir "$(LIBPREFIX)" - copy $(XML_SRCDIR)\include\libxml\*.h "$(INCPREFIX)\libxml2\libxml" + copy $(XML_SRCDIR)\include\libxml\*.h "$(INCPREFIX)\libxml" copy $(BINDIR)\$(XML_SO) "$(SOPREFIX)" copy $(BINDIR)\$(XML_A) "$(LIBPREFIX)" copy $(BINDIR)\$(XML_IMP) "$(LIBPREFIX)" |