Commit 72f92a88 authored by Igor Zlatkovic's avatar Igor Zlatkovic

applied the BCB patch by Eric Zurcher

parent d7cec926
Sat Jun 14 18:46:51 CEST 2003 Igor Zlatkovic <igor@zlatkovic.com>
* win32/configure.js include/win32config.h
include/libxml/xmlversion.h.in: Applied the patch for BCB
by Eric Zurcher.
Fri Jun 13 14:27:19 CEST 2003 Daniel Veillard <daniel@veillard.com>
* doc/Makefile.am doc/html/*: reverted back patch for #113521,
......
......@@ -76,7 +76,7 @@ extern void xmlCheckVersion(int version);
* Whether the thread support is configured in
*/
#if @WITH_THREADS@
#if defined(_REENTRANT) || (_POSIX_C_SOURCE - 0 >= 199506L)
#if defined(_REENTRANT) || defined(__MT__) || (_POSIX_C_SOURCE - 0 >= 199506L)
#define LIBXML_THREAD_ENABLED
#endif
#endif
......@@ -241,7 +241,7 @@ extern void xmlCheckVersion(int version);
* code which links against libxml statically.
*/
#ifndef LIBXML_DLL_IMPORT
#if (defined(_MSC_VER) || defined(__CYGWIN__)) && !defined(IN_LIBXML) && !defined(LIBXML_STATIC)
#if (defined(_MSC_VER) || defined(__BORLANDC__) || defined(__CYGWIN__)) && !defined(IN_LIBXML) && !defined(LIBXML_STATIC)
#define LIBXML_DLL_IMPORT __declspec(dllimport)
#else
#define LIBXML_DLL_IMPORT
......
......@@ -30,7 +30,7 @@
#define HAVE_ISINF
#define HAVE_ISNAN
#include <math.h>
#ifdef _MSC_VER
#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
......
......@@ -112,7 +112,7 @@ function usage()
txt += " schemas: Enable XML Schema support (" + (withSchemas? "yes" : "no") + ")\n";
txt += " python: Build Python bindings (" + (withPython? "yes" : "no") + ")\n";
txt += "\nWin32 build options, default value given in parentheses:\n\n";
txt += " compiler: Compiler to be used [msvc|mingw] (" + compiler + ")\n";
txt += " compiler: Compiler to be used [msvc|mingw|bcb] (" + compiler + ")\n";
txt += " debug: Build unoptimised debug executables (" + (buildDebug? "yes" : "no") + ")\n";
txt += " static: Link xmllint statically to libxml2 (" + (buildStatic? "yes" : "no") + ")\n";
txt += " prefix: Base directory for the installation (" + buildPrefix + ")\n";
......@@ -143,6 +143,8 @@ function discoverVersion()
versionFile = ".\\config.msvc";
else if (compiler == "mingw")
versionFile = ".\\config.mingw";
else if (compiler == "bcb")
versionFile = ".\\config.bcb";
vf = fso.CreateTextFile(versionFile, true);
vf.WriteLine("# " + versionFile);
vf.WriteLine("# This file is generated automatically by " + WScript.ScriptName + ".");
......@@ -197,6 +199,10 @@ function discoverVersion()
vf.WriteLine("INCLUDE+=;" + buildInclude);
vf.WriteLine("LIB+=;" + buildLib);
}
} else if (compiler == "bcb") {
vf.WriteLine("INCLUDE=" + buildInclude);
vf.WriteLine("LIB=" + buildLib);
}
vf.Close();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment