Changeset 760


Ignore:
Timestamp:
May 12, 2006 2:30:31 PM (14 years ago)
Author:
andreasw
Message:

finished (for now) conversion of Cbc to autotools

Location:
trunk/Clp/src
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/CbcOrClpParam.cpp

    r755 r760  
    66#endif
    77
    8 #include "ClpConfig.hpp"
     8#include "CbcOrClpParam.hpp"
     9
    910#include <string>
    1011#include <iostream>
    1112#include <cassert>
    1213
    13 #include "CbcOrClpParam.hpp"
    1414#ifdef COIN_HAS_CBC
    1515#include "OsiClpSolverInterface.hpp"
  • trunk/Clp/src/CbcOrClpParam.hpp

    r755 r760  
    11// Copyright (C) 2002, International Business Machines
    22// Corporation and others.  All Rights Reserved.
     3
     4#ifdef USE_CBCCONFIG
     5# include "CbcConfig.hpp"
     6#else
     7# include "ClpConfig.hpp"
     8#endif
    39
    410#ifndef CbcOrClpParam_H
  • trunk/Clp/src/ClpModel.hpp

    r754 r760  
    33#ifndef ClpModel_H
    44#define ClpModel_H
     5
     6#include "ClpConfig.hpp"
    57
    68#include <iostream>
  • trunk/Clp/src/ClpSimplex.cpp

    r754 r760  
    44
    55//#undef NDEBUG
     6
     7#include "ClpConfig.hpp"
    68
    79#include "CoinPragma.hpp"
  • trunk/Clp/src/ClpSolve.cpp

    r754 r760  
    44// This file has higher level solve functions
    55
    6 
     6#include "ClpConfig.hpp"
    77#include "CoinPragma.hpp"
    88
  • trunk/Clp/src/Makefile.am

    r756 r760  
    9797########################################################################
    9898
    99 
    10099# Here list all include flags, relative to this "srcdir" directory.  This
    101100# "cygpath" stuff is necessary to compile with native compilers on Windows.
     
    154153        echo "#ifndef __$(CONFIG_DIST)__" | sed -e 's/\./_/g' >>bla.tmp
    155154        echo "#define __$(CONFIG_DIST)__" | sed -e 's/\./_/g' >>bla.tmp
    156         $(EGREP) 'COIN_HAS' $< >>bla.tmp
     155        $(EGREP) 'COIN_' $< >>bla.tmp
    157156        echo "#endif" >>bla.tmp
    158157        if test -r ../inc/$(CONFIG_DIST); then \
  • trunk/Clp/src/Makefile.in

    r757 r760  
    776776        echo "#ifndef __$(CONFIG_DIST)__" | sed -e 's/\./_/g' >>bla.tmp
    777777        echo "#define __$(CONFIG_DIST)__" | sed -e 's/\./_/g' >>bla.tmp
    778         $(EGREP) 'COIN_HAS' $< >>bla.tmp
     778        $(EGREP) 'COIN_' $< >>bla.tmp
    779779        echo "#endif" >>bla.tmp
    780780        if test -r ../inc/$(CONFIG_DIST); then \
  • trunk/Clp/src/unitTest.cpp

    r755 r760  
    22// Corporation and others.  All Rights Reserved.
    33
     4#include "ClpConfig.hpp"
    45#include "CoinPragma.hpp"
    56#include <cassert>
Note: See TracChangeset for help on using the changeset viewer.