Don't bother with a separate dynamically loaded scopencl library

Just link that code into the sc library. We use clew anyway to handle
optoinal presence of OpenCL at run-time.

This is a straightforward change for now. Could be cleaner; we could
get rid of the fairly pointless wrappers in
sc/source/core/opencl/formulagroupcl.cxx for instance.

Change-Id: I23215c6516ef04698f6891e2a7fc6611dc83b37a

3 files changed, 4 insertions, 53 deletions

diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index 5e4dada012d9..e46f17c5ca6b 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -57,6 +57,7 @@
 #include <boost/unordered_set.hpp>
 #include <cassert>
 #include <climits>
+#include <cmath>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleEventObject.hpp>
 #include <com/sun/star/accessibility/AccessibleRelationType.hpp>
@@ -430,6 +431,7 @@
 #include <comphelper/types.hxx>
 #include <comphelper/uno3.hxx>
 #include <config_features.h>
+#include <config_folders.h>
 #include <config_mpl.h>
 #include <config_options.h>
 #include <config_orcus.h>
@@ -561,6 +563,7 @@
 #include <rsc/rscsfx.hxx>
 #include <rtl/bootstrap.hxx>
 #include <rtl/crc.h>
+#include <rtl/digest.h>
 #include <rtl/instance.hxx>
 #include <rtl/math.hxx>
 #include <rtl/ref.hxx>
@@ -627,6 +630,7 @@
 #include <sot/filelist.hxx>
 #include <sot/formats.hxx>
 #include <sot/storage.hxx>
+#include <sstream>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/sc/inc/pch/precompiled_scopencl.cxx b/sc/inc/pch/precompiled_scopencl.cxx
deleted file mode 100644
index 85d15b40e4a5..000000000000
--- a/sc/inc/pch/precompiled_scopencl.cxx
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * 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/.
- */
-
-#include "precompiled_scopencl.hxx"
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/pch/precompiled_scopencl.hxx b/sc/inc/pch/precompiled_scopencl.hxx
deleted file mode 100644
index 82714668d2fa..000000000000
--- a/sc/inc/pch/precompiled_scopencl.hxx
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * 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/.
- */
-
-/*
- This file has been autogenerated by update_pch.sh . It is possible to edit it
- manually (such as when an include file has been moved/renamed/removed. All such
- manual changes will be rewritten by the next run of update_pch.sh (which presumably
- also fixes all possible problems, so it's usually better to use it).
-*/
-
-#include <algorithm>
-#include <boost/scoped_array.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <cmath>
-#include <config_folders.h>
-#include <float.h>
-#include <formula/vectortoken.hxx>
-#include <iostream>
-#include <list>
-#include <map>
-#include <math.h>
-#include <osl/file.hxx>
-#include <rtl/bootstrap.hxx>
-#include <rtl/digest.h>
-#include <rtl/strbuf.hxx>
-#include <rtl/ustring.hxx>
-#include <sal/config.h>
-#include <sstream>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <vector>
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */