[Libreoffice-commits] core.git: sc/Library_scopencl.mk
sc/Library_scopencl.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 418836b04a11cc22d71394872b4a66be7ee545ee Author: Kohei Yoshida kohei.yosh...@collabora.com Date: Wed Nov 20 10:58:02 2013 -0500 Add missing linker flag for clock_gettime() call. Change-Id: Ibd8574dd74398c8b231059ca606edacf7f8005c4 diff --git a/sc/Library_scopencl.mk b/sc/Library_scopencl.mk index f4d400b..ed33ff8 100644 --- a/sc/Library_scopencl.mk +++ b/sc/Library_scopencl.mk @@ -51,6 +51,7 @@ $(eval $(call gb_Library_add_exception_objects,scopencl,\ ifeq ($(OS),LINUX) $(eval $(call gb_Library_add_libs,scopencl,\ -ldl \ + -lrt \ )) endif ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/Library_scopencl.mk
sc/Library_scopencl.mk |1 - 1 file changed, 1 deletion(-) New commits: commit df21d317dacc4533ac999f3c3088765393842676 Author: Michael Stahl mst...@redhat.com Date: Mon Nov 4 22:21:17 2013 +0100 sc: stop linking openssl in scopencl library Change-Id: I6618ac1d469e9a45bac30b2a1d94711f43ee5ed7 diff --git a/sc/Library_scopencl.mk b/sc/Library_scopencl.mk index 2fb8cfc..1f03ad5 100644 --- a/sc/Library_scopencl.mk +++ b/sc/Library_scopencl.mk @@ -21,7 +21,6 @@ $(eval $(call gb_Library_use_sdk_api,scopencl)) $(eval $(call gb_Library_use_externals,scopencl,\ boost_headers \ -openssl \ )) $(eval $(call gb_Library_use_libraries,scopencl,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/Library_scopencl.mk
sc/Library_scopencl.mk |1 + 1 file changed, 1 insertion(+) New commits: commit 0dab391bdb18378ee304f56177bb572e418edaf0 Author: Markus Mohrhard markus.mohrh...@googlemail.com Date: Tue Oct 22 08:18:23 2013 +0200 missing dependency on mdds diff --git a/sc/Library_scopencl.mk b/sc/Library_scopencl.mk index cb702e8..75dcaf0 100644 --- a/sc/Library_scopencl.mk +++ b/sc/Library_scopencl.mk @@ -21,6 +21,7 @@ $(eval $(call gb_Library_use_sdk_api,scopencl)) $(eval $(call gb_Library_use_externals,scopencl,\ boost_headers \ + mdds_headers \ )) $(eval $(call gb_Library_use_libraries,scopencl,\ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/Library_scopencl.mk sc/source
sc/Library_scopencl.mk |3 +--
sc/source/core/opencl/openclwrapper.cxx |8 +++-
sc/source/core/opencl/openclwrapper.hxx |8
3 files changed, 4 insertions(+), 15 deletions(-)
New commits:
commit ab683542cd78e225a2e11e405e1cd8cfce99461a
Author: Tor Lillqvist t...@collabora.com
Date: Mon Sep 30 14:27:38 2013 +0300
Revert Fix OpenCL use on Mac
Nah, do use clew after all. Makes it easier to build against an old
SDK. Do always link against the OpenCL framework, though, and use NULL
instead of some dylib name as the parameter to clewInit() (and thus
dlopen()).
This reverts commit d0fdae78797979949ec7ead20ad52b901c8c7e9a.
Change-Id: I2ec07ddf60941851ea70523113296627fbd80a0c
diff --git a/sc/Library_scopencl.mk b/sc/Library_scopencl.mk
index c2ca1f3..cb702e8 100644
--- a/sc/Library_scopencl.mk
+++ b/sc/Library_scopencl.mk
@@ -36,8 +36,7 @@ $(eval $(call gb_Library_use_libraries,scopencl,\
$(eval $(call gb_Library_add_exception_objects,scopencl,\
sc/source/core/opencl/formulagroupcl \
sc/source/core/opencl/openclwrapper \
-$(if $(filter-out MACOSX,$(OS)), \
-sc/source/core/opencl/clcc/clew) \
+sc/source/core/opencl/clcc/clew \
))
ifeq ($(OS),LINUX)
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index 50bb0d1..6fa86cc 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -41,7 +41,9 @@
fprintf(stderr,[OCL_ERROR] %s\n,str);
#define OPENCL_DLL_NAME OpenCL.dll
-#elif !defined(MACOSX)
+#elif defined(MACOSX)
+#define OPENCL_DLL_NAME NULL
+#else
#define OPENCL_DLL_NAME libOpenCL.so
#endif
@@ -2609,11 +2611,9 @@ bool createPlatformInfo(cl_platform_id nPlatformId,
OpenclPlatformInfo rPlatfor
size_t getOpenCLPlatformCount()
{
-#ifndef MACOSX
int status = clewInit(OPENCL_DLL_NAME);
if (status 0)
return 0;
-#endif
cl_uint nPlatforms;
cl_int nState = clGetPlatformIDs(0, NULL, nPlatforms);
@@ -2630,11 +2630,9 @@ const std::vectorOpenclPlatformInfo fillOpenCLInfo()
if(!aPlatforms.empty())
return aPlatforms;
-#ifndef MACOSX
int status = clewInit(OPENCL_DLL_NAME);
if (status 0)
return aPlatforms;
-#endif
cl_uint nPlatforms;
cl_int nState = clGetPlatformIDs(0, NULL, nPlatforms);
diff --git a/sc/source/core/opencl/openclwrapper.hxx
b/sc/source/core/opencl/openclwrapper.hxx
index 5fd3991..c81c313 100644
--- a/sc/source/core/opencl/openclwrapper.hxx
+++ b/sc/source/core/opencl/openclwrapper.hxx
@@ -21,16 +21,8 @@
#include rtl/string.hxx
-#ifdef MACOSX
-
-#include OpenCL/cl.h
-
-#else
-
#include clcc/clew.h
-#endif
-
// CL_MAP_WRITE_INVALIDATE_REGION is new in OpenCL 1.2.
// When compiling against an older OpenCL, use CL_MAP_WRITE.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/Library_scopencl.mk sc/source
sc/Library_scopencl.mk |9 -
sc/source/core/opencl/openclwrapper.cxx |6 +-
sc/source/core/opencl/openclwrapper.hxx |8
3 files changed, 21 insertions(+), 2 deletions(-)
New commits:
commit d0fdae78797979949ec7ead20ad52b901c8c7e9a
Author: Tor Lillqvist t...@collabora.com
Date: Sat Sep 28 23:20:34 2013 +0200
Fix OpenCL use on Mac
Don't use glew but just include the OpenCL/cl.h which is present in
the SDK and link to the OpenCL framework.
Change-Id: I3e1c3773078bc5d2550be832a273273d89381dff
diff --git a/sc/Library_scopencl.mk b/sc/Library_scopencl.mk
index 2942e47..c2ca1f3 100644
--- a/sc/Library_scopencl.mk
+++ b/sc/Library_scopencl.mk
@@ -36,7 +36,8 @@ $(eval $(call gb_Library_use_libraries,scopencl,\
$(eval $(call gb_Library_add_exception_objects,scopencl,\
sc/source/core/opencl/formulagroupcl \
sc/source/core/opencl/openclwrapper \
-sc/source/core/opencl/clcc/clew \
+$(if $(filter-out MACOSX,$(OS)), \
+sc/source/core/opencl/clcc/clew) \
))
ifeq ($(OS),LINUX)
@@ -45,4 +46,10 @@ $(eval $(call gb_Library_add_libs,scopencl,\
))
endif
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_libs,scopencl,\
+-framework OpenCL \
+))
+endif
+
# vim: set noet sw=4 ts=4:
diff --git a/sc/source/core/opencl/openclwrapper.cxx
b/sc/source/core/opencl/openclwrapper.cxx
index bc51148..50bb0d1 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -41,7 +41,7 @@
fprintf(stderr,[OCL_ERROR] %s\n,str);
#define OPENCL_DLL_NAME OpenCL.dll
-#else
+#elif !defined(MACOSX)
#define OPENCL_DLL_NAME libOpenCL.so
#endif
@@ -2609,9 +2609,11 @@ bool createPlatformInfo(cl_platform_id nPlatformId,
OpenclPlatformInfo rPlatfor
size_t getOpenCLPlatformCount()
{
+#ifndef MACOSX
int status = clewInit(OPENCL_DLL_NAME);
if (status 0)
return 0;
+#endif
cl_uint nPlatforms;
cl_int nState = clGetPlatformIDs(0, NULL, nPlatforms);
@@ -2628,9 +2630,11 @@ const std::vectorOpenclPlatformInfo fillOpenCLInfo()
if(!aPlatforms.empty())
return aPlatforms;
+#ifndef MACOSX
int status = clewInit(OPENCL_DLL_NAME);
if (status 0)
return aPlatforms;
+#endif
cl_uint nPlatforms;
cl_int nState = clGetPlatformIDs(0, NULL, nPlatforms);
diff --git a/sc/source/core/opencl/openclwrapper.hxx
b/sc/source/core/opencl/openclwrapper.hxx
index c81c313..5fd3991 100644
--- a/sc/source/core/opencl/openclwrapper.hxx
+++ b/sc/source/core/opencl/openclwrapper.hxx
@@ -21,8 +21,16 @@
#include rtl/string.hxx
+#ifdef MACOSX
+
+#include OpenCL/cl.h
+
+#else
+
#include clcc/clew.h
+#endif
+
// CL_MAP_WRITE_INVALIDATE_REGION is new in OpenCL 1.2.
// When compiling against an older OpenCL, use CL_MAP_WRITE.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
