--- make.include.orig 2005-10-22 05:30:55.000000000 +1000 +++ make.include 2011-06-20 22:55:40.000000000 +1000 @@ -6,7 +6,7 @@ # the defaults below should work, although fast BLAS and LAPACK recommended. # STEP 2: Set the name of the C compiler. -CC = gcc +CC = @@MP_CC@@ #CC = cc #CC = g++ #CC = mpicc @@ -32,7 +32,7 @@ #DSDPTIMER = DSDP_MS_TIME # STEP 3c: Add other compiler flags. -DSDPCFLAGS = +DSDPCFLAGS = -DDSDP_TIME #DSDPCFLAGS = -Wall #DSDPCFLAGS = -DDSDPMATLAB # Other flags concern BLAS and LAPACK libraries -- see next step. @@ -43,8 +43,8 @@ # STEP 4. Set Linker and FLAGS: Link the DSDP library to application -CFLAGS = ${OPTFLAGS} -I. -I${DSDPROOT}/include ${DSDPCFLAGS} -CLINKER = ${CC} ${OPTFLAGS} +CFLAGS = ${OPTFLAGS} ${MP_ARCHFLAGS} -I. -I${DSDPROOT}/include ${DSDPCFLAGS} +CLINKER = ${CC} ${OPTFLAGS} ${MP_ARCHFLAGS} #CLINKER = ${CXX} ${OPTFLAGS} -static #CLINKER = link /out:dsdp5.exe @@ -55,7 +55,7 @@ # Not needed to compile library or matlab executable # Needed to link DSDP library to the driver ( read SDPA files, maxcut example, ...) # Also include the math library and other libraries needed to link the BLAS to the C files that call them. -LAPACKBLAS = -llapack -lblas -lg2c -lm +LAPACKBLAS = @@MP_LAPACKBLAS@@ #LAPACKBLAS = -L/usr/lib/ -llapack -lblas -lg2c -lm #LAPACKBLAS = -L/home/benson/ATLAS/Linux_P4SSE2/lib -llapack -lcblas -lf77blas -latlas -lg2c -lm #LAPACKBLAS = -L/sandbox/benson/ATLAS-3.6/lib/Linux_P4SSE2 -llapack -lcblas -lf77blas -latlas -lg2c -lm @@ -63,7 +63,7 @@ # STEP 6, MATLAB MACROS - If compiling Matlab interface, check MEX flag. -MEX = mex -O +MEX = /usr/bin/arch ${MP_ARCHFLAGS} mkoctfile --mex `mkoctfile -p BLAS_LIBS` -v #MEX = C:\Matlab\bin\mex DSDPMATLABDIR = ${DSDPROOT}/matlab