diff options
Diffstat (limited to 'win32/configure.js')
| -rw-r--r-- | win32/configure.js | 14 |
1 files changed, 11 insertions, 3 deletions
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"; |