Changeset 272


Ignore:
Timestamp:
Dec 9, 2003 1:21:43 PM (16 years ago)
Author:
ladanyi
Message:

Makefiles cleaned up

Location:
trunk/Samples
Files:
1 added
9 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Samples/Makefile

    r270 r272  
    11OptLevel := -g
     2
     3DRIVER ?= driver
     4
     5# Possible choices for driver:
     6#   decompose
     7#   defaults
     8#   driver
     9#   driver2
     10#   dualCuts
     11#   ekk
     12#   ekk_interface
     13#   minimum
     14#   network
     15#   piece
     16#   sprint
     17#   sprint2
     18#   testBarrier
     19#   testBasis
     20#   useVolume
     21
    222
    323# The location of the customized Makefiles
     
    1232IncDir += ${zlibIncDir}
    1333IncDir += ${bzlibIncDir}
     34IncDir += ${readlineIncDir}
    1435IncDir += ${lapackIncDir}
    1536
     
    1940LibDir += ${zlibLibDir}
    2041LibDir += ${bzlibLibDir}
     42LibDir += ${readlineLibDir}
    2143LibDir += ${lapackLibDir}
    2244
     
    2648LibName += ${zlibLibName}
    2749LibName += ${bzlibLibName}
     50LibName += ${readlineLibName}
    2851LibName += ${lapackLibName}
    2952
     
    3356Define += ${zlibDefine}
    3457Define += ${bzlibDefine}
     58Define += ${readlineDefine}
    3559Define += ${lapackDefine}
    3660
     
    5983LDFLAGS += $(patsubst lib%,-l%,$(basename $(LIBS)))
    6084
    61 ifeq ($(findstring Linux,${UNAME}),Linux)
    62 #       CXXFLAGS +=     -DREADLINE
    63 #       LDFLAGS += -lhistory -lreadline -ltermcap
    64 endif
    65 #if DENSE and using given libraries
    66 #LDFLAGS += -llapack -lblas -lg2c
    6785#LDFLAGS += -lefence
     86
    6887###############################################################################
    6988
    70 TESTSRC := $(DRIVER).cpp
    71 TESTOBJ := $(addprefix $(TARGETDIR)/, $(TESTSRC:.cpp=.o))
    72 TESTDEP := $(addprefix $(DEPDIR)/, $(TESTSRC:.cpp=.d))
     89ifeq ($(DRIVER),driverC)
     90    SRCEXT := c
     91else
     92    SRCEXT := cpp
     93endif
     94
     95TESTSRC := $(DRIVER).$(SRCEXT)
     96TESTOBJ := $(addprefix $(TARGETDIR)/, $(TESTSRC:.$(SRCEXT)=.o))
     97TESTDEP := $(addprefix $(DEPDIR)/, $(TESTSRC:.$(SRCEXT)=.d))
    7398
    7499###############################################################################
  • trunk/Samples/driverC.c

    r242 r272  
    1414                     int nDouble, const double * vDouble,
    1515                     int nInt, const int * vInt,
    16                      int nString, const char ** vString)
     16                     int nString, char ** vString)
    1717{
    1818  if (messageNumber==1000002) {
  • trunk/Samples/testBasis.cpp

    r252 r272  
    7979    model.setColumnStatus(iColumn,model2.getColumnStatus(iColumn));
    8080 
    81   for (iRow=0;iRow<numberRows;iRow++)
    82     model.setRowStatus(iRow,model2.getColumnStatus(iRow+originalNumberColumns));
     81  for (iRow=0;iRow<numberRows;iRow++) {
     82     if (model2.getRowStatus(iRow) == ClpSimplex::basic) {
     83        model.setRowStatus(iRow, ClpSimplex::basic);
     84     } else {
     85        model.setRowStatus(iRow,model2.getColumnStatus(iRow+originalNumberColumns));
     86     }
     87  }
    8388  model.primal(0);
    8489  // and now without solution values
Note: See TracChangeset for help on using the changeset viewer.