Applied the patch for BCB from Eric
diff --git a/win32/Makefile.bcb b/win32/Makefile.bcb
index f621194..3bf4571 100644
--- a/win32/Makefile.bcb
+++ b/win32/Makefile.bcb
@@ -15,10 +15,6 @@
# March 2002, Igor Zlatkovic <igor@zlatkovic.com>
#
-# Extra setting to control whether to use dynamic or static Borland runtime.
-# Set to "1" to use static RTL, anything else to use dynamic RTL
-STATIC_RTL = 0
-
# There should never be a need to modify anything below this line.
# ----------------------------------------------------------------
@@ -59,8 +55,8 @@
!if "$(WITH_THREADS)" != "no"
CFLAGS = $(CFLAGS) -D_REENTRANT -tWM
!endif
-!if "$(STATIC_RTL)" != "1"
-CFLAGS = $(CFLAGS) -D_RTLDLL
+!if "$(DYNRUNTIME)" == "1"
+CFLAGS = $(CFLAGS) -tWR
!endif
!if "$(WITH_THREADS)" == "yes" || "$(WITH_THREADS)" == "ctls"
CFLAGS = $(CFLAGS) -DHAVE_WIN32_THREADS -DHAVE_COMPILER_TLS
@@ -78,14 +74,14 @@
LDFLAGS = -q -U$(LIBXML_MAJOR_VERSION).$(LIBXML_MINOR_VERSION)
LDFLAGS = $(LDFLAGS) -L$(BINDIR);$(LIBPREFIX);$(LIB);$(BCB)\lib\PSdk
LIBS = import32.lib
-!if "$(WITH_THREADS)" != "no" && "$(STATIC_RTL)" == "1"
-LIBS = $(LIBS) cw32mt.lib
-!elif "$(WITH_THREADS)" != "no"
+!if "$(WITH_THREADS)" != "no" && "$(DYNRUNTIME)" == "1"
LIBS = $(LIBS) cw32mti.lib
-!elif "$(STATIC_RTL)" == "1"
-LIBS = $(LIBS) cw32.lib
-else
+!elif "$(WITH_THREADS)" != "no"
+LIBS = $(LIBS) cw32mt.lib
+!elif "$(DYNRUNTIME)" == "1"
LIBS = $(LIBS) cw32i.lib
+!else
+LIBS = $(LIBS) cw32.lib
!endif
!if "$(WITH_FTP)" == "1" || "$(WITH_HTTP)" == "1"
LIBS = $(LIBS) wsock32.lib
diff --git a/win32/configure.js b/win32/configure.js
index eaaf3fd..6c2ec90 100644
--- a/win32/configure.js
+++ b/win32/configure.js
@@ -58,6 +58,7 @@
var dirSep = "\\";
var compiler = "msvc";
var cruntime = "/MD";
+var dynruntime = true;
var buildDebug = 0;
var buildStatic = 0;
var buildPrefix = ".";
@@ -135,6 +136,7 @@
txt += "\nWin32 build options, default value given in parentheses:\n\n";
txt += " compiler: Compiler to be used [msvc|mingw|bcb] (" + compiler + ")\n";
txt += " cruntime: C-runtime compiler option (only msvc) (" + cruntime + ")\n";
+ txt += " dynruntime: Use the dynamic RTL (only bcb) (" + dynruntime + ")\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";
@@ -236,6 +238,7 @@
} else if (compiler == "bcb") {
vf.WriteLine("INCLUDE=" + buildInclude);
vf.WriteLine("LIB=" + buildLib);
+ vf.WriteLine("DYNRUNTIME=" + (dynruntime? "1" : "0"));
}
vf.Close();
}
@@ -470,6 +473,8 @@
compiler = arg.substring(opt.length + 1, arg.length);
else if (opt == "cruntime")
cruntime = arg.substring(opt.length + 1, arg.length);
+ else if (opt == "dynruntime")
+ dynruntime = strToBool(arg.substring(opt.length + 1, arg.length));
else if (opt == "debug")
buildDebug = strToBool(arg.substring(opt.length + 1, arg.length));
else if (opt == "static")
@@ -609,6 +614,8 @@
txtOut += " Compiler: " + compiler + "\n";
if (compiler == "msvc")
txtOut += " C-Runtime option: " + cruntime + "\n";
+else if (compiler == "bcb")
+ txtOut += " Use dynamic RTL: " + dynruntime + "\n";
txtOut += " Debug symbols: " + boolToStr(buildDebug) + "\n";
txtOut += " Static xmllint: " + boolToStr(buildStatic) + "\n";
txtOut += " Install prefix: " + buildPrefix + "\n";