[Libreoffice-commits] core.git: 3 commits - configure.ac sc/source

[Tor Lillqvist]

 configure.ac                            |   33 +++++++++++++++++++-------------
 sc/source/core/opencl/openclwrapper.cxx |    2 -
 sc/source/core/opencl/openclwrapper.hxx |    4 +++
 3 files changed, 25 insertions(+), 14 deletions(-)

New commits:
commit e107cd53e7ac17dceb475d6ca25ca2713752a75f
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Jun 28 10:19:27 2013 +0300

    WaE: using directive refers to implicitly-defined namespace 'std'
    
    No C++ std library header has been included and no std API is used
    anyway, so the directive is pointless.
    
    Change-Id: Idcb7698a56eb5cc1400f085c2c2cc7424f6f8b03

diff --git a/sc/source/core/opencl/openclwrapper.cxx b/sc/source/core/opencl/openclwrapper.cxx
index 20d60e2..829283d 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -18,7 +18,7 @@
 #include <Windows.h>
 #endif
 //#define USE_KERNEL_FILE
-using namespace std;
+
 GPUEnv OpenclDevice::gpuEnv;
 int OpenclDevice::isInited =0;
 
commit 2a7722d365e03c638596efcdc57686e7c967b34e
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jun 17 19:26:45 2013 +0300

    No need to check on OS X
    
    Change-Id: Ib7dc7b4e6f4dd5829116968f9c86d431b16a5071

diff --git a/configure.ac b/configure.ac
index 4615ef3..42d1569 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9845,19 +9845,26 @@ dnl =================================================
 OPENCL_LIBS=
 OPENCL_CFLAGS=
 ENABLE_OPENCL=
-AC_MSG_CHECKING([opencl sdk])
-if test "z$with_opencl_sdk" = "z"; then
-       AC_MSG_RESULT([no])
-else
-       if test -d $with_opencl_sdk/include; then
-               ENABLE_OPENCL=TRUE
-               OPENCL_CFLAGS="-I$with_opencl_sdk/include"
-               OPENCL_LIBS="-L$with_opencl_sdk/lib/x86 -lOpenCL"
-               AC_MSG_RESULT([found at path $with_opencl_sdk])
-               AC_DEFINE(HAVE_FEATURE_OPENCL)
-       else
-               AC_MSG_ERROR([no headers found found at $with_opencl_sdk/include ])
-       fi
+AC_MSG_CHECKING([OpenCL])
+if test \( -z "$with_opencl_sdk" -o "$with_opencl_sdk" = yes \) -a $_os = Darwin; then
+    # OS X
+    AC_MSG_RESULT([yes, always on OS X])
+    ENABLE_OPENCL=TRUE
+    OPENCL_CFLAGS=
+    OPENCL_LIBS="-framework OpenCL"
+    AC_DEFINE(HAVE_FEATURE_OPENCL)
+elif test "z$with_opencl_sdk" = "z"; then
+    AC_MSG_RESULT([no])
+else
+    if test -d $with_opencl_sdk/include; then
+        ENABLE_OPENCL=TRUE
+        OPENCL_CFLAGS="-I$with_opencl_sdk/include"
+        OPENCL_LIBS="-L$with_opencl_sdk/lib/x86 -lOpenCL"
+        AC_MSG_RESULT([found at path $with_opencl_sdk])
+        AC_DEFINE(HAVE_FEATURE_OPENCL)
+    else
+        AC_MSG_ERROR([no headers found found at $with_opencl_sdk/include ])
+    fi
 fi
 AC_SUBST(OPENCL_CFLAGS)
 AC_SUBST(OPENCL_LIBS)
commit c38a9b9041337dfdeeb684a3a739b0d203eb4e96
Author: Tor Lillqvist <tml at iki.fi>
Date:   Mon Jun 17 19:16:28 2013 +0300

    Apple has the header in a different path
    
    Change-Id: Ieae4ac97c8938a6c0a7fa33438669200763c818f

diff --git a/sc/source/core/opencl/openclwrapper.hxx b/sc/source/core/opencl/openclwrapper.hxx
index 62006d1..b9d2255 100644
--- a/sc/source/core/opencl/openclwrapper.hxx
+++ b/sc/source/core/opencl/openclwrapper.hxx
@@ -12,7 +12,11 @@
 
 #include <config_features.h>
 
+#ifdef __APPLE__
+#include <OpenCL/cl.h>
+#else
 #include <CL/cl.h>
+#endif
 
 #define MaxTextExtent  4096
 //support AMD opencl