[Libreoffice-commits] core.git: Branch 'private/kohei/formula-opencl-work' - 2 commits - sc/Library_scopencl.mk sc/source

[Kohei Yoshida]

 sc/Library_scopencl.mk             |   29 ++++++++++++++++++-----------
 sc/source/core/data/colorscale.cxx |    4 ++--
 2 files changed, 20 insertions(+), 13 deletions(-)

New commits:
commit 7c94346a60ddf44f7ce82a11d0d374831afc7e9b
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Thu Sep 12 07:36:34 2013 -0400

    Additional build fix for Windows.
    
    Change-Id: Ie1d6eec25c442e8dba31936e502249ee04c13177

diff --git a/sc/Library_scopencl.mk b/sc/Library_scopencl.mk
index 0eab89eb..2942e47 100644
--- a/sc/Library_scopencl.mk
+++ b/sc/Library_scopencl.mk
@@ -10,31 +10,38 @@
 $(eval $(call gb_Library_Library,scopencl))
 
 $(eval $(call gb_Library_set_include,scopencl,\
-	-I$(SRCDIR)/sc/source/core/inc \
-	-I$(SRCDIR)/sc/inc \
-	$$(INCLUDE) \
+        -I$(SRCDIR)/sc/source/core/inc \
+        -I$(SRCDIR)/sc/inc \
+        $$(INCLUDE) \
 ))
 
 $(eval $(call gb_Library_set_precompiled_header,scopencl,$(SRCDIR)/sc/inc/pch/precompiled_scopencl))
 
 $(eval $(call gb_Library_use_sdk_api,scopencl))
 
+$(eval $(call gb_Library_use_externals,scopencl,\
+        boost_headers \
+))
+
 $(eval $(call gb_Library_use_libraries,scopencl,\
-	for \
-	sal \
-	sc \
-	$(gb_UWINAPI) \
+        cppu \
+        cppuhelper \
+        for \
+        sal \
+        sc \
+        tl \
+        $(gb_UWINAPI) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,scopencl,\
-	sc/source/core/opencl/formulagroupcl \
-	sc/source/core/opencl/openclwrapper \
-	sc/source/core/opencl/clcc/clew \
+        sc/source/core/opencl/formulagroupcl \
+        sc/source/core/opencl/openclwrapper \
+        sc/source/core/opencl/clcc/clew \
 ))
 
 ifeq ($(OS),LINUX)
 $(eval $(call gb_Library_add_libs,scopencl,\
-	-ldl \
+        -ldl \
 ))
 endif
 
commit 058416fa31c8fae861691ad8d060b46ca08321ae
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date:   Wed Sep 11 22:12:57 2013 -0400

    Don't forget assignment operators.
    
    Change-Id: If9ee3f140a09b1977afaad8ad00406c67bbe224f

diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx
index 8a1d0df..5481d99 100644
--- a/sc/source/core/data/colorscale.cxx
+++ b/sc/source/core/data/colorscale.cxx
@@ -1204,11 +1204,11 @@ const sal_Int32 a3Flags[] = {
     BMP_ICON_SET_FLAGS_RED, BMP_ICON_SET_FLAGS_YELLOW, BMP_ICON_SET_FLAGS_GREEN
 };
 
-const sal_Int32 a3Smilies[] {
+const sal_Int32 a3Smilies[] = {
     BMP_ICON_SET_POSITIVE_YELLOW_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, BMP_ICON_SET_NEGATIVE_YELLOW_SMILIE
 };
 
-const sal_Int32 a3ColorSmilies[] {
+const sal_Int32 a3ColorSmilies[] = {
     BMP_ICON_SET_POSITIVE_GREEN_SMILIE, BMP_ICON_SET_NEUTRAL_YELLOW_SMILIE, BMP_ICON_SET_NEGATIVE_RED_SMILIE
 };