cui/source/dialogs/about.cxx | 4 ++++ desktop/source/app/opencl.cxx | 2 ++ 2 files changed, 6 insertions(+)
New commits: commit 05676088e23a7da470ba5e574ddf03a29fb11c9a Author: Miklos Vajna <[email protected]> Date: Thu Jul 28 10:33:53 2016 +0200 cui: fix Android build Change-Id: I6396d7702de42ad2cec3843e919cca084e92c008 diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index de6b4dc..22bb659 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -48,7 +48,9 @@ #include <rtl/ustrbuf.hxx> #include <vcl/bitmap.hxx> +#if HAVE_FEATURE_OPENCL #include <opencl/openclwrapper.hxx> +#endif #include <officecfg/Office/Common.hxx> using namespace ::com::sun::star::uno; @@ -304,6 +306,7 @@ OUString AboutDialog::GetVersionString() sVersion += m_aLocaleStr.replaceAll("$LOCALE", aLocaleStr); } +#if HAVE_FEATURE_OPENCL OUString aCalcMode = "Calc: "; // Calc calculation mode bool bSWInterp = officecfg::Office::Common::Misc::UseSwInterpreter::get(); bool bOpenCL = opencl::GPUEnv::isOpenCLEnabled(); @@ -314,6 +317,7 @@ OUString AboutDialog::GetVersionString() else aCalcMode += "single"; sVersion += "; " + aCalcMode; +#endif return sVersion; } commit f2027aabc0a4efa9809dfa420c74e074f678e951 Author: Miklos Vajna <[email protected]> Date: Thu Jul 28 10:27:50 2016 +0200 desktop: fix Android build Change-Id: I1ea8edba2dc34386c2748c3ee2310963252082e6 diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx index 521d225..7eb8339 100644 --- a/desktop/source/app/opencl.cxx +++ b/desktop/source/app/opencl.cxx @@ -28,7 +28,9 @@ #include <com/sun/star/sheet/XSpreadsheets.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> +#if HAVE_FEATURE_OPENCL #include <opencl/openclwrapper.hxx> +#endif #include <opencl/OpenCLZone.hxx> #include <osl/file.hxx> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
