avmedia/AllLangMoTarget_avmedia.mk | 2 ++ avmedia/Library_avmedia.mk | 3 +-- 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 +- vcl/ios/dummies.cxx | 19 +++++++++++++++++++ 11 files changed, 37 insertions(+), 3 deletions(-)
New commits: commit 032b1e87078fe60cf8b59b756d93b02b278ed8c8 Author: jan Iversen <[email protected]> Date: Tue Oct 10 11:46:57 2017 +0200 iOS, removed unneeded avmedia libraries add USE_AVMEDIA_DUMMY to .mk to stop libraries from being generated Change-Id: Ic8a81d681bfaa3f7124b3ad79007527517aaecd9 diff --git a/avmedia/AllLangMoTarget_avmedia.mk b/avmedia/AllLangMoTarget_avmedia.mk index 564b9ab94b43..df2886b0aa1a 100644 --- a/avmedia/AllLangMoTarget_avmedia.mk +++ b/avmedia/AllLangMoTarget_avmedia.mk @@ -6,6 +6,8 @@ # 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 334ea70da3d2..ad253dd0eb27 100644 --- a/avmedia/Library_avmedia.mk +++ b/avmedia/Library_avmedia.mk @@ -9,8 +9,6 @@ $(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 \ @@ -25,6 +23,7 @@ $(eval $(call gb_Library_add_exception_objects,avmedia,\ )) else +$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia)) $(eval $(call gb_Library_add_defs,avmedia,\ diff --git a/avmedia/Library_avmediaMacAVF.mk b/avmedia/Library_avmediaMacAVF.mk index 877efd97ac36..acd6717bc769 100644 --- a/avmedia/Library_avmediaMacAVF.mk +++ b/avmedia/Library_avmediaMacAVF.mk @@ -7,6 +7,7 @@ # 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)) @@ -42,5 +43,6 @@ $(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 85eca192eb9a..a593d78f5cf0 100644 --- a/avmedia/Library_avmediaQuickTime.mk +++ b/avmedia/Library_avmediaQuickTime.mk @@ -7,6 +7,7 @@ # 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)) @@ -41,5 +42,6 @@ $(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 9b9622b7edc5..998e90f1aa5d 100644 --- a/avmedia/Library_avmediagst.mk +++ b/avmedia/Library_avmediagst.mk @@ -7,6 +7,7 @@ # 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)) @@ -53,5 +54,6 @@ $(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 16f2d5db1440..6658cc51f64f 100644 --- a/avmedia/Library_avmediagst_0_10.mk +++ b/avmedia/Library_avmediagst_0_10.mk @@ -7,6 +7,7 @@ # 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)) @@ -42,5 +43,6 @@ $(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 eae3efab1e64..2418093b09e8 100644 --- a/avmedia/Library_avmediaogl.mk +++ b/avmedia/Library_avmediaogl.mk @@ -7,6 +7,7 @@ # 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)) @@ -41,5 +42,6 @@ $(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 0ee5cd2d0d46..91f3f0f68e93 100644 --- a/avmedia/Library_avmediavlc.mk +++ b/avmedia/Library_avmediavlc.mk @@ -7,6 +7,7 @@ # 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)) @@ -51,5 +52,6 @@ $(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 09453d6c77ba..a16d8ecc5596 100644 --- a/avmedia/Library_avmediawin.mk +++ b/avmedia/Library_avmediawin.mk @@ -7,6 +7,7 @@ # 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)) @@ -44,5 +45,6 @@ $(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 8e1bd011d5e8..6af64efbad75 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -13,7 +13,7 @@ $(eval $(call gb_Module_add_targets,avmedia,\ Library_avmedia \ )) -ifneq ($(USE_AVMEDIA_DUMMY),TRUE) +ifeq ($(USE_AVMEDIA_DUMMY),FALSE) $(eval $(call gb_Module_add_l10n_targets,avmedia,\ AllLangMoTarget_avmedia \ )) commit 7437a04666d7cc4b336f9210aeaa6fc80392acd0 Author: jan Iversen <[email protected]> Date: Tue Oct 10 09:50:53 2017 +0200 iOS, solve missing vcl references needed more dummy stuff Change-Id: I96392415a8f778be3ef1a44fb485d27049f7f324 diff --git a/vcl/ios/dummies.cxx b/vcl/ios/dummies.cxx index 40fc867a4c79..56fd92a93f3a 100644 --- a/vcl/ios/dummies.cxx +++ b/vcl/ios/dummies.cxx @@ -20,6 +20,8 @@ #include "salprn.hxx" #include "headless/svpgdi.hxx" #include "headless/svpinst.hxx" +#include "unx/fontmanager.hxx" +#include "unx/gendata.hxx" SalPrinter* SvpSalInstance::CreatePrinter( SalInfoPrinter* /* pInfoPrinter */ ) { @@ -129,4 +131,21 @@ bool AquaSalGraphics::drawEPS( long, long, long, long, void*, sal_uLong ) return false; } +using namespace psp; + +GenericUnixSalData::GenericUnixSalData(GenericUnixSalDataType const t, SalInstance *const pInstance) + : m_eType(t), m_pDisplay(nullptr), m_pPrintFontManager(nullptr) +{ + m_pInstance = pInstance; SetSalData(this); +} + +GenericUnixSalData::~GenericUnixSalData() +{ +} + + +PrintFontManager::~PrintFontManager() +{ +} + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
