lib/libxslt
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxslt synced 2025-07-29 15:41:13 +03:00
Code Activity

added cruntime option, contributed by Oliver Stoeneberg

Browse Source
This commit is contained in:
Igor Zlatkovic
2004-05-24 10:47:38 +00:00
parent 057b4134a7
commit 7d93ac4bee
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
win32/Makefile.msvc
View File

@ -51,7 +51,7 @@ CPPFLAGS = /nologo
# The compiler and its options. # The compiler and its options.
CC = cl.exe CC = cl.exe
CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /W3 /MD /D "_REENTRANT" CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /W3 $(CRUNTIME) /D "_REENTRANT"
CFLAGS = $(CFLAGS) /I$(BASEDIR) /I$(XSLT_SRCDIR) /I$(INCPREFIX) CFLAGS = $(CFLAGS) /I$(BASEDIR) /I$(XSLT_SRCDIR) /I$(INCPREFIX)
# The linker and its options. # The linker and its options.

7
win32/configure.js
View File

@ -48,6 +48,7 @@ var withZlib = false;
/* Win32 build options. */ /* Win32 build options. */
var dirSep = "\\"; var dirSep = "\\";
var compiler = "msvc"; var compiler = "msvc";
var cruntime = "/MD";
var buildDebug = 0; var buildDebug = 0;
var buildStatic = 0; var buildStatic = 0;
var buildPrefix = "."; var buildPrefix = ".";
@ -102,6 +103,7 @@ function usage()
txt += " zlib: Use zlib library (" + (withZlib? "yes" : "no") + ")\n"; txt += " zlib: Use zlib library (" + (withZlib? "yes" : "no") + ")\n";
txt += "\nWin32 build options, default value given in parentheses:\n\n"; txt += "\nWin32 build options, default value given in parentheses:\n\n";
txt += " compiler: Compiler to be used [msvc|mingw] (" + compiler + ")\n"; txt += " compiler: Compiler to be used [msvc|mingw] (" + compiler + ")\n";
txt += " cruntime: C-runtime compiler option (only msvc) (" + cruntime + ")\n";
txt += " debug: Build unoptimised debug executables (" + (buildDebug? "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 += " static: Link xsltproc statically to libxslt (" + (buildStatic? "yes" : "no") + ")\n";
txt += " prefix: Base directory for the installation (" + buildPrefix + ")\n"; txt += " prefix: Base directory for the installation (" + buildPrefix + ")\n";
@ -176,6 +178,7 @@ function discoverVersion()
if (compiler == "msvc") { if (compiler == "msvc") {
vf.WriteLine("INCLUDE=$(INCLUDE);" + buildInclude); vf.WriteLine("INCLUDE=$(INCLUDE);" + buildInclude);
vf.WriteLine("LIB=$(LIB);" + buildLib); vf.WriteLine("LIB=$(LIB);" + buildLib);
vf.WriteLine("CRUNTIME=" + cruntime);
} else if (compiler == "mingw") { } else if (compiler == "mingw") {
vf.WriteLine("INCLUDE+=;" + buildInclude); vf.WriteLine("INCLUDE+=;" + buildInclude);
vf.WriteLine("LIB+=;" + buildLib); vf.WriteLine("LIB+=;" + buildLib);
@ -323,6 +326,8 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) {
withZlib = strToBool(arg.substring(opt.length + 1, arg.length)); withZlib = strToBool(arg.substring(opt.length + 1, arg.length));
else if (opt == "compiler") else if (opt == "compiler")
compiler = arg.substring(opt.length + 1, arg.length); compiler = arg.substring(opt.length + 1, arg.length);
else if (opt == "cruntime")
cruntime = arg.substring(opt.length + 1, arg.length);
else if (opt == "static") else if (opt == "static")
buildStatic = strToBool(arg.substring(opt.length + 1, arg.length)); buildStatic = strToBool(arg.substring(opt.length + 1, arg.length));
else if (opt == "prefix") else if (opt == "prefix")
@ -427,6 +432,8 @@ txtOut += "\n";
txtOut += "Win32 build configuration\n"; txtOut += "Win32 build configuration\n";
txtOut += "-------------------------\n"; txtOut += "-------------------------\n";
txtOut += " Compiler: " + compiler + "\n"; txtOut += " Compiler: " + compiler + "\n";
if (compiler == "msvc")
txtOut += " C-Runtime option: " + cruntime + "\n";
txtOut += " Debug symbols: " + boolToStr(buildDebug) + "\n"; txtOut += " Debug symbols: " + boolToStr(buildDebug) + "\n";
txtOut += " Static xsltproc: " + boolToStr(buildStatic) + "\n"; txtOut += " Static xsltproc: " + boolToStr(buildStatic) + "\n";
txtOut += " Install prefix: " + buildPrefix + "\n"; txtOut += " Install prefix: " + buildPrefix + "\n";