Ignore:
Timestamp:
May 13, 2006 11:49:06 AM (14 years ago)
Author:
andreasw
Message:

minor corrections

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/Makefile.am

    r315 r316  
    6565
    6666cbc_LDADD = libCbc.la \
    67         $(CGLOBJDIR)/src/libCgl.la
     67        $(CGLOBJDIR)/src/libCgl.la \
     68        $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la
     69CXXFLAGS += -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc`
    6870
    6971# List all additionally required solver and Osi libraries
     
    7577        $(CLPOBJDIR)/src/libClp.la
    7678  LIBS  += `cat $(CLPOBJDIR)/clp_addlibs.txt`
    77 endif
    78 
    79 if COIN_HAS_CBC
    80   CXXFLAGS += -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
    81         -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc`
    82   cbc_LDADD += $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la \
    83         $(CBCOBJDIR)/src/libCbc.la
    84   LIBS += `cat $(CBCOBJDIR)/cbc_addlibs.txt`
    8579endif
    8680
Note: See TracChangeset for help on using the changeset viewer.