summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-29 20:20:20 +0100
committerwm4 <wm4@nowhere>2013-12-29 20:20:35 +0100
commit4a3cd16f2fb2cdb67a1ff16217365f8c61133044 (patch)
tree5c4de724f9ca16e88f74338792b6bfb41b1e2d73
parentb475c178dbbb18a6ed06d01248105954bb1c0dab (diff)
downloadmpv-build-4a3cd16f2fb2cdb67a1ff16217365f8c61133044.tar.bz2
mpv-build-4a3cd16f2fb2cdb67a1ff16217365f8c61133044.tar.xz
Add ./rebuild command and suggest its use over ./update and ./build
-rw-r--r--README.rst17
-rwxr-xr-xrebuild6
2 files changed, 14 insertions, 9 deletions
diff --git a/README.rst b/README.rst
index aff00de..c801f01 100644
--- a/README.rst
+++ b/README.rst
@@ -26,18 +26,17 @@ Checkout the build repo:
cd mpv-build
-Get the ffmpeg, libass and mpv sources with the following command:
+Get the ffmpeg, libass and mpv sources and build them with:
- ./update
+ ./rebuild -j4
-(This is always needed before doing the first build after the initial checkout,
-and can be used to update ffmpeg/libass/mpv later.)
+The ``-j4`` asks it to use 4 parallel processes.
-Build mpv and ffmpeg/libass with:
-
- ./clean # sometimes needed to build successfully
-
- ./build
+Note that this command implicitly does an update followed by a full cleanup
+(even if nothing changes), which is supposed to reduce possible problems with
+incremental builds. You can do incremental builds by explicitly calling
+``./build``. This can be faster on minor updates, but breaks sometimes, e.g.
+the FFmpeg build system can sometimes be a bit glitchy.
Install mpv with:
diff --git a/rebuild b/rebuild
new file mode 100755
index 0000000..bd53ad7
--- /dev/null
+++ b/rebuild
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+./update
+./clean
+./build $@