Ignore:
Timestamp:
Jul 10, 2006 2:52:52 PM (13 years ago)
Author:
andreasw
Message:

updated according to changes in BuildTools?; included some bugfixes provided by Lou Hafer

File:
1 edited

Legend:

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

    r387 r405  
    162162########################################################################
    163163
     164if COIN_HAS_CLP
     165
    164166# Name of the executable compiled in this directory.  We want it to be
    165167# installed in the 'bin' directory
     
    192194cbc_LDADD += $(ASLLIB)
    193195AM_CPPFLAGS += $(ASL_CPPFLAGS)
     196endif
     197
    194198endif
    195199
     
    217221        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglTwomir` \
    218222        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    219         -I`$(CYGPATH_W) $(OSISRCDIR)/src`
     223        -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc` \
     224        -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
     225        -I`$(CYGPATH_W) $(OSIOBJDIR)/inc`
    220226
    221227# List additional defines
Note: See TracChangeset for help on using the changeset viewer.