aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorfuzzard <fuzzard@kodi.tv>2023-03-08 15:20:01 +1000
committerfuzzard <fuzzard@kodi.tv>2023-03-11 08:22:04 +1000
commit367fecb974ccca500304ec078579c45232aa2c18 (patch)
tree21533d5464f0af3e9694ea99d578ffb7736d05ab /tools
parent8e9d249f339c8d2555de02d2cb80dce66fadfe4d (diff)
[tools/depends][target] Build libass as static only
We also change android packaging to expect static libass
Diffstat (limited to 'tools')
-rw-r--r--tools/android/packaging/Makefile.in3
-rw-r--r--tools/depends/target/libass/Makefile3
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in
index d8b23ef7dc..5111f1ecd2 100644
--- a/tools/android/packaging/Makefile.in
+++ b/tools/android/packaging/Makefile.in
@@ -3,8 +3,7 @@ include ../../depends/Makefile.include
BUILD_TYPE:=@CMAKE_BUILD_TYPE@
BUILD_TYPE_LC:=$(shell echo $(BUILD_TYPE) | tr A-Z a-z)
-OBJS = libshairplay.so \
- libass.so
+OBJS = libshairplay.so
EXCLUDED_ADDONS =
diff --git a/tools/depends/target/libass/Makefile b/tools/depends/target/libass/Makefile
index 523d25602b..756d3af0b5 100644
--- a/tools/depends/target/libass/Makefile
+++ b/tools/depends/target/libass/Makefile
@@ -13,7 +13,8 @@ endif
# configuration settings
CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \
- ./configure --prefix=$(PREFIX)
+ ./configure --prefix=$(PREFIX) \
+ --disable-shared
LIBDYLIB=$(PLATFORM)/$(LIBNAME)/.libs/$(LIBNAME).a