files for the Bakefile generator for Makefiles from Francesco Montorsi
* bakefile/Readme.txt bakefile/Bakefiles.bkgen bakefile/libxml2.bkl:
files for the Bakefile generator for Makefiles from Francesco
Montorsi
* win32/configure.js: fixes for Windows compilation with non-default
flags by Joel Reed
Daniel
diff --git a/win32/configure.js b/win32/configure.js
index 12e5f42..d857146 100644
--- a/win32/configure.js
+++ b/win32/configure.js
@@ -145,6 +145,7 @@
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 += " Note: automatically enabled if cruntime is not /MD or /MDd\n";
txt += " prefix: Base directory for the installation (" + buildPrefix + ")\n";
txt += " bindir: Directory where xmllint and friends should be installed\n";
txt += " (" + buildBinPrefix + ")\n";
@@ -534,6 +535,14 @@
usage();
WScript.Quit(error);
}
+
+// if user choses to link the c-runtime library statically into libxml2
+// with /MT and friends, then we need to enable static linking for xmllint
+if (cruntime == "/MT" || cruntime == "/MTd" ||
+ cruntime == "/ML" || cruntime == "/MLd") {
+ buildStatic = 1;
+}
+
dirSep = "\\";
if (compiler == "mingw")
dirSep = "/";