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

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
üst dfc45f0a
...@@ -118,8 +118,7 @@ $(eval $(call gb_Rdb_add_components,services,\ ...@@ -118,8 +118,7 @@ $(eval $(call gb_Rdb_add_components,services,\
$(if $(ENABLE_LPSOLVE), \ $(if $(ENABLE_LPSOLVE), \
sccomp/source/solver/lpsolvesolver \ sccomp/source/solver/lpsolvesolver \
) \ ) \
$(if $(filter-out $(OS),IOS), \ sccomp/source/solver/swarmsolver \
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,9 +22,7 @@ $(eval $(call gb_Library_Library,solver)) ...@@ -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_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))
...@@ -49,8 +47,7 @@ $(eval $(call gb_Library_use_externals,solver,\ ...@@ -49,8 +47,7 @@ $(eval $(call gb_Library_use_externals,solver,\
)) ))
$(eval $(call gb_Library_add_exception_objects,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 \ 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