diff options
| author | Max Kellermann <max@musicpd.org> | 2018-08-17 20:02:27 +0200 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2018-08-17 20:02:27 +0200 |
| commit | 1ba35e1fd4871f2430d7f3bf5a799f2ad39f73ab (patch) | |
| tree | 6a18adeae28bf65cc94aa1c08087db2e84fbee10 /Makefile.am | |
| parent | 4ba3812baf7ec552e7b17b275380b57a51e10f52 (diff) | |
| parent | 98afae2520fbe5a322f803335b3142612fda4762 (diff) | |
Merge tag 'v0.20.21'
release v0.20.21
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 0db008c6e..e403da342 100644 --- a/Makefile.am +++ b/Makefile.am @@ -347,7 +347,7 @@ libmpd.so: $(filter %.a,$(src_mpd_LDADD)) libmain.a $(AM_V_CXXLD)$(CXXLD) -shared -Wl,--no-undefined,-shared,-Bsymbolic -llog -lz -o $@ $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) src/libmain_a-Main.o $(src_mpd_LDADD) $(LIBS) ANDROID_SDK_BUILD_TOOLS_VERSION = 27.0.0 -ANDROID_SDK_PLATFORM = android-17 +ANDROID_SDK_PLATFORM = android-21 ANDROID_BUILD_TOOLS_DIR = $(ANDROID_SDK)/build-tools/$(ANDROID_SDK_BUILD_TOOLS_VERSION) ANDROID_SDK_PLATFORM_DIR = $(ANDROID_SDK)/platforms/$(ANDROID_SDK_PLATFORM) @@ -394,7 +394,7 @@ android/build/include/org_musicpd_Bridge.h: android/build/classes.dex BUILT_SOURCES = android/build/include/org_musicpd_Bridge.h -android/build/lib/armeabi-v7a/libmpd.so: libmpd.so +android/build/lib/$(ANDROID_ABI)/libmpd.so: libmpd.so mkdir -p $(@D) rm -f $@ $(STRIP) -o $@ $< @@ -404,7 +404,7 @@ android/build/res/drawable/icon.png: mpd.svg rsvg-convert --width=48 --height=48 $< -o $@ .DELETE_ON_ERROR: android/build/unsigned.apk -android/build/unsigned.apk: android/build/classes.dex android/build/resources.apk android/build/lib/armeabi-v7a/libmpd.so +android/build/unsigned.apk: android/build/classes.dex android/build/resources.apk android/build/lib/$(ANDROID_ABI)/libmpd.so cp android/build/resources.apk $@ cd $(dir $@) && zip -q -r $(notdir $@) classes.dex lib @@ -808,6 +808,8 @@ libstorage_a_SOURCES = \ libstorage_a_CPPFLAGS = $(AM_CPPFLAGS) \ $(DBUS_CFLAGS) \ + $(CURL_CFLAGS) \ + $(EXPAT_CFLAGS) \ $(NFS_CFLAGS) \ $(SMBCLIENT_CFLAGS) |