avmedia/AllLangMoTarget_avmedia.mk | 2 -- avmedia/Library_avmedia.mk | 2 ++ avmedia/Library_avmediaMacAVF.mk | 2 -- avmedia/Library_avmediaQuickTime.mk | 2 -- avmedia/Library_avmediagst.mk | 2 -- avmedia/Library_avmediagst_0_10.mk | 2 -- avmedia/Library_avmediaogl.mk | 2 -- avmedia/Library_avmediavlc.mk | 2 -- avmedia/Library_avmediawin.mk | 2 -- avmedia/Module_avmedia.mk | 2 +- 10 files changed, 3 insertions(+), 17 deletions(-)
New commits: commit 134705c5c2a7ce652acb23dc42609a65b56c562d Author: jan Iversen <[email protected]> Date: Tue Oct 10 12:34:01 2017 +0200 Revert "iOS, removed unneeded avmedia libraries" sorry for the noise. This reverts commit 032b1e87078fe60cf8b59b756d93b02b278ed8c8. diff --git a/avmedia/AllLangMoTarget_avmedia.mk b/avmedia/AllLangMoTarget_avmedia.mk index df2886b0aa1a..564b9ab94b43 100644 --- a/avmedia/AllLangMoTarget_avmedia.mk +++ b/avmedia/AllLangMoTarget_avmedia.mk @@ -6,8 +6,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -ifeq ($(USE_AVMEDIA_DUMMY),FALSE) $(eval $(call gb_AllLangMoTarget_AllLangMoTarget,avmedia)) -endif # vim: set noet sw=4 ts=4: diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk index 449556b65a42..3f32ce786145 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -9,6 +9,8 @@ $(eval $(call gb_Library_Library,avmedia)) +$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia)) + $(eval $(call gb_Library_set_include,avmedia,\ $$(INCLUDE) \ -I$(SRCDIR)/avmedia/inc \ diff --git a/avmedia/Library_avmediaMacAVF.mk b/avmedia/Library_avmediaMacAVF.mk index acd6717bc769..877efd97ac36 100644 --- a/avmedia/Library_avmediaMacAVF.mk +++ b/avmedia/Library_avmediaMacAVF.mk @@ -7,7 +7,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -ifeq ($(USE_AVMEDIA_DUMMY),FALSE) $(eval $(call gb_Library_Library,avmediaMacAVF)) $(eval $(call gb_Library_set_componentfile,avmediaMacAVF,avmedia/source/macavf/avmediaMacAVF)) @@ -43,6 +42,5 @@ $(eval $(call gb_Library_add_objcxxobjects,avmediaMacAVF,\ avmedia/source/macavf/player \ avmedia/source/macavf/window \ )) -endif # vim: set noet sw=4 ts=4: diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk index a593d78f5cf0..85eca192eb9a 100644 --- a/avmedia/Library_avmediaQuickTime.mk +++ b/avmedia/Library_avmediaQuickTime.mk @@ -7,7 +7,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -ifeq ($(USE_AVMEDIA_DUMMY),FALSE) $(eval $(call gb_Library_Library,avmediaQuickTime)) $(eval $(call gb_Library_set_componentfile,avmediaQuickTime,avmedia/source/quicktime/avmediaQuickTime)) @@ -42,6 +41,5 @@ $(eval $(call gb_Library_add_objcxxobjects,avmediaQuickTime,\ avmedia/source/quicktime/quicktimeuno \ avmedia/source/quicktime/window \ )) -endif # vim: set noet sw=4 ts=4: diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk index 998e90f1aa5d..9b9622b7edc5 100644 --- a/avmedia/Library_avmediagst.mk +++ b/avmedia/Library_avmediagst.mk @@ -7,7 +7,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -ifeq ($(USE_AVMEDIA_DUMMY),FALSE) $(eval $(call gb_Library_Library,avmediagst)) $(eval $(call gb_Library_set_componentfile,avmediagst,avmedia/source/gstreamer/avmediagstreamer)) @@ -54,6 +53,5 @@ $(eval $(call gb_Library_add_exception_objects,avmediagst,\ avmedia/source/gstreamer/gstwindow \ avmedia/source/gstreamer/gstframegrabber \ )) -endif # vim: set noet sw=4 ts=4: diff --git a/avmedia/Library_avmediagst_0_10.mk b/avmedia/Library_avmediagst_0_10.mk index 6658cc51f64f..16f2d5db1440 100644 --- a/avmedia/Library_avmediagst_0_10.mk +++ b/avmedia/Library_avmediagst_0_10.mk @@ -7,7 +7,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -ifeq ($(USE_AVMEDIA_DUMMY),FALSE) $(eval $(call gb_Library_Library,avmediagst_0_10)) $(eval $(call gb_Library_set_componentfile,avmediagst_0_10,avmedia/source/gstreamer/avmediagstreamer_0_10)) @@ -43,6 +42,5 @@ $(eval $(call gb_Library_add_libs,avmediagst_0_10,\ $(eval $(call gb_Library_add_exception_objects,avmediagst_0_10,\ avmedia/source/gstreamer/gst_0_10 \ )) -endif # vim: set noet sw=4 ts=4: diff --git a/avmedia/Library_avmediaogl.mk b/avmedia/Library_avmediaogl.mk index 2418093b09e8..eae3efab1e64 100644 --- a/avmedia/Library_avmediaogl.mk +++ b/avmedia/Library_avmediaogl.mk @@ -7,7 +7,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -ifeq ($(USE_AVMEDIA_DUMMY),FALSE) $(eval $(call gb_Library_Library,avmediaogl)) $(eval $(call gb_Library_set_componentfile,avmediaogl,avmedia/source/opengl/avmediaogl)) @@ -42,6 +41,5 @@ $(eval $(call gb_Library_add_exception_objects,avmediaogl,\ avmedia/source/opengl/ogluno \ avmedia/source/opengl/oglwindow \ )) -endif # vim: set noet sw=4 ts=4: diff --git a/avmedia/Library_avmediavlc.mk b/avmedia/Library_avmediavlc.mk index 91f3f0f68e93..0ee5cd2d0d46 100644 --- a/avmedia/Library_avmediavlc.mk +++ b/avmedia/Library_avmediavlc.mk @@ -7,7 +7,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -ifeq ($(USE_AVMEDIA_DUMMY),FALSE) $(eval $(call gb_Library_Library,avmediavlc)) $(eval $(call gb_Library_set_componentfile,avmediavlc,avmedia/source/vlc/avmediavlc)) @@ -52,6 +51,5 @@ $(eval $(call gb_Library_add_exception_objects,avmediavlc,\ avmedia/source/vlc/wrapper/EventHandler \ avmedia/source/vlc/wrapper/Common \ )) -endif # vim: set noet sw=4 ts=4: diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk index a16d8ecc5596..09453d6c77ba 100644 --- a/avmedia/Library_avmediawin.mk +++ b/avmedia/Library_avmediawin.mk @@ -7,7 +7,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -ifeq ($(USE_AVMEDIA_DUMMY),FALSE) $(eval $(call gb_Library_Library,avmediawin)) $(eval $(call gb_Library_set_componentfile,avmediawin,avmedia/source/win/avmediawin)) @@ -45,6 +44,5 @@ $(eval $(call gb_Library_add_exception_objects,avmediawin,\ avmedia/source/win/window \ avmedia/source/win/winuno \ )) -endif # vim: set noet sw=4 ts=4: diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index 6af64efbad75..8e1bd011d5e8 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,avmedia,\ Library_avmedia \ )) -ifeq ($(USE_AVMEDIA_DUMMY),FALSE) +ifneq ($(USE_AVMEDIA_DUMMY),TRUE) $(eval $(call gb_Module_add_l10n_targets,avmedia,\ AllLangMoTarget_avmedia \ )) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
