always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove hack on mac/solve.cc after code move

Browse Source
This commit is contained in:
Laurent Perron
2019-04-24 17:59:42 +02:00
parent dafea0aded
commit a6d3161bc7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
makefiles/Makefile.cpp.mk
View File

@@ -480,7 +480,7 @@ test_cc_cpp: \
# $(MAKE) run SOURCE=examples/cpp/frequency_assignment_problem.cc # Need data file
# $(MAKE) run SOURCE=examples/cpp/pdptw.cc ARGS="--pdp_file examples/data/pdptw/LC1_2_1.txt" # Fails on windows...
$(MAKE) run SOURCE=examples/cpp/shift_minimization_sat.cc ARGS="--input examples/data/shift_scheduling/minimization/data_1_23_40_66.dat"
$(MAKE) run DEBUG=-DNDEBUG\
$(MAKE) run \
SOURCE=examples/cpp/solve.cc \
ARGS="--input examples/data/tests/test2.mps"

2
makefiles/Makefile.gen.mk
View File

@@ -509,7 +509,7 @@ objs/lp_data/mps_reader.$O: ortools/lp_data/mps_reader.cc \
ortools/util/return_macros.h ortools/lp_data/sparse_column.h \
ortools/lp_data/sparse_vector.h ortools/graph/iterators.h \
ortools/util/fp_utils.h | $(OBJ_DIR)/lp_data
$(CCC) -DNDEBUG $(DEPENDENCIES_INC) -c $(SRC_DIR)$Sortools$Slp_data$Smps_reader.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Smps_reader.$O
$(CCC) $(CFLAGS) -c $(SRC_DIR)$Sortools$Slp_data$Smps_reader.cc $(OBJ_OUT)$(OBJ_DIR)$Slp_data$Smps_reader.$O
objs/lp_data/proto_utils.$O: ortools/lp_data/proto_utils.cc \
ortools/lp_data/proto_utils.h \