summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile6
-rwxr-xr-xscripts/libass-config2
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index e4c31ce..9650a33 100644
--- a/Makefile
+++ b/Makefile
@@ -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