Skip to content

Commit

Permalink
commented out from makefile sim and ocp_nlp stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
giaf committed Oct 2, 2017
1 parent 73f1542 commit 2571bf9
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ OBJS += dense_qp/s_dense_qp.o dense_qp/s_dense_qp_sol.o dense_qp/s_dense_qp_kkt.
OBJS += ipm_core/d_core_qp_ipm_aux.o ipm_core/d_core_qp_ipm.o
OBJS += ipm_core/s_core_qp_ipm_aux.o ipm_core/s_core_qp_ipm.o
# ocp nlp
OBJS += ocp_nlp/d_ocp_nlp.o ocp_nlp/d_ocp_nlp_sol.o ocp_nlp/d_ocp_nlp_aux.o ocp_nlp/d_ocp_nlp_hyb.o ocp_nlp/d_ocp_nlp_ipm.o ocp_nlp/d_ocp_nlp_sqp.o
OBJS +=
#OBJS += ocp_nlp/d_ocp_nlp.o ocp_nlp/d_ocp_nlp_sol.o ocp_nlp/d_ocp_nlp_aux.o ocp_nlp/d_ocp_nlp_hyb.o ocp_nlp/d_ocp_nlp_ipm.o ocp_nlp/d_ocp_nlp_sqp.o
#OBJS +=
# ocp qp
OBJS += ocp_qp/d_ocp_qp.o ocp_qp/d_ocp_qp_sol.o ocp_qp/d_ocp_qp_kkt.o ocp_qp/d_ocp_qp_ipm.o
OBJS += ocp_qp/s_ocp_qp.o ocp_qp/s_ocp_qp_sol.o ocp_qp/s_ocp_qp_kkt.o ocp_qp/s_ocp_qp_ipm.o
#OBJS += ocp_qp/m_ocp_qp.o ocp_qp/m_ocp_qp_kkt.o ocp_qp/m_ocp_qp_ipm.o
# sim core
OBJS += sim_core/d_rk_int.o sim_core/d_erk_int.o sim_core/d_irk_int.o
OBJS +=
#OBJS += sim_core/d_rk_int.o sim_core/d_erk_int.o sim_core/d_irk_int.o
#OBJS +=
# tree ocp qp
OBJS += tree_ocp_qp/scenario_tree.o
OBJS += tree_ocp_qp/d_tree_ocp_qp.o tree_ocp_qp/d_tree_ocp_qp_sol.o tree_ocp_qp/d_tree_ocp_qp_kkt.o tree_ocp_qp/d_tree_ocp_qp_ipm.o
Expand Down
6 changes: 3 additions & 3 deletions ocp_nlp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ ifeq ($(TARGET), GENERIC)
OBJS +=
endif

OBJS += d_ocp_nlp.o d_ocp_nlp_sol.o d_ocp_nlp_aux.o d_ocp_nlp_hyb.o d_ocp_nlp_ipm.o d_ocp_nlp_sqp.o
OBJS +=
#OBJS += d_ocp_nlp.o d_ocp_nlp_sol.o d_ocp_nlp_aux.o d_ocp_nlp_hyb.o d_ocp_nlp_ipm.o d_ocp_nlp_sqp.o
#OBJS +=

obj: $(OBJS)

clean:
rm -f *.o
rm -f *.s

_ocp_nlp_sol.o: d_ocp_nlp_sol.c x_ocp_nlp_sol.c
d_ocp_nlp_sol.o: d_ocp_nlp_sol.c x_ocp_nlp_sol.c
4 changes: 2 additions & 2 deletions sim_core/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ ifeq ($(TARGET), GENERIC)
OBJS +=
endif

OBJS += d_rk_int.o d_erk_int.o d_irk_int.o
OBJS +=
#OBJS += d_rk_int.o d_erk_int.o d_irk_int.o
#OBJS +=

obj: $(OBJS)

Expand Down

0 comments on commit 2571bf9

Please sign in to comment.