diff options
| author | wm4 <wm4@nowhere> | 2013-07-15 22:54:54 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-15 22:54:54 +0200 |
| commit | c7d74f078e113e416eeef9d66afbab6ade704d51 (patch) | |
| tree | 8adaaa825c85aadc9c626fb0289eb5b2495c7e6d | |
| parent | f6b213950ad666827ca5eb4fb1073bdbf6b90979 (diff) | |
| download | mpv-build-c7d74f078e113e416eeef9d66afbab6ade704d51.tar.bz2 mpv-build-c7d74f078e113e416eeef9d66afbab6ade704d51.tar.xz | |
Disable building fribidi for now
It completely breaks parallel builds.
I couldn't find out how to get "make" not to build fribidi with parallel
build enabled.
| -rw-r--r-- | Makefile | 6 | ||||
| -rwxr-xr-x | scripts/libass-config | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -17,7 +17,7 @@ fribidi-config: fribidi: fribidi-config $(MAKE) -C fribidi install -libass-config: fribidi +libass-config: scripts/libass-config libass: libass-config @@ -25,7 +25,7 @@ libass: libass-config noconfig: $(MAKE) -C ffmpeg_build install - $(MAKE) -C fribidi install + #$(MAKE) -C fribidi install $(MAKE) -C libass install $(MAKE) -C mpv @@ -34,7 +34,7 @@ install: clean: -rm -rf ffmpeg_build build_libs - -$(MAKE) -C fribidi distclean + #-$(MAKE) -C fribidi distclean -$(MAKE) -C libass distclean -$(MAKE) -C mpv distclean diff --git a/scripts/libass-config b/scripts/libass-config index 0d744f0..65ab5f1 100755 --- a/scripts/libass-config +++ b/scripts/libass-config @@ -5,4 +5,4 @@ OPTIONS="" BUILD="$(pwd)" cd "$BUILD"/libass -PKG_CONFIG_PATH="$BUILD"/build_libs/lib/pkgconfig FRIBIDI_CFLAGS=-I"$BUILD"/build_libs/include ./autogen.sh --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" --enable-static --disable-shared $OPTIONS +PKG_CONFIG_PATH="$BUILD"/build_libs/lib/pkgconfig ./autogen.sh --prefix="$BUILD/build_libs" --libdir="$BUILD/build_libs/lib" --enable-static --disable-shared $OPTIONS |