diff options
| author | Igor Pavlov <ipavlov@users.sourceforge.net> | 2009-12-14 03:00:00 +0300 |
|---|---|---|
| committer | Kornel Lesiński <kornel@geekhood.net> | 2016-05-28 02:16:01 +0300 |
| commit | 1fbaf0aac5000ca563a1ee2bb15ba6821a08e468 (patch) | |
| tree | ec079944edffd096355ecb0c499f889364aefb4b /CPP/7zip/UI/GUI/GUI.cpp | |
| parent | 2fed8721946901375d21d4a506fe8b114045b397 (diff) | |
9.09 beta
Diffstat (limited to 'CPP/7zip/UI/GUI/GUI.cpp')
| -rwxr-xr-x | CPP/7zip/UI/GUI/GUI.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/CPP/7zip/UI/GUI/GUI.cpp b/CPP/7zip/UI/GUI/GUI.cpp index a59e7557..377c7841 100755 --- a/CPP/7zip/UI/GUI/GUI.cpp +++ b/CPP/7zip/UI/GUI/GUI.cpp @@ -110,9 +110,16 @@ static int Main2() if (options.Command.CommandType == NCommandType::kBenchmark) { - HRESULT res = Benchmark( - #ifdef EXTERNAL_LZMA - codecs, + HRESULT res; + #ifdef EXTERNAL_CODECS + CObjectVector<CCodecInfoEx> externalCodecs; + res = LoadExternalCodecs(codecs, externalCodecs); + if (res != S_OK) + throw CSystemException(res); + #endif + res = Benchmark( + #ifdef EXTERNAL_CODECS + codecs, &externalCodecs, #endif options.NumThreads, options.DictionarySize); if (res != S_OK) @@ -138,7 +145,7 @@ static int Main2() eo.PathMode = options.Command.GetPathMode(); eo.TestMode = options.Command.IsTestMode(); eo.CalcCrc = options.CalcCrc; - #ifdef COMPRESS_MT + #if !defined(_7ZIP_ST) && !defined(_SFX) eo.Properties = options.ExtractProperties; #endif |