From 03e4068eca0abcaaa5dae231eb9bda39476909a9 Mon Sep 17 00:00:00 2001 From: "lperron@google.com" Date: Fri, 24 Jun 2011 08:38:42 +0000 Subject: [PATCH] hybrid is not accessible from python, java --- Makefile.build.python | 4 ++-- constraint_solver/constraint_solver.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.build.python b/Makefile.build.python index 9fa9420ead..2dfb40502c 100644 --- a/Makefile.build.python +++ b/Makefile.build.python @@ -47,8 +47,8 @@ gen/constraint_solver/constraint_solver_wrap.cc: gen/constraint_solver/pywrapcp. objs/constraint_solver_wrap.$O: gen/constraint_solver/constraint_solver_wrap.cc $(CCC) $(CFLAGS) $(PYTHON_INC) -c gen/constraint_solver/constraint_solver_wrap.cc $(OBJOUT)objs/constraint_solver_wrap.$O -_pywrapcp.$(SHAREDLIBEXT): objs/constraint_solver_wrap.$O $(CP_LIBS) $(BASE_LIBS) $(LP_LIBS) - $(LD) $(LDOUT)_pywrapcp.$(SHAREDLIBEXT) objs/constraint_solver_wrap.$O $(CP_LIBS) $(LP_LIBS) $(BASE_LIBS) $(LDLPDEPS) $(LDFLAGS) $(PYTHON_LNK) +_pywrapcp.$(SHAREDLIBEXT): objs/constraint_solver_wrap.$O $(CP_LIBS) $(BASE_LIBS) + $(LD) $(LDOUT)_pywrapcp.$(SHAREDLIBEXT) objs/constraint_solver_wrap.$O $(CP_LIBS) $(BASE_LIBS) $(LDFLAGS) $(PYTHON_LNK) ifeq "$(SYSTEM)" "win" copy _pywrapcp.dll gen\\constraint_solver\\_pywrapcp.pyd endif diff --git a/constraint_solver/constraint_solver.h b/constraint_solver/constraint_solver.h index a882e0a8b6..680e36c74c 100644 --- a/constraint_solver/constraint_solver.h +++ b/constraint_solver/constraint_solver.h @@ -1641,11 +1641,12 @@ class Solver { SymmetryBreaker* const v4); // ----- Simplex Connection ----- - +#if !defined(SWIG) SearchMonitor* MakeSimplexConnection(Callback1* const builder, Callback1* const modifier, Callback1* const runner, int simplex_frequency); +#endif // ----- Search Decicions and Decision Builders -----