Ignore:
Timestamp:
Oct 15, 2011 10:47:53 AM (9 years ago)
Author:
stefan
Message:

merge chgset 1739 from trunk

Location:
stable/2.7
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • stable/2.7

    • Property svn:mergeinfo changed
      /trunkmerged: 1739

  • stable/2.7/Cbc

  • stable/2.7/Cbc/Makefile.am

    r1715 r1740  
    138138else
    139139if COIN_CXX_IS_CL
    140         echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs_cpp.txt
     140        echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libCbc.lib @CBCLIB_LIBS_INSTALLED@" > $(addlibsdir)/cbc_addlibs.txt
    141141else
    142142        echo -L@abs_lib_dir@ -lCbc @CBCLIB_LIBS_INSTALLED@ > $(addlibsdir)/cbc_addlibs.txt
Note: See TracChangeset for help on using the changeset viewer.