]>
Commit | Line | Data |
---|---|---|
641d9ce6 JB |
1 | --- Osi-0.106.10/Osi/src/OsiGlpk/Makefile.am.orig 2013-12-15 00:53:52.000000000 +0100 |
2 | +++ Osi-0.106.10/Osi/src/OsiGlpk/Makefile.am 2014-12-04 22:07:42.332949046 +0100 | |
3 | @@ -21,7 +21,7 @@ | |
4 | ||
5 | # List all additionally required libraries | |
6 | if DEPENDENCY_LINKING | |
7 | -libOsiGlpk_la_LIBADD = $(OSILIB_LIBS) ../Osi/libOsi.la | |
8 | +libOsiGlpk_la_LIBADD = $(OSILIB_LIBS) ../Osi/libOsi.la $(GLPK_LIBS) | |
9 | endif | |
10 | ||
11 | # This is for libtool | |
12 | --- Osi-0.106.10/Osi/src/OsiSpx/Makefile.am.orig 2011-08-14 12:37:34.000000000 +0200 | |
13 | +++ Osi-0.106.10/Osi/src/OsiSpx/Makefile.am 2014-12-04 22:08:00.876281600 +0100 | |
14 | @@ -16,6 +16,10 @@ | |
15 | # List all source files for this library, including headers | |
16 | libOsiSpx_la_SOURCES = OsiSpxSolverInterface.cpp OsiSpxSolverInterface.hpp | |
17 | ||
18 | +if DEPENDENCY_LINKING | |
19 | +libOsiSpx_la_LIBADD = $(OSILIB_LIBS) ../Osi/libOsi.la $(SOPLEX_LIBS) | |
20 | +endif | |
21 | + | |
22 | # This is for libtool | |
23 | libOsiSpx_la_LDFLAGS = $(LT_LDFLAGS) | |
24 |