diff options
author | Tor Lillqvist <tml@collabora.com> | 2014-11-26 22:30:33 +0200 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2014-11-27 11:07:37 +0200 |
commit | c1d09b1ad02160850d40c0d242a0d0ec0a8dc1bc (patch) | |
tree | e39b6a73639f483a3000cdec31890cfdd051a5af /cui/Library_cui.mk | |
parent | Missing slash (diff) | |
download | core-c1d09b1ad02160850d40c0d242a0d0ec0a8dc1bc.tar.gz core-c1d09b1ad02160850d40c0d242a0d0ec0a8dc1bc.zip |
Work in progress: Move Calc-independend OpenCL configuration out of sc
Intermediate commit. More changes will follow: The device selection
logic needs to be moved, too. (And cleaned up.) Instead of the
separate formulacalculationoptions dialog we should simply have a
normal options page for those OpenCL-related settings that will remain
purely Calc-specific, like the formula opcode subsetting.
Change-Id: Id60d95e80d377cbbf5780beb473b221bce06b5e5
Diffstat (limited to 'cui/Library_cui.mk')
-rw-r--r-- | cui/Library_cui.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index b821f2a6a45b..b564e4d32012 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -44,6 +44,8 @@ $(eval $(call gb_Library_use_libraries,cui,\ $(if $(ENABLE_JAVA), \ jvmfwk) \ lng \ + $(call gb_Helper_optional,OPENCL, \ + opencl) \ sal \ salhelper \ sax \ @@ -64,6 +66,8 @@ $(eval $(call gb_Library_use_libraries,cui,\ $(eval $(call gb_Library_use_externals,cui,\ boost_headers \ + $(call gb_Helper_optional,OPENCL,\ + clew) \ icuuc \ icu_headers \ )) @@ -153,6 +157,8 @@ $(eval $(call gb_Library_add_exception_objects,cui,\ cui/source/options/optjsearch \ cui/source/options/optlingu \ cui/source/options/optmemory \ + $(call gb_Helper_optional,OPENCL, \ + cui/source/options/optopencl) \ cui/source/options/optpath \ cui/source/options/optsave \ cui/source/options/optupdt \ |