Ignore:
Timestamp:
Aug 14, 2011 6:45:31 AM (8 years ago)
Author:
stefan
Message:

merge chgset 1781 from trunk

Location:
stable/1.14
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • stable/1.14

    • Property svn:mergeinfo changed
      /trunkmerged: 1781

  • stable/1.14/Clp/Makefile.am

    r1753 r1782  
    124124else
    125125if COIN_CXX_IS_CL
    126         echo "/libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs_cpp.txt
     126        echo "-libpath:`$(CYGPATH_W) @abs_lib_dir@` libClp.lib @CLPLIB_LIBS_INSTALLED@" > $(addlibsdir)/clp_addlibs_cpp.txt
    127127else
    128128        echo -L@abs_lib_dir@ -lClp @CLPLIB_LIBS_INSTALLED@ > $(addlibsdir)/clp_addlibs.txt
Note: See TracChangeset for help on using the changeset viewer.