You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ji...@apache.org on 2017/10/13 20:45:01 UTC
svn commit: r1812162 - in /openoffice/trunk/main/avmedia:
AllLangResTarget_avmedia.mk Library_avmedia.mk Library_avmediaMacAVF.mk
Library_avmediaQuickTime.mk Library_avmediagst.mk Library_avmediawin.mk
Author: jim
Date: Fri Oct 13 20:45:00 2017
New Revision: 1812162
URL: http://svn.apache.org/viewvc?rev=1812162&view=rev
Log:
Required macOS changes to ensure build of avmedia module and
ObjC conflict in SDK
Modified:
openoffice/trunk/main/avmedia/AllLangResTarget_avmedia.mk
openoffice/trunk/main/avmedia/Library_avmedia.mk
openoffice/trunk/main/avmedia/Library_avmediaMacAVF.mk
openoffice/trunk/main/avmedia/Library_avmediaQuickTime.mk
openoffice/trunk/main/avmedia/Library_avmediagst.mk
openoffice/trunk/main/avmedia/Library_avmediawin.mk
Modified: openoffice/trunk/main/avmedia/AllLangResTarget_avmedia.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/AllLangResTarget_avmedia.mk?rev=1812162&r1=1812161&r2=1812162&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/AllLangResTarget_avmedia.mk (original)
+++ openoffice/trunk/main/avmedia/AllLangResTarget_avmedia.mk Fri Oct 13 20:45:00 2017
@@ -32,6 +32,12 @@ $(eval $(call gb_SrsTarget_set_include,a
-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 \
Modified: openoffice/trunk/main/avmedia/Library_avmedia.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/Library_avmedia.mk?rev=1812162&r1=1812161&r2=1812162&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/Library_avmedia.mk (original)
+++ openoffice/trunk/main/avmedia/Library_avmedia.mk Fri Oct 13 20:45:00 2017
@@ -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 \
Modified: openoffice/trunk/main/avmedia/Library_avmediaMacAVF.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/Library_avmediaMacAVF.mk?rev=1812162&r1=1812161&r2=1812162&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/Library_avmediaMacAVF.mk (original)
+++ openoffice/trunk/main/avmedia/Library_avmediaMacAVF.mk Fri Oct 13 20:45:00 2017
@@ -33,6 +33,12 @@ $(eval $(call gb_Library_set_include,avm
-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 \
Modified: openoffice/trunk/main/avmedia/Library_avmediaQuickTime.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/Library_avmediaQuickTime.mk?rev=1812162&r1=1812161&r2=1812162&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/Library_avmediaQuickTime.mk (original)
+++ openoffice/trunk/main/avmedia/Library_avmediaQuickTime.mk Fri Oct 13 20:45:00 2017
@@ -33,6 +33,12 @@ $(eval $(call gb_Library_set_include,avm
-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 \
Modified: openoffice/trunk/main/avmedia/Library_avmediagst.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/Library_avmediagst.mk?rev=1812162&r1=1812161&r2=1812162&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/Library_avmediagst.mk (original)
+++ openoffice/trunk/main/avmedia/Library_avmediagst.mk Fri Oct 13 20:45:00 2017
@@ -39,6 +39,12 @@ $(eval $(call gb_Library_add_cflags,avme
$(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 \
Modified: openoffice/trunk/main/avmedia/Library_avmediawin.mk
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/avmedia/Library_avmediawin.mk?rev=1812162&r1=1812161&r2=1812162&view=diff
==============================================================================
--- openoffice/trunk/main/avmedia/Library_avmediawin.mk (original)
+++ openoffice/trunk/main/avmedia/Library_avmediawin.mk Fri Oct 13 20:45:00 2017
@@ -38,6 +38,12 @@ $(eval $(call gb_Library_add_api,avmedia
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 \