mirror of
https://gitlab.gnome.org/GNOME/libxslt
synced 2025-07-29 15:41:13 +03:00
apply patch from Rob Richards to improve build with VS2005 Daniel
* win32/Makefile.msvc win32/configure.js: apply patch from Rob Richards to improve build with VS2005 Daniel svn path=/trunk/; revision=1435
This commit is contained in:
@ -51,6 +51,7 @@ var withModules = false;
|
||||
var dirSep = "\\";
|
||||
var compiler = "msvc";
|
||||
var cruntime = "/MD";
|
||||
var vcmanifest = false;
|
||||
var buildDebug = 0;
|
||||
var buildStatic = 0;
|
||||
var buildPrefix = ".";
|
||||
@ -108,6 +109,7 @@ function usage()
|
||||
txt += "\nWin32 build options, default value given in parentheses:\n\n";
|
||||
txt += " compiler: Compiler to be used [msvc|mingw] (" + compiler + ")\n";
|
||||
txt += " cruntime: C-runtime compiler option (only msvc) (" + cruntime + ")\n";
|
||||
txt += " vcmanifest: Embed VC manifest (only msvc) (" + (vcmanifest? "yes" : "no") + ")\n";
|
||||
txt += " debug: Build unoptimised debug executables (" + (buildDebug? "yes" : "no") + ")\n";
|
||||
txt += " static: Link xsltproc statically to libxslt (" + (buildStatic? "yes" : "no") + ")\n";
|
||||
txt += " Note: automatically enabled if cruntime is not /MD or /MDd\n";
|
||||
@ -201,6 +203,7 @@ function discoverVersion()
|
||||
vf.WriteLine("INCLUDE=$(INCLUDE);" + buildInclude);
|
||||
vf.WriteLine("LIB=$(LIB);" + buildLib);
|
||||
vf.WriteLine("CRUNTIME=" + cruntime);
|
||||
vf.WriteLine("VCMANIFEST=" + (vcmanifest? "1" : "0"));
|
||||
} else if (compiler == "mingw") {
|
||||
vf.WriteLine("INCLUDE+=;" + buildInclude);
|
||||
vf.WriteLine("LIB+=;" + buildLib);
|
||||
@ -344,6 +347,8 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) {
|
||||
compiler = arg.substring(opt.length + 1, arg.length);
|
||||
else if (opt == "cruntime")
|
||||
cruntime = arg.substring(opt.length + 1, arg.length);
|
||||
else if (opt == "vcmanifest")
|
||||
vcmanifest = strToBool(arg.substring(opt.length + 1, arg.length));
|
||||
else if (opt == "static")
|
||||
buildStatic = strToBool(arg.substring(opt.length + 1, arg.length));
|
||||
else if (opt == "prefix")
|
||||
@ -478,6 +483,7 @@ txtOut += "-------------------------\n";
|
||||
txtOut += " Compiler: " + compiler + "\n";
|
||||
if (compiler == "msvc")
|
||||
txtOut += " C-Runtime option: " + cruntime + "\n";
|
||||
txtOut += " Embed Manifest: " + boolToStr(vcmanifest) + "\n";
|
||||
txtOut += " Debug symbols: " + boolToStr(buildDebug) + "\n";
|
||||
txtOut += " Static xsltproc: " + boolToStr(buildStatic) + "\n";
|
||||
txtOut += " Install prefix: " + buildPrefix + "\n";
|
||||
|
Reference in New Issue
Block a user