diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-03-27 14:51:46 +0100 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-04-03 11:42:12 +0200 |
| commit | 077bdc73f2bcd625be1030fa8ff630c3dbd83657 (patch) | |
| tree | 098872881ab723b3fa34670b2b0c88a23337c58b /sccomp/Library_solver.mk | |
| parent | dae3e18376a0fa770fa839959aeedc7c2044d4b6 (diff) | |
sccomp: Share common code and have only one library.
And use constructor feature for UNO implementations.
Change-Id: I42b6a6f417049cc8e2d44b74c7adc552680b1f2d
Diffstat (limited to 'sccomp/Library_solver.mk')
| -rw-r--r-- | sccomp/Library_solver.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk index e1b2ca3fdfeb..450728805998 100644 --- a/sccomp/Library_solver.mk +++ b/sccomp/Library_solver.mk @@ -19,7 +19,8 @@ $(eval $(call gb_Library_Library,solver)) -$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/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))) $(eval $(call gb_Library_use_sdk_api,solver)) @@ -35,11 +36,14 @@ $(eval $(call gb_Library_use_libraries,solver,\ $(eval $(call gb_Library_use_externals,solver,\ boost_headers \ + coinmp \ lpsolve \ )) $(eval $(call gb_Library_add_exception_objects,solver,\ - sccomp/source/solver/solver-lpsolve \ + sccomp/source/solver/SolverComponent \ + $(if $(ENABLE_COINMP), sccomp/source/solver/CoinMPSolver) \ + $(if $(ENABLE_LPSOLVE), sccomp/source/solver/LpsolveSolver) \ )) # vim: set noet sw=4 ts=4: |