Changeset 2470


Ignore:
Timestamp:
Oct 28, 2011 10:18:08 AM (10 years ago)
Author:
stefan
Message:

no more need for NO_ADDITIONAL_CHECKS; add new spxgithash.cpp

Location:
ThirdParty/SoPlex/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/SoPlex/trunk/Makefile.am

    r2467 r2470  
    4444  soplex/src/spxfileio.cpp \
    4545  soplex/src/spxgeometsc.cpp \
     46  soplex/src/spxgithash.cpp \
    4647  soplex/src/spxharrisrt.cpp \
    4748  soplex/src/spxhybridpr.cpp \
  • ThirdParty/SoPlex/trunk/Makefile.in

    r2467 r2470  
    9090        spxchangebasis.lo spxdantzigpr.lo spxdefaultrt.lo \
    9191        spxdefines.lo spxdesc.lo spxdevexpr.lo spxequilisc.lo \
    92         spxfastrt.lo spxfileio.lo spxgeometsc.lo spxharrisrt.lo \
    93         spxhybridpr.lo spxid.lo spxio.lo spxlp.lo spxlpfread.lo \
    94         spxmainsm.lo spxmpsread.lo spxmpswrite.lo spxlpfwrite.lo \
    95         spxout.lo spxparmultpr.lo spxquality.lo spxscaler.lo \
    96         spxshift.lo spxsolver.lo spxsolve.lo spxstarter.lo \
    97         spxsteeppr.lo spxsumst.lo spxvecs.lo spxvectorst.lo \
    98         spxweightpr.lo spxweightst.lo spxwritestate.lo ssvector.lo \
    99         svector.lo svset.lo timer.lo tracemethod.lo unitvector.lo \
    100         update.lo updatevector.lo vector.lo vsolve.lo
     92        spxfastrt.lo spxfileio.lo spxgeometsc.lo spxgithash.lo \
     93        spxharrisrt.lo spxhybridpr.lo spxid.lo spxio.lo spxlp.lo \
     94        spxlpfread.lo spxmainsm.lo spxmpsread.lo spxmpswrite.lo \
     95        spxlpfwrite.lo spxout.lo spxparmultpr.lo spxquality.lo \
     96        spxscaler.lo spxshift.lo spxsolver.lo spxsolve.lo \
     97        spxstarter.lo spxsteeppr.lo spxsumst.lo spxvecs.lo \
     98        spxvectorst.lo spxweightpr.lo spxweightst.lo spxwritestate.lo \
     99        ssvector.lo svector.lo svset.lo timer.lo tracemethod.lo \
     100        unitvector.lo update.lo updatevector.lo vector.lo vsolve.lo
    101101libcoinsoplex_la_OBJECTS = $(am_libcoinsoplex_la_OBJECTS)
    102102depcomp = $(SHELL) $(top_srcdir)/depcomp
     
    311311  soplex/src/spxfileio.cpp \
    312312  soplex/src/spxgeometsc.cpp \
     313  soplex/src/spxgithash.cpp \
    313314  soplex/src/spxharrisrt.cpp \
    314315  soplex/src/spxhybridpr.cpp \
     
    555556@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spxfileio.Plo@am__quote@
    556557@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spxgeometsc.Plo@am__quote@
     558@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spxgithash.Plo@am__quote@
    557559@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spxharrisrt.Plo@am__quote@
    558560@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spxhybridpr.Plo@am__quote@
     
    835837@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
    836838@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o spxgeometsc.lo `test -f 'soplex/src/spxgeometsc.cpp' || echo '$(srcdir)/'`soplex/src/spxgeometsc.cpp
     839
     840spxgithash.lo: soplex/src/spxgithash.cpp
     841@am__fastdepCXX_TRUE@   if $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT spxgithash.lo -MD -MP -MF "$(DEPDIR)/spxgithash.Tpo" -c -o spxgithash.lo `test -f 'soplex/src/spxgithash.cpp' || echo '$(srcdir)/'`soplex/src/spxgithash.cpp; \
     842@am__fastdepCXX_TRUE@   then mv -f "$(DEPDIR)/spxgithash.Tpo" "$(DEPDIR)/spxgithash.Plo"; else rm -f "$(DEPDIR)/spxgithash.Tpo"; exit 1; fi
     843@AMDEP_TRUE@@am__fastdepCXX_FALSE@      source='soplex/src/spxgithash.cpp' object='spxgithash.lo' libtool=yes @AMDEPBACKSLASH@
     844@AMDEP_TRUE@@am__fastdepCXX_FALSE@      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
     845@am__fastdepCXX_FALSE@  $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o spxgithash.lo `test -f 'soplex/src/spxgithash.cpp' || echo '$(srcdir)/'`soplex/src/spxgithash.cpp
    837846
    838847spxharrisrt.lo: soplex/src/spxharrisrt.cpp
  • ThirdParty/SoPlex/trunk/configure

    r2426 r2470  
    2102321023fi
    2102421024
    21025 CXXFLAGS="$CXXFLAGS -DNO_ADDITIONAL_CHECKS"
    21026 
    2102721025###########################################################################
    2102821026#                               finish up                                 #
  • ThirdParty/SoPlex/trunk/configure.ac

    r2212 r2470  
    6262fi
    6363
    64 CXXFLAGS="$CXXFLAGS -DNO_ADDITIONAL_CHECKS"
    65 
    6664###########################################################################
    6765#                               finish up                                 #
Note: See TracChangeset for help on using the changeset viewer.