diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2005-01-27 23:59:14 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2005-01-27 23:59:14 +0000 |
| commit | 5351695d1b246f30a372d967617815f12aae46bd (patch) | |
| tree | af757a197c348cc3616bce5f23c40d924fe82a26 /win32/configure.js | |
| parent | f59507d42809b2307d13571c7514a30606ccf1fe (diff) | |
| download | libxml2-5351695d1b246f30a372d967617815f12aae46bd.tar.gz | |
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
Diffstat (limited to 'win32/configure.js')
| -rw-r--r-- | win32/configure.js | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/win32/configure.js b/win32/configure.js index 12e5f429..d8571461 100644 --- a/win32/configure.js +++ b/win32/configure.js @@ -145,6 +145,7 @@ function usage() 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 @@ if (error != 0) { 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 = "/"; |