From d7372d053bbd1d58216fbb04d1771ffa4cc3e624 Mon Sep 17 00:00:00 2001 From: Aron Xu Date: Fri, 25 May 2012 04:03:35 +0000 Subject: Imported Upstream version 2.8.0+dfsg1 --- win32/Makefile.mingw | 14 ++- win32/Makefile.msvc | 20 +++- win32/VC10/README.vc10 | 27 ++++++ win32/VC10/RuleSet1.ruleset | 3 + win32/VC10/config.h | 125 ++++++++++++++++++++++++ win32/VC10/libxml2-focus.vcxproj | 184 ++++++++++++++++++++++++++++++++++++ win32/VC10/libxml2.sln | 49 ++++++++++ win32/VC10/libxml2.vcxproj | 136 ++++++++++++++++++++++++++ win32/VC10/libxml2.vcxproj.filters | 171 +++++++++++++++++++++++++++++++++ win32/VC10/runsuite.vcxproj | 85 +++++++++++++++++ win32/VC10/runsuite.vcxproj.filters | 22 +++++ win32/configure.js | 14 ++- 12 files changed, 837 insertions(+), 13 deletions(-) create mode 100644 win32/VC10/README.vc10 create mode 100644 win32/VC10/RuleSet1.ruleset create mode 100644 win32/VC10/config.h create mode 100644 win32/VC10/libxml2-focus.vcxproj create mode 100644 win32/VC10/libxml2.sln create mode 100644 win32/VC10/libxml2.vcxproj create mode 100644 win32/VC10/libxml2.vcxproj.filters create mode 100644 win32/VC10/runsuite.vcxproj create mode 100644 win32/VC10/runsuite.vcxproj.filters (limited to 'win32') diff --git a/win32/Makefile.mingw b/win32/Makefile.mingw index a689f31..0f8198b 100644 --- a/win32/Makefile.mingw +++ b/win32/Makefile.mingw @@ -41,7 +41,7 @@ endif # The compiler and its options. CC = gcc.exe CFLAGS += -DWIN32 -D_WINDOWS -D_MBCS -DNOLIBTOOL -CFLAGS += -I$(XML_SRCDIR) -I$(XML_SRCDIR)/include -I$(INCPREFIX) +CFLAGS += -I$(XML_SRCDIR) -I$(XML_SRCDIR)/include -I$(INCPREFIX) $(INCLUDE) ifneq ($(WITH_THREADS),no) CFLAGS += -D_REENTRANT endif @@ -66,20 +66,22 @@ LD = gcc.exe LDFLAGS += -Wl,--major-image-version,$(LIBXML_MAJOR_VERSION) LDFLAGS += -Wl,--minor-image-version,$(LIBXML_MINOR_VERSION) LDFLAGS += -Wl,-L,$(BINDIR) -Wl,-L,$(LIBPREFIX) -LIBS = +LIBS = ifeq ($(WITH_FTP),1) CFLAGS += -D_WINSOCKAPI_ -LIBS += -lwsock32 +LIBS += -lwsock32 -lws2_32 endif ifeq ($(WITH_HTTP),1) CFLAGS += -D_WINSOCKAPI_ -LIBS += -lwsock32 +LIBS += -lwsock32 -lws2_32 endif ifeq ($(WITH_ICONV),1) LIBS += -liconv endif ifeq ($(WITH_ZLIB),1) -LIBS += -lzdll +# Could be named differently +# LIBS += -lzdll +LIBS += -lz endif ifeq ($(WITH_THREADS),posix) LIBS += -lpthreadGC @@ -88,6 +90,8 @@ ifeq ($(WITH_MODULES),1) LIBS += -lkernel32 endif +LIBS += $(LIB) + # The archiver and its options. AR = ar.exe ARFLAGS = -r 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. diff --git a/win32/VC10/README.vc10 b/win32/VC10/README.vc10 new file mode 100644 index 0000000..4805bdc --- /dev/null +++ b/win32/VC10/README.vc10 @@ -0,0 +1,27 @@ + +README file for VC10 project files for libxml2 +---------------------------------------------- + +to clarify: This is not the readme file for the whole libxml2 project. +Rather, it's a readme for the VC10 project files, attached to the libxml2 proejct. + +Quick Start +----------- + +1) To use, load the libxml2.sln solution file into visual studio +2) check and correct paths for dependent "iconv" project which most certaily +are wrong on your environment. +3) Compile all projects + + +Background Info +--------------- + +Running of "configure.sh" won't make sense since VS doesn't support +this kind of build system and the environment is pretty much known already +if you're using Visual Studio. Instead, a preconfigured "config.h" file +is provided in the "win32\VC10" directory and referenced by the project +files already. + +The compile process is not completely warning-free: Some warnings will +appear during compile which can be ignored. diff --git a/win32/VC10/RuleSet1.ruleset b/win32/VC10/RuleSet1.ruleset new file mode 100644 index 0000000..9985a6c --- /dev/null +++ b/win32/VC10/RuleSet1.ruleset @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/win32/VC10/config.h b/win32/VC10/config.h new file mode 100644 index 0000000..8629944 --- /dev/null +++ b/win32/VC10/config.h @@ -0,0 +1,125 @@ +#ifndef __LIBXML_WIN32_CONFIG__ +#define __LIBXML_WIN32_CONFIG__ + +#define HAVE_CTYPE_H +#define HAVE_STDARG_H +#define HAVE_MALLOC_H +#define HAVE_ERRNO_H +#define HAVE_STDINT_H + +#if defined(_WIN32_WCE) +#undef HAVE_ERRNO_H +#include +#include "wincecompat.h" +#else +#define HAVE_SYS_STAT_H +#define HAVE__STAT +#define HAVE_STAT +#define HAVE_STDLIB_H +#define HAVE_TIME_H +#define HAVE_FCNTL_H +#include +#include +#endif + +#include + +#ifndef ICONV_CONST +#define ICONV_CONST const +#endif + +#ifdef NEED_SOCKETS +#include +#endif + +/* + * Windows platforms may define except + */ +#undef except + +#define HAVE_ISINF +#define HAVE_ISNAN +#include +#if defined(_MSC_VER) || defined(__BORLANDC__) +/* MS C-runtime has functions which can be used in order to determine if + a given floating-point variable contains NaN, (+-)INF. These are + preferred, because floating-point technology is considered propriatary + by MS and we can assume that their functions know more about their + oddities than we do. */ +#include +/* Bjorn Reese figured a quite nice construct for isinf() using the _fpclass + function. */ +#ifndef isinf +#define isinf(d) ((_fpclass(d) == _FPCLASS_PINF) ? 1 \ + : ((_fpclass(d) == _FPCLASS_NINF) ? -1 : 0)) +#endif +/* _isnan(x) returns nonzero if (x == NaN) and zero otherwise. */ +#ifndef isnan +#define isnan(d) (_isnan(d)) +#endif +#else /* _MSC_VER */ +#ifndef isinf +static int isinf (double d) { + int expon = 0; + double val = frexp (d, &expon); + if (expon == 1025) { + if (val == 0.5) { + return 1; + } else if (val == -0.5) { + return -1; + } else { + return 0; + } + } else { + return 0; + } +} +#endif +#ifndef isnan +static int isnan (double d) { + int expon = 0; + double val = frexp (d, &expon); + if (expon == 1025) { + if (val == 0.5) { + return 0; + } else if (val == -0.5) { + return 0; + } else { + return 1; + } + } else { + return 0; + } +} +#endif +#endif /* _MSC_VER */ + +#if defined(_MSC_VER) +#define mkdir(p,m) _mkdir(p) +#define snprintf _snprintf +#if _MSC_VER < 1500 +#define vsnprintf(b,c,f,a) _vsnprintf(b,c,f,a) +#endif +#elif defined(__MINGW32__) +#define mkdir(p,m) _mkdir(p) +#endif + +/* Threading API to use should be specified here for compatibility reasons. + This is however best specified on the compiler's command-line. */ +#if defined(LIBXML_THREAD_ENABLED) +#if !defined(HAVE_PTHREAD_H) && !defined(HAVE_WIN32_THREADS) && !defined(_WIN32_WCE) +#define HAVE_WIN32_THREADS +#endif +#endif + +/* Some third-party libraries far from our control assume the following + is defined, which it is not if we don't include windows.h. */ +#if !defined(FALSE) +#define FALSE 0 +#endif +#if !defined(TRUE) +#define TRUE (!(FALSE)) +#endif + +#endif /* __LIBXML_WIN32_CONFIG__ */ + diff --git a/win32/VC10/libxml2-focus.vcxproj b/win32/VC10/libxml2-focus.vcxproj new file mode 100644 index 0000000..914ce25 --- /dev/null +++ b/win32/VC10/libxml2-focus.vcxproj @@ -0,0 +1,184 @@ + + + + + Debug DLL + Win32 + + + Debug + Win32 + + + Release DLL + Win32 + + + Release + Win32 + + + + {7EA50C94-26BD-4893-B773-625CD3D3DEA6} + libxml2 + + + + StaticLibrary + true + Unicode + + + StaticLibrary + true + Unicode + + + StaticLibrary + false + true + Unicode + + + StaticLibrary + Unicode + true + + + + + + + + + + + + + + + + + + + + + + $(ProjectDir)..\..\lib\ + + + $(ProjectDir)..\..\lib\ + + + + + $(ProjectDir)..\..\lib\ + + + $(ProjectDir)..\..\lib\ + + + + Level3 + Disabled + $(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libiconv-1.14\include + 4018; 4996 + /MP %(AdditionalOptions) + false + + + true + + + + + Level3 + Disabled + $(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libiconv-1.14\include + 4018; 4996 + /MP %(AdditionalOptions) + false + + + true + + + + + Level3 + MaxSpeed + true + true + /MP %(AdditionalOptions) + $(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libiconv-1.14\include + 4018; 4996 + + + true + true + true + + + + + /MP %(AdditionalOptions) + $(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libiconv-1.14\include + 4018; 4996 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/win32/VC10/libxml2.sln b/win32/VC10/libxml2.sln new file mode 100644 index 0000000..8485751 --- /dev/null +++ b/win32/VC10/libxml2.sln @@ -0,0 +1,49 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libxml2", "libxml2.vcxproj", "{1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runsuite", "runsuite.vcxproj", "{D841B4F7-C277-49CB-B379-8B1801C8EE35}" + ProjectSection(ProjectDependencies) = postProject + {BEC03130-A64C-48F8-863C-52DA83CFB3AE} = {BEC03130-A64C-48F8-863C-52DA83CFB3AE} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "iconv", "..\..\..\libiconv-1.14.vc10\windows\VC10\iconv.vcxproj", "{BEC03130-A64C-48F8-863C-52DA83CFB3AE}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug DLL|Win32 = Debug DLL|Win32 + Debug|Win32 = Debug|Win32 + Release DLL|Win32 = Release DLL|Win32 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug DLL|Win32.ActiveCfg = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug DLL|Win32.Build.0 = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|Win32.ActiveCfg = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Debug|Win32.Build.0 = Debug|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release DLL|Win32.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release DLL|Win32.Build.0 = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|Win32.ActiveCfg = Release|Win32 + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C}.Release|Win32.Build.0 = Release|Win32 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Debug DLL|Win32.ActiveCfg = Debug|Win32 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Debug DLL|Win32.Build.0 = Debug|Win32 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Debug|Win32.ActiveCfg = Debug|Win32 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Debug|Win32.Build.0 = Debug|Win32 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Release DLL|Win32.ActiveCfg = Release|Win32 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Release DLL|Win32.Build.0 = Release|Win32 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Release|Win32.ActiveCfg = Release|Win32 + {D841B4F7-C277-49CB-B379-8B1801C8EE35}.Release|Win32.Build.0 = Release|Win32 + {BEC03130-A64C-48F8-863C-52DA83CFB3AE}.Debug DLL|Win32.ActiveCfg = Debug DLL|Win32 + {BEC03130-A64C-48F8-863C-52DA83CFB3AE}.Debug DLL|Win32.Build.0 = Debug DLL|Win32 + {BEC03130-A64C-48F8-863C-52DA83CFB3AE}.Debug|Win32.ActiveCfg = Debug|Win32 + {BEC03130-A64C-48F8-863C-52DA83CFB3AE}.Debug|Win32.Build.0 = Debug|Win32 + {BEC03130-A64C-48F8-863C-52DA83CFB3AE}.Release DLL|Win32.ActiveCfg = Release DLL|Win32 + {BEC03130-A64C-48F8-863C-52DA83CFB3AE}.Release DLL|Win32.Build.0 = Release DLL|Win32 + {BEC03130-A64C-48F8-863C-52DA83CFB3AE}.Release|Win32.ActiveCfg = Release|Win32 + {BEC03130-A64C-48F8-863C-52DA83CFB3AE}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/win32/VC10/libxml2.vcxproj b/win32/VC10/libxml2.vcxproj new file mode 100644 index 0000000..0d5a1bc --- /dev/null +++ b/win32/VC10/libxml2.vcxproj @@ -0,0 +1,136 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {1D6039F6-5078-416F-A3AF-A36EFC7E6A1C} + libxml2 + + + + StaticLibrary + true + Unicode + + + Application + false + true + MultiByte + + + + + + + + + + + + + $(ProjectDir)..\..\lib\ + + + build\$(ProjectName)$(Configuration)\ + + + + Level3 + Disabled + $(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libiconv-1.14.vc10\include;%(AdditionalIncludeDirectories) + 4996 + false + true + + + true + + + + + Level3 + MaxSpeed + true + true + + + true + true + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {bec03130-a64c-48f8-863c-52da83cfb3ae} + true + true + false + true + false + + + + + + \ No newline at end of file diff --git a/win32/VC10/libxml2.vcxproj.filters b/win32/VC10/libxml2.vcxproj.filters new file mode 100644 index 0000000..e8e7af3 --- /dev/null +++ b/win32/VC10/libxml2.vcxproj.filters @@ -0,0 +1,171 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {22791c14-7c07-4222-ad58-8c18d3fb10ba} + + + {bfddc99f-05d4-4f06-98d1-346b1be73d6f} + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files\windows\VC10 + + + Header Files + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/win32/VC10/runsuite.vcxproj b/win32/VC10/runsuite.vcxproj new file mode 100644 index 0000000..b4ccc37 --- /dev/null +++ b/win32/VC10/runsuite.vcxproj @@ -0,0 +1,85 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + + {D841B4F7-C277-49CB-B379-8B1801C8EE35} + runsuite + + + + Application + true + Unicode + + + Application + false + true + MultiByte + + + + + + + + + + + + + $(ProjectDir)..\..\lib\ + build\$(ProjectName)$(Configuration)\ + + + + Level3 + Disabled + $(ProjectDir);$(ProjectDir)..\..\include;$(ProjectDir)..\..\..\libiconv-1.14.vc10\include;%(AdditionalIncludeDirectories) + 4996 + HAVE_CONFIG_H;_UNICODE;UNICODE;%(PreprocessorDefinitions) + /MP %(AdditionalOptions) + false + + + true + Ws2_32.lib;%(AdditionalDependencies) + + + + + Level3 + MaxSpeed + true + true + + + true + true + true + + + + + + + + {bec03130-a64c-48f8-863c-52da83cfb3ae} + + + {1d6039f6-5078-416f-a3af-a36efc7e6a1c} + + + + + + \ No newline at end of file diff --git a/win32/VC10/runsuite.vcxproj.filters b/win32/VC10/runsuite.vcxproj.filters new file mode 100644 index 0000000..d7dce00 --- /dev/null +++ b/win32/VC10/runsuite.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + \ No newline at end of file diff --git a/win32/configure.js b/win32/configure.js index 342fd9d..11d2898 100644 --- a/win32/configure.js +++ b/win32/configure.js @@ -43,6 +43,7 @@ var withIconv = true; var withIcu = false; var withIso8859x = false; var withZlib = false; +var withLzma = false; var withDebug = true; var withMemDebug = false; var withRunDebug = false; @@ -128,6 +129,7 @@ function usage() txt += " icu: Enable icu support (" + (withIcu? "yes" : "no") + ")\n"; txt += " iso8859x: Enable ISO8859X support (" + (withIso8859x? "yes" : "no") + ")\n"; txt += " zlib: Enable zlib support (" + (withZlib? "yes" : "no") + ")\n"; + txt += " lzma: Enable lzma support (" + (withLzma? "yes" : "no") + ")\n"; txt += " xml_debug: Enable XML debbugging module (" + (withDebug? "yes" : "no") + ")\n"; txt += " mem_debug: Enable memory debugger (" + (withMemDebug? "yes" : "no") + ")\n"; txt += " run_debug: Enable memory debugger (" + (withRunDebug? "yes" : "no") + ")\n"; @@ -238,6 +240,7 @@ function discoverVersion() vf.WriteLine("WITH_ICU=" + (withIcu? "1" : "0")); vf.WriteLine("WITH_ISO8859X=" + (withIso8859x? "1" : "0")); vf.WriteLine("WITH_ZLIB=" + (withZlib? "1" : "0")); + vf.WriteLine("WITH_LZMA=" + (withLzma? "1" : "0")); vf.WriteLine("WITH_DEBUG=" + (withDebug? "1" : "0")); vf.WriteLine("WITH_MEM_DEBUG=" + (withMemDebug? "1" : "0")); vf.WriteLine("WITH_RUN_DEBUG=" + (withRunDebug? "1" : "0")); @@ -269,8 +272,8 @@ function discoverVersion() vf.WriteLine("CRUNTIME=" + cruntime); vf.WriteLine("VCMANIFEST=" + (vcmanifest? "1" : "0")); } else if (compiler == "mingw") { - vf.WriteLine("INCLUDE+=;" + buildInclude); - vf.WriteLine("LIB+=;" + buildLib); + vf.WriteLine("INCLUDE+= -I" + buildInclude); + vf.WriteLine("LIB+= -L" + buildLib); } else if (compiler == "bcb") { vf.WriteLine("INCLUDE=" + buildInclude); vf.WriteLine("LIB=" + buildLib); @@ -328,6 +331,8 @@ function configureLibxml() of.WriteLine(s.replace(/\@WITH_ISO8859X\@/, withIso8859x? "1" : "0")); } else if (s.search(/\@WITH_ZLIB\@/) != -1) { of.WriteLine(s.replace(/\@WITH_ZLIB\@/, withZlib? "1" : "0")); + } else if (s.search(/\@WITH_LZMA\@/) != -1) { + of.WriteLine(s.replace(/\@WITH_LZMA\@/, withLzma? "1" : "0")); } else if (s.search(/\@WITH_DEBUG\@/) != -1) { of.WriteLine(s.replace(/\@WITH_DEBUG\@/, withDebug? "1" : "0")); } else if (s.search(/\@WITH_MEM_DEBUG\@/) != -1) { @@ -473,6 +478,8 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) { withIso8859x = strToBool(arg.substring(opt.length + 1, arg.length)); else if (opt == "zlib") withZlib = strToBool(arg.substring(opt.length + 1, arg.length)); + else if (opt == "lzma") + withLzma = strToBool(arg.substring(opt.length + 1, arg.length)); else if (opt == "xml_debug") withDebug = strToBool(arg.substring(opt.length + 1, arg.length)); else if (opt == "mem_debug") @@ -579,7 +586,7 @@ if (buildIncPrefix == "") if (buildLibPrefix == "") buildLibPrefix = "$(PREFIX)" + dirSep + "lib"; if (buildSoPrefix == "") - buildSoPrefix = "$(PREFIX)" + dirSep + "lib"; + buildSoPrefix = "$(PREFIX)" + dirSep + "bin"; // Discover the version. discoverVersion(); @@ -656,6 +663,7 @@ txtOut += " iconv support: " + boolToStr(withIconv) + "\n"; txtOut += " icu support: " + boolToStr(withIcu) + "\n"; txtOut += " iso8859x support: " + boolToStr(withIso8859x) + "\n"; txtOut += " zlib support: " + boolToStr(withZlib) + "\n"; +txtOut += " lzma support: " + boolToStr(withLzma) + "\n"; txtOut += " Debugging module: " + boolToStr(withDebug) + "\n"; txtOut += " Memory debugging: " + boolToStr(withMemDebug) + "\n"; txtOut += " Runtime debugging: " + boolToStr(withRunDebug) + "\n"; -- cgit v1.2.3