diff options
| author | wsnipex <wsnipex@a1.net> | 2015-10-22 16:20:56 +0200 |
|---|---|---|
| committer | wsnipex <wsnipex@a1.net> | 2015-10-23 14:31:17 +0200 |
| commit | 94faa07c8134e70e0dfb54a2da9367455a79ac6a (patch) | |
| tree | f160676d00c4164ad3a4920ad767c24b6f92dd61 /tools | |
| parent | 98b7d16fba57cc66e6c1a35dd6212e90e61a6f9d (diff) | |
[depends] crossguid: use libuuid on droid
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/Makefile | 8 | ||||
| -rw-r--r-- | tools/depends/target/crossguid/Makefile | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile index a93747cdd7..ed17ca5834 100644 --- a/tools/depends/target/Makefile +++ b/tools/depends/target/Makefile @@ -35,7 +35,8 @@ ifeq ($(OS),osx) endif ifeq ($(OS),android) - DEPENDS += mdnsresponder android-sources-ics google-breakpad + DEPENDS += mdnsresponder android-sources-ics google-breakpad libuuid + CROSSGUID_DEPS = libuuid endif DEPENDS := $(filter-out $(EXCLUDED_DEPENDS),$(DEPENDS)) @@ -63,6 +64,7 @@ ifeq ($(OS),linux) endif DEPENDS += alsa-lib ALSA_LIB = alsa-lib + CROSSGUID_DEPS = libuuid endif .PHONY: $(DEPENDS) @@ -97,9 +99,7 @@ libsdl2: $(LINUX_SYSTEM_LIBS) libxslt: libgcrypt ffmpeg: $(ICONV) $(ZLIB) bzip2 libvorbis $(FFMPEG_DEPENDS) libcec: platform -ifeq ($(OS),linux) -crossguid: libuuid -endif +crossguid: $(CROSSGUID_DEPS) .installed-$(PLATFORM): $(DEPENDS) touch $@ diff --git a/tools/depends/target/crossguid/Makefile b/tools/depends/target/crossguid/Makefile index 1a40249e1c..487ab2a617 100644 --- a/tools/depends/target/crossguid/Makefile +++ b/tools/depends/target/crossguid/Makefile @@ -26,9 +26,6 @@ endif # define specifying the native GUID implementation to use GUID_PLATFORM_DEFINE=GUID_LIBUUID -ifeq ($(OS),android) - GUID_PLATFORM_DEFINE=GUID_ANDROID -endif ifeq ($(OS),osx) GUID_PLATFORM_DEFINE=GUID_CFUUID endif |