Kaydet (Commit) 032b1e87 authored tarafından jan Iversen's avatar jan Iversen

iOS, removed unneeded avmedia libraries

add USE_AVMEDIA_DUMMY to .mk to stop libraries from being
generated

Change-Id: Ic8a81d681bfaa3f7124b3ad79007527517aaecd9
üst 7437a046
...@@ -6,6 +6,8 @@ ...@@ -6,6 +6,8 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this # 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/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
ifeq ($(USE_AVMEDIA_DUMMY),FALSE)
$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,avmedia)) $(eval $(call gb_AllLangMoTarget_AllLangMoTarget,avmedia))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
$(eval $(call gb_Library_Library,avmedia)) $(eval $(call gb_Library_Library,avmedia))
$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
$(eval $(call gb_Library_set_include,avmedia,\ $(eval $(call gb_Library_set_include,avmedia,\
$$(INCLUDE) \ $$(INCLUDE) \
-I$(SRCDIR)/avmedia/inc \ -I$(SRCDIR)/avmedia/inc \
...@@ -25,6 +23,7 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\ ...@@ -25,6 +23,7 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\
)) ))
else else
$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
$(eval $(call gb_Library_add_defs,avmedia,\ $(eval $(call gb_Library_add_defs,avmedia,\
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # 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_Library,avmediaMacAVF))
$(eval $(call gb_Library_set_componentfile,avmediaMacAVF,avmedia/source/macavf/avmediaMacAVF)) $(eval $(call gb_Library_set_componentfile,avmediaMacAVF,avmedia/source/macavf/avmediaMacAVF))
...@@ -42,5 +43,6 @@ $(eval $(call gb_Library_add_objcxxobjects,avmediaMacAVF,\ ...@@ -42,5 +43,6 @@ $(eval $(call gb_Library_add_objcxxobjects,avmediaMacAVF,\
avmedia/source/macavf/player \ avmedia/source/macavf/player \
avmedia/source/macavf/window \ avmedia/source/macavf/window \
)) ))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # 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_Library,avmediaQuickTime))
$(eval $(call gb_Library_set_componentfile,avmediaQuickTime,avmedia/source/quicktime/avmediaQuickTime)) $(eval $(call gb_Library_set_componentfile,avmediaQuickTime,avmedia/source/quicktime/avmediaQuickTime))
...@@ -41,5 +42,6 @@ $(eval $(call gb_Library_add_objcxxobjects,avmediaQuickTime,\ ...@@ -41,5 +42,6 @@ $(eval $(call gb_Library_add_objcxxobjects,avmediaQuickTime,\
avmedia/source/quicktime/quicktimeuno \ avmedia/source/quicktime/quicktimeuno \
avmedia/source/quicktime/window \ avmedia/source/quicktime/window \
)) ))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # 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_Library,avmediagst))
$(eval $(call gb_Library_set_componentfile,avmediagst,avmedia/source/gstreamer/avmediagstreamer)) $(eval $(call gb_Library_set_componentfile,avmediagst,avmedia/source/gstreamer/avmediagstreamer))
...@@ -53,5 +54,6 @@ $(eval $(call gb_Library_add_exception_objects,avmediagst,\ ...@@ -53,5 +54,6 @@ $(eval $(call gb_Library_add_exception_objects,avmediagst,\
avmedia/source/gstreamer/gstwindow \ avmedia/source/gstreamer/gstwindow \
avmedia/source/gstreamer/gstframegrabber \ avmedia/source/gstreamer/gstframegrabber \
)) ))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # 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_Library,avmediagst_0_10))
$(eval $(call gb_Library_set_componentfile,avmediagst_0_10,avmedia/source/gstreamer/avmediagstreamer_0_10)) $(eval $(call gb_Library_set_componentfile,avmediagst_0_10,avmedia/source/gstreamer/avmediagstreamer_0_10))
...@@ -42,5 +43,6 @@ $(eval $(call gb_Library_add_libs,avmediagst_0_10,\ ...@@ -42,5 +43,6 @@ $(eval $(call gb_Library_add_libs,avmediagst_0_10,\
$(eval $(call gb_Library_add_exception_objects,avmediagst_0_10,\ $(eval $(call gb_Library_add_exception_objects,avmediagst_0_10,\
avmedia/source/gstreamer/gst_0_10 \ avmedia/source/gstreamer/gst_0_10 \
)) ))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # 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_Library,avmediaogl))
$(eval $(call gb_Library_set_componentfile,avmediaogl,avmedia/source/opengl/avmediaogl)) $(eval $(call gb_Library_set_componentfile,avmediaogl,avmedia/source/opengl/avmediaogl))
...@@ -41,5 +42,6 @@ $(eval $(call gb_Library_add_exception_objects,avmediaogl,\ ...@@ -41,5 +42,6 @@ $(eval $(call gb_Library_add_exception_objects,avmediaogl,\
avmedia/source/opengl/ogluno \ avmedia/source/opengl/ogluno \
avmedia/source/opengl/oglwindow \ avmedia/source/opengl/oglwindow \
)) ))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # 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_Library,avmediavlc))
$(eval $(call gb_Library_set_componentfile,avmediavlc,avmedia/source/vlc/avmediavlc)) $(eval $(call gb_Library_set_componentfile,avmediavlc,avmedia/source/vlc/avmediavlc))
...@@ -51,5 +52,6 @@ $(eval $(call gb_Library_add_exception_objects,avmediavlc,\ ...@@ -51,5 +52,6 @@ $(eval $(call gb_Library_add_exception_objects,avmediavlc,\
avmedia/source/vlc/wrapper/EventHandler \ avmedia/source/vlc/wrapper/EventHandler \
avmedia/source/vlc/wrapper/Common \ avmedia/source/vlc/wrapper/Common \
)) ))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # 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_Library,avmediawin))
$(eval $(call gb_Library_set_componentfile,avmediawin,avmedia/source/win/avmediawin)) $(eval $(call gb_Library_set_componentfile,avmediawin,avmedia/source/win/avmediawin))
...@@ -44,5 +45,6 @@ $(eval $(call gb_Library_add_exception_objects,avmediawin,\ ...@@ -44,5 +45,6 @@ $(eval $(call gb_Library_add_exception_objects,avmediawin,\
avmedia/source/win/window \ avmedia/source/win/window \
avmedia/source/win/winuno \ avmedia/source/win/winuno \
)) ))
endif
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
...@@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,avmedia,\ ...@@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,avmedia,\
Library_avmedia \ Library_avmedia \
)) ))
ifneq ($(USE_AVMEDIA_DUMMY),TRUE) ifeq ($(USE_AVMEDIA_DUMMY),FALSE)
$(eval $(call gb_Module_add_l10n_targets,avmedia,\ $(eval $(call gb_Module_add_l10n_targets,avmedia,\
AllLangMoTarget_avmedia \ AllLangMoTarget_avmedia \
)) ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment