Commit bc45c273 authored by Antonio Frangioni's avatar Antonio Frangioni 🤖

added c++-17 to makefile

parent 15aee994
......@@ -24,7 +24,7 @@
# internal macros - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# basic COIN directory
libOSIBSCDIR = /Users/frangio/Didattica/MDGdM/Problemi/FC++/
libOSIBSCDIR = /Users/frangio/Didattica/MDGdM/Problemi/CBC/
# macroes to be exported- - - - - - - - - - - - - - - - - - - - - - - - - - -
# add to libOSILIB the appropriate ones among -lOsiCpx, -lOsiGrb, ... to
......@@ -40,7 +40,7 @@ libOSIBSCDIR = /Users/frangio/Didattica/MDGdM/Problemi/FC++/
# note: if any other solver in included, add the corresponding -lOsiXXX to
# libOSILIB (like, -lOsiCpx)
libOSILIB = -L$(libOSIBSCDIR)lib -lOsiClp -lClp -lOsi -lCoinUtils \
libOSILIB = -L$(libOSIBSCDIR)lib -lOsiClp -lOsiCpx -lClp -lOsi -lCoinUtils \
-framework Accelerate
libOSIINC = -I$(libOSIBSCDIR)include/coin
......
......@@ -54,8 +54,8 @@ MPTstSDR = $(libNDOSDR)MPTester/
include $(MPTstSDR)makefile
# OSIMPSlver
#OSIMPSDR = $(libNDOSDR)OSIMPSolver/
#include $(OSIMPSDR)makefile
OSIMPSDR = $(libNDOSDR)OSIMPSolver/
include $(OSIMPSDR)makefile
# QPPnltMP
QPPMPSDR = $(libNDOSDR)QPPnltMP/
......
......@@ -41,12 +41,12 @@ OPTUxH = $(libNDOSDR)OPTUtils/OPTUtils.h $(libNDOSDR)OPTUtils/OPTtypes.h \
OPTUxINC = -I$(libNDOSDR)OPTUtils
# OsiSolverInterface external libreries
#include $(libNDOSDR)extlib/makefile-libOSI
include $(libNDOSDR)extlib/makefile-libOSI
# cplex external libreries: need be included only if either
# OsiCpxSolverInterface has been compiled in OsiSolverInterface, or libCQK
# has been included by SubGrad and CQKnPCplex has been compiled in there
#include $(libNDOSDR)extlib/makefile-libCPX
include $(libNDOSDR)extlib/makefile-libCPX
# include the libNDO makefile requiring all external modules in input
include $(libNDOSDR)lib/makefile
......
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