Changeset 771


Ignore:
Timestamp:
May 17, 2006 12:56:39 AM (14 years ago)
Author:
andreasw
Message:

several fixes for Cygwin; automatically gunzip examples files if zlib is not available

Location:
trunk/Clp
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/configure

    r770 r771  
    16151615# externals.  The following macro ensures that those externals are
    16161616# retrieved by svn if they are not there yet.
    1617 # Initialize the ADDLIBS variable (a number of library require -lm)
    1618 ADDLIBS="" #"-lm"
     1617# Initialize the ADDLIBS variable
     1618ADDLIBS=
    16191619
    16201620
     
    23502350        case "$CXX" in
    23512351          cl | */cl)
    2352             coin_opt_cxxflags='-Ot1'
    2353             coin_add_cxxflags='-nologo -EHsc -GR -MT'
     2352            coin_opt_cxxflags='-O2'
     2353            coin_add_cxxflags='-nologo -GX -GR -MT'
    23542354            coin_dbg_cxxflags='-Yd'
    23552355            ;;
     
    1950019500          -e 's%lib /OUT:%lib -OUT:%' \
    1950119501          -e "s%cygpath -w%$CYGPATH_W%" \
    19502           -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo\\`; echo dd \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
     19502          -e 's%$AR x \\$f_ex_an_ar_oldlib%bla=\\`lib -nologo -list \\$f_ex_an_ar_oldlib | xargs echo\\`; echo \\$bla; for i in \\$bla; do lib -nologo -extract:\\$i \\$f_ex_an_ar_oldlib; done%' \
    1950319503          -e 's/$AR t/lib -nologo -list/' \
     19504          -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
    1950419505      libtool > conftest.bla
    1950519506
     
    1963719638
    1963819639
     19640coin_has_readline=no
    1963919641if test $coin_enable_gnu = yes; then
    19640   coin_has_readline=no
    1964119642  if test x"#include <stdio.h>" = x; then
    1964219643  hdr="#include <readline/readline.h>"
  • trunk/Clp/src/Makefile.am

    r768 r771  
    103103        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src`
    104104
     105# This line is necessary to allow VPATH compilation with MS compilers
     106# on Cygwin
     107DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     108
    105109########################################################################
    106110#                Headers that need to be installed                     #
  • trunk/Clp/src/Makefile.in

    r768 r771  
    9191clp_OBJECTS = $(am_clp_OBJECTS)
    9292clp_DEPENDENCIES = libClp.la $(COINUTILSOBJDIR)/src/libCoinUtils.la
    93 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
    9493depcomp = $(SHELL) $(top_srcdir)/../depcomp
    9594am__depfiles_maybe = depfiles
     
    332331clp_LDFLAGS = -rpath $(libdir)
    333332
     333# This line is necessary to allow VPATH compilation with MS compilers
     334# on Cygwin
     335DEFAULT_INCLUDES = -I. -I`$(CYGPATH_W) $(srcdir)` -I$(top_builddir)/inc
     336
    334337########################################################################
    335338#                Headers that need to be installed                     #
  • trunk/Clp/test/Makefile.am

    r764 r771  
    1414
    1515# We are using the CLP solver executable to do the unit test
    16 
    1716test: ../src/clp$(EXEEXT)
     17        cd ../../Data/Netlib; make uncompress
    1818        ../src/clp$(EXEEXT) -unitTest -netlib -netlibp
    1919
  • trunk/Clp/test/Makefile.in

    r764 r771  
    356356
    357357# We are using the CLP solver executable to do the unit test
    358 
    359358test: ../src/clp$(EXEEXT)
     359        cd ../../Data/Netlib; make uncompress
    360360        ../src/clp$(EXEEXT) -unitTest -netlib -netlibp
    361361
Note: See TracChangeset for help on using the changeset viewer.