From: Sebastian Hack <hack@ipd.info.uni-karlsruhe.de>
Date: Tue, 21 Mar 2006 15:17:47 +0000 (+0000)
Subject: Getting server/solver from global settings now
X-Git-Url: http://nsz.repo.hu/git/?a=commitdiff_plain;h=a392feca0ee56443fdff11ce9c378ed4bdf654db;p=libfirm

Getting server/solver from global settings now
---

diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c
index ee1a6f3ce..1964a4386 100644
--- a/ir/be/becopyilp.c
+++ b/ir/be/becopyilp.c
@@ -152,13 +152,14 @@ ilp_env_t *new_ilp_env(copy_opt_t *co, ilp_callback build, ilp_callback apply, v
 lpp_sol_state_t ilp_go(ilp_env_t *ienv) {
 	FILE *f;
 	char buf[256];
+	be_main_env_t *main_env = ienv->co->cenv->birg->main_env;
 
 	sr_remove(ienv->sr);
 
 	ienv->build(ienv);
 
 #ifdef LPP_SOLVE_NET
-	lpp_solve_net(ienv->lp, LPP_HOST, LPP_SOLVER);
+	lpp_solve_net(ienv->lp, main_env->options->ilp_server, main_env->options->ilp_solver);
 #else
 	lpp_solve_cplex(ienv->lp);
 #endif
diff --git a/ir/be/becopyilp_t.h b/ir/be/becopyilp_t.h
index f2454b608..1c892cd40 100644
--- a/ir/be/becopyilp_t.h
+++ b/ir/be/becopyilp_t.h
@@ -115,8 +115,6 @@ static INLINE int co_ilp_get_costs(copy_opt_t *co, ir_node *root, ir_node *arg)
 
 #ifdef LPP_SOLVE_NET
 #  include <lpp/lpp_net.h>
-#  define LPP_HOST "i44pc52"
-#  define LPP_SOLVER "cplex"
 #else
 #  include <lpp/lpp_cplex.h>
 #endif