diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-11-19 11:10:44 +0100 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-11-19 11:12:21 +0100 |
| commit | f433253f5bae7c60f8f28c476795e527944dda29 (patch) | |
| tree | a8353a46012bf13e1b7fc251208b8591f8fd5c15 | |
| parent | dfc45f0abab98a1ce977c6ed95dfa07c185b6d11 (diff) | |
iOS reactivated swarmsolver
swarmsolver now compiles after the license issue was corrected, so
no need to have a special case for iOS.
Change-Id: Icae81c2b5769af9c8fd53068d69cbb6e608c7e69
| -rw-r--r-- | postprocess/Rdb_services.mk | 3 | ||||
| -rw-r--r-- | sccomp/Library_solver.mk | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index e4bc74455dda..d83b30819ccd 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -118,8 +118,7 @@ $(eval $(call gb_Rdb_add_components,services,\ $(if $(ENABLE_LPSOLVE), \ sccomp/source/solver/lpsolvesolver \ ) \ - $(if $(filter-out $(OS),IOS), \ - sccomp/source/solver/swarmsolver) \ + sccomp/source/solver/swarmsolver \ writerfilter/util/writerfilter \ writerperfect/source/draw/wpftdraw \ writerperfect/source/impress/wpftimpress \ diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index 178eb35bee07..e23ecac7a5bb 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -22,9 +22,7 @@ $(eval $(call gb_Library_Library,solver)) $(if $(ENABLE_COINMP),$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/coinmpsolver))) $(if $(ENABLE_LPSOLVE),$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/lpsolvesolver))) -ifneq ($(OS),IOS) $(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/swarmsolver)) -endif $(eval $(call gb_Library_use_sdk_api,solver)) @@ -49,8 +47,7 @@ $(eval $(call gb_Library_use_externals,solver,\ )) $(eval $(call gb_Library_add_exception_objects,solver,\ - $(if $(filter-out $(OS),IOS), \ - sccomp/source/solver/SwarmSolver) \ + sccomp/source/solver/SwarmSolver \ sccomp/source/solver/SolverComponent \ $(if $(ENABLE_COINMP), sccomp/source/solver/CoinMPSolver) \ $(if $(ENABLE_LPSOLVE), sccomp/source/solver/LpsolveSolver) \ |