ShareX
/
ShareX
mirror of https://github.com/ShareX/ShareX.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Download FFmpeg to Output folder instead of Lib

This commit is contained in:
Jaex 2018-07-19 17:08:04 +03:00
parent ce65c7d12b
commit c2fbb65cd2
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -330,6 +330,4 @@ ASALocalRun/
# ShareX
Output/
ShareX.UploadersLib/APIKeys/APIKeysLocal.cs
Lib/ffmpeg.exe
Lib/ffmpeg-x64.exe
APIKeysLocal.cs

4
ShareX.Setup/Program.cs
View File

@ -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)