Temporarily disabled FFMPeg to allow compile Release in OFFICE

This commit is contained in:
Marco Giuntoni
2024-12-18 16:31:07 +01:00
parent 87b7ef4fdf
commit c6c46775c4
5 changed files with 16 additions and 7 deletions
+1
View File
@@ -6,6 +6,7 @@
<RootNamespace>ComicCompressor</RootNamespace>
<OutputName>ComicCompress</OutputName>
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
<Configurations>Debug;Release;ReleaseWDbg</Configurations>
</PropertyGroup>
<ItemGroup>
+4 -1
View File
@@ -4,9 +4,12 @@
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup>
<ActiveDebugProfile>DEV_HOME</ActiveDebugProfile>
<ActiveDebugProfile>DEV_UFF</ActiveDebugProfile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWDbg|AnyCPU'">
<DebuggerFlavor>ProjectDebugger</DebuggerFlavor>
</PropertyGroup>
</Project>
+3
View File
@@ -9,12 +9,15 @@ Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
ReleaseWDbg|Any CPU = ReleaseWDbg|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{2625C71D-E4EC-4768-BF04-87AAB364916A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2625C71D-E4EC-4768-BF04-87AAB364916A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2625C71D-E4EC-4768-BF04-87AAB364916A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2625C71D-E4EC-4768-BF04-87AAB364916A}.Release|Any CPU.Build.0 = Release|Any CPU
{2625C71D-E4EC-4768-BF04-87AAB364916A}.ReleaseWDbg|Any CPU.ActiveCfg = ReleaseWDbg|Any CPU
{2625C71D-E4EC-4768-BF04-87AAB364916A}.ReleaseWDbg|Any CPU.Build.0 = ReleaseWDbg|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
+6 -5
View File
@@ -146,13 +146,14 @@ namespace ComicCompressor
Logger.Log(progVersion, LogLevel.Verbose, true);
var progress = new Progress<ProgressInfo>( p => Logger.Log(p.ToString(), LogLevel.Verbose, true) );
FFmpeg.SetExecutablesPath(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location));
FFmpegDownloader.GetLatestVersion(FFmpegVersion.Official,progress);
//var progress = new Progress<ProgressInfo>( p => Logger.Log(p.ToString(), LogLevel.Verbose, true) );
//FFmpeg.SetExecutablesPath(Path.GetDirectoryName(Assembly.GetEntryAssembly().Location));
//FFmpegDownloader.GetLatestVersion(FFmpegVersion.Official,progress);
//FFmpeg.SetExecutablesPath (Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "FFmpeg"));
Logger.Log(FFmpeg.ExecutablesPath, LogLevel.Verbose, true);
//==//FFmpeg.SetExecutablesPath (Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "FFmpeg"));
//Logger.Log(FFmpeg.ExecutablesPath, LogLevel.Verbose, true);
IList<string> files = new FileParser().ListAllFiles(Input, Recursive);
+2 -1
View File
@@ -26,7 +26,8 @@
},
"DEV_UFF": {
"commandName": "Project",
"commandLineArgs": "-i \"E:\\SynologyDrive\\SynologyDrive\\A\\_PRINT_TEMPLATES_\\DEV_IN\" -o \"E:\\SynologyDrive\\SynologyDrive\\A\\_PRINT_TEMPLATES_\\DEV_OUT\" -r -s -j -a -n"
"commandLineArgs": "-i \"E:\\SynologyDrive\\SynologyDrive\\A\\_PRINT_TEMPLATES_\\DEV_IN\" -o \"E:\\SynologyDrive\\SynologyDrive\\A\\_PRINT_TEMPLATES_\\DEV_OUT\" -r -s -j -a -n",
"nativeDebugging": true
},
"DEV_HOME": {
"commandName": "Project",