Kaydet (Commit) 0ee2bd1a authored tarafından jan Iversen's avatar jan Iversen

iOS, swarmsolver workaround

Due to license problems (see mail dev list) disabled swarmsolver

Change-Id: I39889ddab2563a857c3bf0982244f889a402097f
üst 0aed91c6
...@@ -118,7 +118,8 @@ $(eval $(call gb_Rdb_add_components,services,\ ...@@ -118,7 +118,8 @@ $(eval $(call gb_Rdb_add_components,services,\
$(if $(ENABLE_LPSOLVE), \ $(if $(ENABLE_LPSOLVE), \
sccomp/source/solver/lpsolvesolver \ sccomp/source/solver/lpsolvesolver \
) \ ) \
sccomp/source/solver/swarmsolver \ $(if $(filter-out $(OS),IOS), \
sccomp/source/solver/swarmsolver) \
writerfilter/util/writerfilter \ writerfilter/util/writerfilter \
writerperfect/source/draw/wpftdraw \ writerperfect/source/draw/wpftdraw \
writerperfect/source/impress/wpftimpress \ writerperfect/source/impress/wpftimpress \
......
...@@ -22,7 +22,9 @@ $(eval $(call gb_Library_Library,solver)) ...@@ -22,7 +22,9 @@ $(eval $(call gb_Library_Library,solver))
$(if $(ENABLE_COINMP),$(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/coinmpsolver))) $(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))) $(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)) $(eval $(call gb_Library_set_componentfile,solver,sccomp/source/solver/swarmsolver))
endif
$(eval $(call gb_Library_use_sdk_api,solver)) $(eval $(call gb_Library_use_sdk_api,solver))
...@@ -47,7 +49,8 @@ $(eval $(call gb_Library_use_externals,solver,\ ...@@ -47,7 +49,8 @@ $(eval $(call gb_Library_use_externals,solver,\
)) ))
$(eval $(call gb_Library_add_exception_objects,solver,\ $(eval $(call gb_Library_add_exception_objects,solver,\
sccomp/source/solver/SwarmSolver \ $(if $(filter-out $(OS),IOS), \
sccomp/source/solver/SwarmSolver) \
sccomp/source/solver/SolverComponent \ sccomp/source/solver/SolverComponent \
$(if $(ENABLE_COINMP), sccomp/source/solver/CoinMPSolver) \ $(if $(ENABLE_COINMP), sccomp/source/solver/CoinMPSolver) \
$(if $(ENABLE_LPSOLVE), sccomp/source/solver/LpsolveSolver) \ $(if $(ENABLE_LPSOLVE), sccomp/source/solver/LpsolveSolver) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment