diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-09-10 12:28:29 +0200 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-09-10 14:19:55 +0200 |
| commit | 113ba194f8fd10baa8dd97dff8c2619d059ba99e (patch) | |
| tree | 7b37efbe9240bbca0923e441a22723808a9418bc | |
| parent | 3793855b40c0515647daa21741239fbcf0f974e4 (diff) | |
iOS, avmedia library depend on autogen flag.
Disabled linking of avmedia if not present.
Change-Id: Id64192ec8172d4388b3624b5f832a90f7af1179c
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | oox/Library_oox.mk | 2 | ||||
| -rw-r--r-- | svx/Library_svx.mk | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index c3d38c3dffa1..f053df0192c7 100644 --- a/configure.ac +++ b/configure.ac @@ -4030,7 +4030,7 @@ darwin*) case "$host_cpu" in arm) - OS=iOS + OS=IOS if test "$enable_ios_simulator" = "yes"; then CPUNAME=I386 RTL_ARCH=x86 @@ -4042,7 +4042,7 @@ darwin*) fi ;; arm64) - OS=iOS + OS=IOS if test "$enable_ios_simulator" = "yes"; then CPUNAME=X86_64 RTL_ARCH=X86_64 diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk index ecf760f0350c..a21157be131f 100644 --- a/oox/Library_oox.mk +++ b/oox/Library_oox.mk @@ -38,7 +38,7 @@ $(eval $(call gb_Library_use_api,oox,\ )) $(eval $(call gb_Library_use_libraries,oox,\ - avmedia \ + $(call gb_Helper_optional,AVMEDIA,avmedia) \ basegfx \ comphelper \ cppu \ diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 825b6c172487..b24478828ff2 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -41,8 +41,7 @@ $(eval $(call gb_Library_add_defs,svx,\ $(eval $(call gb_Library_set_precompiled_header,svx,$(SRCDIR)/svx/inc/pch/precompiled_svx)) $(eval $(call gb_Library_use_libraries,svx,\ - $(if $(filter-out $(OS),IOS), \ - avmedia) \ + $(call gb_Helper_optional,AVMEDIA,avmedia) \ basegfx \ sb \ comphelper \ |