[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - avmedia/Library_avmedia.mk

[Tor Lillqvist (via logerrit)]

 avmedia/Library_avmedia.mk |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit bc2c287d16b19d0bfc2af16d3c5e812aad0fcdd9
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Nov 28 16:14:46 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Thu Dec 5 17:20:08 2019 +0100

    Fix build with USE_AVMEDIA_DUMMY (iOS, at least)
    
    We need boost headers also for avmedia/source/avmediadummy.cxx now.
    
    Change-Id: Ib1fd2c19aaf62beb759bfee5ec51f167d0966df4
    Reviewed-on: https://gerrit.libreoffice.org/84011
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    (cherry picked from commit 8d8a3f66e57aefd7cf7d3bb6cb62059de5beded2)
    (cherry picked from commit de62d0c77e2f9e24f72fd638cb5c5e365ff164b5)
    Reviewed-on: https://gerrit.libreoffice.org/84530
    Tested-by: Jenkins

diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 2bec95c47e2d..b27b9bae8c80 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -21,6 +21,10 @@ $(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
 
 $(eval $(call gb_Library_use_sdk_api,avmedia,))
 
+$(eval $(call gb_Library_use_externals,avmedia,\
+	boost_headers \
+))
+
 ifeq ($(USE_AVMEDIA_DUMMY),TRUE)
 $(eval $(call gb_Library_add_exception_objects,avmedia,\
 	avmedia/source/avmediadummy \
@@ -34,10 +38,6 @@ $(eval $(call gb_Library_add_defs,avmedia,\
 	-DAVMEDIA_DLLIMPLEMENTATION \
 ))
 
-$(eval $(call gb_Library_use_externals,avmedia,\
-	boost_headers \
-))
-
 ifeq ($(DISABLE_GUI),)
 $(eval $(call gb_Library_use_externals,avmedia,\
     epoxy \