avmedia/AllLangResTarget_avmedia.mk | 6 ++++++ avmedia/Library_avmedia.mk | 6 ++++++ avmedia/Library_avmediaMacAVF.mk | 6 ++++++ avmedia/Library_avmediaQuickTime.mk | 6 ++++++ avmedia/Library_avmediagst.mk | 6 ++++++ avmedia/Library_avmediawin.mk | 6 ++++++ 6 files changed, 36 insertions(+)
New commits: commit 9072c77e9f723203252693d4ddd3d5452b535e05 Author: Jim Jagielski <[email protected]> Date: Fri Oct 13 20:45:00 2017 +0000 Required macOS changes to ensure build of avmedia module and ObjC conflict in SDK diff --git a/avmedia/AllLangResTarget_avmedia.mk b/avmedia/AllLangResTarget_avmedia.mk index 050867400697..95906fa74770 100644 --- a/avmedia/AllLangResTarget_avmedia.mk +++ b/avmedia/AllLangResTarget_avmedia.mk @@ -32,6 +32,12 @@ $(eval $(call gb_SrsTarget_set_include,avmedia/res,\ -I$(SRCDIR)/avmedia/inc \ )) +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_add_cxxflags,avmedia,\ + -x objective-c++ \ +)) +endif + # add src files here (complete path relative to repository root) $(eval $(call gb_SrsTarget_add_files,avmedia/res,\ avmedia/source/framework/mediacontrol.src \ diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index 006721121f11..59792bc1e92a 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -42,6 +42,12 @@ $(eval $(call gb_Library_add_api,avmedia,\ udkapi \ )) +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_add_cxxflags,avmedia,\ + -x objective-c++ \ +)) +endif + $(eval $(call gb_Library_add_linked_libs,avmedia,\ comphelper \ cppuhelper \ diff --git a/avmedia/Library_avmediaMacAVF.mk b/avmedia/Library_avmediaMacAVF.mk index 235611086962..fd13ae4d8110 100644 --- a/avmedia/Library_avmediaMacAVF.mk +++ b/avmedia/Library_avmediaMacAVF.mk @@ -33,6 +33,12 @@ $(eval $(call gb_Library_set_include,avmediaMacAVF,\ -I$(SRCDIR)/avmedia/source/inc \ )) +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_add_cxxflags,avmediaMacAVF,\ + -x objective-c++ \ +)) +endif + $(eval $(call gb_Library_add_api,avmediaMacAVF,\ offapi \ udkapi \ diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk index ba9649a388ae..9769331b347e 100644 --- a/avmedia/Library_avmediaQuickTime.mk +++ b/avmedia/Library_avmediaQuickTime.mk @@ -33,6 +33,12 @@ $(eval $(call gb_Library_set_include,avmediaQuickTime,\ -I$(SRCDIR)/avmedia/source/inc \ )) +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_add_cxxflags,avmediaQuickTime,\ + -x objective-c++ \ +)) +endif + $(eval $(call gb_Library_add_api,avmediaQuickTime,\ offapi \ udkapi \ diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk index b37ef6e6a795..d583e7398d6b 100644 --- a/avmedia/Library_avmediagst.mk +++ b/avmedia/Library_avmediagst.mk @@ -39,6 +39,12 @@ $(eval $(call gb_Library_add_cflags,avmediagst,\ $(filter-out -I%,$(GTK_CFLAGS)) \ )) +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_add_cxxflags,avmediagst,\ + -x objective-c++ \ +)) +endif + $(eval $(call gb_Library_add_api,avmediagst,\ offapi \ udkapi \ diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk index 579ff03114b9..d0d5c73b655a 100644 --- a/avmedia/Library_avmediawin.mk +++ b/avmedia/Library_avmediawin.mk @@ -38,6 +38,12 @@ $(eval $(call gb_Library_add_api,avmediawin,\ udkapi \ )) +ifeq ($(OS),MACOSX) +$(eval $(call gb_Library_add_cxxflags,avmediawin,\ + -x objective-c++ \ +)) +endif + $(eval $(call gb_Library_add_linked_libs,avmediawin,\ comphelper \ cppuhelper \ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
