Skip to content
This repository has been archived by the owner on May 31, 2022. It is now read-only.

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
MouriNaruto committed Feb 4, 2018
1 parent e9e05bb commit 8a334ac
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@
/.vs
/Output
/FFmpeg
/FFmpegUniversal/FFmpeg
4 changes: 2 additions & 2 deletions FFmpegConfig.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ cd ../Output/FFmpeg_Temp/$1/$2
--toolchain=msvc \
--disable-programs \
--enable-cross-compile \
--disable-debug \
--enable-debug \
--disable-ffmpeg \
--disable-ffprobe \
--disable-doc \
Expand All @@ -51,7 +51,7 @@ cd ../Output/FFmpeg_Temp/$1/$2
$OPTIONS \
--prefix=../../../../Output/FFmpeg/$1/$2
echo "=== BUILDING ==="
make -j16
make -j8
echo "=== INSTALLING ==="
make install

Expand Down
3 changes: 0 additions & 3 deletions FFmpegUniversal/targetver.h

This file was deleted.

7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Your `FFmpegUniversal` folder should look as follows
https://trac.ffmpeg.org/wiki/CompilationGuide/WinRT
FFmpegConfig.sh - Internal script that contains FFmpeg configure
options
FFmpegCopy.bat - Helper script to to copy the appropriate builds of
FFmpegCopy.bat - Internal script to copy the appropriate builds of
FFmpeg libraries to the FFmpegUniversal project.
FFmpegUniversal.sln - Microsoft Visual Studio 2017 solution file
LICENSE
Expand All @@ -31,14 +31,15 @@ how to
[build FFmpeg for WinRT](https://trac.ffmpeg.org/wiki/CompilationGuide/WinRT)
apps. Follow the setup instruction carefuly to avoid build issues. After
completing the setup as instructed, you can invoke `FFmpegBuild.bat` script to
build or do it manually using the instructions in the compilation guide.
build or do it manually using the instructions in the compilation guide after
you modify the MSYS2_BIN variable in the `FFmpegBuild.bat`.

BuildFFmpeg.bat - Build for Windows 10 ARM, x64, and x86

If you use the build script or follow the Wiki instructions as is you should
find the appropriate builds of FFmpeg libraries in the `Output/FFmpeg` folders.

Finally open the FFmpegUniversal.sln and build it, you will get the merged
Simply open the FFmpegUniversal.sln and build it, you will get the merged
FFmpeg dynamic library for the Windows Universal Platform.

## License
Expand Down

0 comments on commit 8a334ac

Please sign in to comment.