Ignore:
Timestamp:
Jun 7, 2010 8:27:42 AM (10 years ago)
Author:
stefan
Message:

merge split branch into trunk; fix some examples

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.5
        2 ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
        3 ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        4 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        5 ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
        6 Data/Sample       https://projects.coin-or.org/svn/Data/stable/1.0/Sample
        7 CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
        8 Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.55/Cgl
        9 Clp               https://projects.coin-or.org/svn/Clp/stable/1.12/Clp
        10 Osi               https://projects.coin-or.org/svn/Osi/stable/0.103/Osi
        11 Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
         1BuildTools        https://projects.coin-or.org/svn/BuildTools/trunk
         2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/trunk
         3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/trunk
         4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/trunk
         5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/trunk
         6Data/Sample       https://projects.coin-or.org/svn/Data/trunk/Sample
         7#Data/miplib3      https://projects.coin-or.org/svn/Data/trunk/miplib3
         8CoinUtils         https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
         9Cgl               https://projects.coin-or.org/svn/Cgl/trunk/Cgl
         10Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
         11Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
         12#Vol               https://projects.coin-or.org/svn/Vol/trunk/Vol
    • Property svn:mergeinfo changed
      /branches/split (added)merged: 1437-1439,​1444-1448,​1463
  • trunk/Cbc

  • trunk/Cbc/examples/Makefile.in

    r865 r1464  
    4949
    5050# C++ Compiler options
    51 CXXFLAGS = @CXXFLAGS@
     51CXXFLAGS = @CXXFLAGS@ -DSAMPLEDIR=\"@SAMPLE_DATA@\" -DMIPLIB3DIR=\"@MIPLIB3_DATA@\"
     52
     53# C Compiler options
     54CFLAGS = @CFLAGS@ -DSAMPLEDIR=\"@SAMPLE_DATA@\"
    5255
    5356# additional C++ Compiler options for linking
     
    5861
    5962# Directory with COIN libraries
    60 COINLIBDIR = @abs_lib_dir@
     63COINLIBDIR = @abs_lib_dir@/coin
    6164
    62 # Libraries necessary to link with Clp
    63 LIBS = -L$(COINLIBDIR) -lCbcSolver -lCbc -lCgl -lOsiClp -lOsiCbc -lOsi -lClp -lCoinUtils \
    64         @ADDLIBS@ \
    65         `cat @CGLDOCDIR@/cgl_addlibs.txt` \
    66         `cat @OSIDOCDIR@/osi_addlibs.txt` \
    67         `cat @CLPDOCDIR@/clp_addlibs.txt` \
    68         `cat @COINUTILSDOCDIR@/coinutils_addlibs.txt`
     65# Libraries necessary to link with Cbc
     66LIBS = @COINDEPEND_LIBS@ @CLP_LIBS@ -L$(COINLIBDIR) -lCbcSolver -lCbc -lOsiCbc @ADDLIBS@
    6967
    7068# Necessary Include dirs (we use the CYGPATH_W variables to allow
    7169# compilation with Windows compilers)
    72 INCL = -I`$(CYGPATH_W) $(COININCDIR)` $(ADDINCFLAGS)
     70INCL = @COINDEPEND_CFLAGS@ @CLP_CFLAGS@ -I`$(CYGPATH_W) $(COININCDIR)` $(ADDINCFLAGS)
    7371
    7472# The following is necessary under cygwin, if native compilers are used
Note: See TracChangeset for help on using the changeset viewer.