From c2fbb65cd21bd4296767a05dce5ecd522e75ebe3 Mon Sep 17 00:00:00 2001 From: Jaex Date: Thu, 19 Jul 2018 17:08:04 +0300 Subject: [PATCH] Download FFmpeg to Output folder instead of Lib --- .gitignore | 4 +--- ShareX.Setup/Program.cs | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2f9b686af..960fe1166 100644 --- a/.gitignore +++ b/.gitignore @@ -330,6 +330,4 @@ ASALocalRun/ # ShareX Output/ -ShareX.UploadersLib/APIKeys/APIKeysLocal.cs -Lib/ffmpeg.exe -Lib/ffmpeg-x64.exe \ No newline at end of file +APIKeysLocal.cs \ No newline at end of file diff --git a/ShareX.Setup/Program.cs b/ShareX.Setup/Program.cs index 7a601814b..3a094aeff 100644 --- a/ShareX.Setup/Program.cs +++ b/ShareX.Setup/Program.cs @@ -94,8 +94,8 @@ namespace ShareX.Setup private static string WindowsStoreAppxPath => Path.Combine(OutputDir, "ShareX.appx"); public static string InnoSetupCompilerPath = @"C:\Program Files (x86)\Inno Setup 5\ISCC.exe"; - public static string FFmpeg32bit => Path.Combine(ParentDir, "Lib", "ffmpeg.exe"); - public static string FFmpeg64bit => Path.Combine(ParentDir, "Lib", "ffmpeg-x64.exe"); + public static string FFmpeg32bit => Path.Combine(OutputDir, "ffmpeg.exe"); + public static string FFmpeg64bit => Path.Combine(OutputDir, "ffmpeg-x64.exe"); public static string MakeAppxPath = @"C:\Program Files (x86)\Windows Kits\10\bin\x64\makeappx.exe"; private static void Main(string[] args)