mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-11 18:09:01 +08:00
62 lines
2.9 KiB
Diff
62 lines
2.9 KiB
Diff
|
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
|
||
|
|
index 0d1953d..0e538ef 100644
|
||
|
|
--- a/win32/Makefile.msvc
|
||
|
|
+++ b/win32/Makefile.msvc
|
||
|
|
@@ -62,9 +62,9 @@ LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX)
|
||
|
|
# The libraries are needed for static builds (the makefile builds all tools and dlls)
|
||
|
|
LIBS = wsock32.lib libiconv.lib libcharset.lib
|
||
|
|
!if "$(DEBUG)" == "1"
|
||
|
|
-LIBS = $(LIBS) zlibd.lib
|
||
|
|
+LIBS = $(LIBS) zlibd.lib lzmad.lib
|
||
|
|
!else
|
||
|
|
-LIBS = $(LIBS) zlib.lib
|
||
|
|
+LIBS = $(LIBS) zlib.lib lzma.lib
|
||
|
|
!endif
|
||
|
|
|
||
|
|
# The archiver and its options.
|
||
|
|
diff --git a/win32/configure.js b/win32/configure.js
|
||
|
|
index 56694cc..24ccc8d 100644
|
||
|
|
--- a/win32/configure.js
|
||
|
|
+++ b/win32/configure.js
|
||
|
|
@@ -45,6 +45,7 @@ var withMemDebug = false;
|
||
|
|
var withDebugger = true;
|
||
|
|
var withIconv = true;
|
||
|
|
var withZlib = false;
|
||
|
|
+var withLzma = true;
|
||
|
|
var withCrypto = true;
|
||
|
|
var withModules = false;
|
||
|
|
/* Win32 build options. */
|
||
|
|
@@ -104,6 +105,7 @@ function usage()
|
||
|
|
txt += " debugger: Enable external debugger support (" + (withDebugger? "yes" : "no") + ")\n";
|
||
|
|
txt += " iconv: Use iconv library (" + (withIconv? "yes" : "no") + ")\n";
|
||
|
|
txt += " zlib: Use zlib library (" + (withZlib? "yes" : "no") + ")\n";
|
||
|
|
+ txt += " lzma: Use lzma library (" + (withLzma? "yes" : "no") + ")\n";
|
||
|
|
txt += " crypto: Enable Crypto support (" + (withCrypto? "yes" : "no") + ")\n";
|
||
|
|
txt += " modules: Enable Module support (" + (withModules? "yes" : "no") + ")\n";
|
||
|
|
txt += "\nWin32 build options, default value given in parentheses:\n\n";
|
||
|
|
@@ -190,6 +192,7 @@ function discoverVersion()
|
||
|
|
vf.WriteLine("WITH_DEBUGGER=" + (withDebugger? "1" : "0"));
|
||
|
|
vf.WriteLine("WITH_ICONV=" + (withIconv? "1" : "0"));
|
||
|
|
vf.WriteLine("WITH_ZLIB=" + (withZlib? "1" : "0"));
|
||
|
|
+ vf.WriteLine("WITH_LZMA=" + (withLzma? "1" : "0"));
|
||
|
|
vf.WriteLine("WITH_CRYPTO=" + (withCrypto? "1" : "0"));
|
||
|
|
vf.WriteLine("WITH_MODULES=" + (withModules? "1" : "0"));
|
||
|
|
vf.WriteLine("DEBUG=" + (buildDebug? "1" : "0"));
|
||
|
|
@@ -339,6 +342,8 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) {
|
||
|
|
withIconv = 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 == "crypto")
|
||
|
|
withCrypto = strToBool(arg.substring(opt.length + 1, arg.length));
|
||
|
|
else if (opt == "modules")
|
||
|
|
@@ -475,6 +480,7 @@ txtOut += " Memory debugging: " + boolToStr(withMemDebug) + "\n";
|
||
|
|
txtOut += " Debugger support: " + boolToStr(withDebugger) + "\n";
|
||
|
|
txtOut += " Use iconv: " + boolToStr(withIconv) + "\n";
|
||
|
|
txtOut += " With zlib: " + boolToStr(withZlib) + "\n";
|
||
|
|
+txtOut += " Lzma: " + boolToStr(withLzma) + "\n";
|
||
|
|
txtOut += " Crypto: " + boolToStr(withCrypto) + "\n";
|
||
|
|
txtOut += " Modules: " + boolToStr(withModules) + "\n";
|
||
|
|
txtOut += "\n";
|