From: Michael G. <gof...@us...> - 2007-06-05 05:49:25
|
Update of /cvsroot/octave/octave-forge/admin/Windows/msvc/libs In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13271 Added Files: suitesparse-3.0.0.diff Log Message: add patch for SuiteSpare-3.0.0 --- NEW FILE: suitesparse-3.0.0.diff --- diff -urb SuiteSparse/AMD/Demo/Makefile SuiteSparse-new/AMD/Demo/Makefile --- SuiteSparse/AMD/Demo/Makefile 2007-05-05 16:25:26.000000000 +0200 +++ SuiteSparse-new/AMD/Demo/Makefile 2007-06-04 22:26:32.812500000 +0200 @@ -2,10 +2,10 @@ # compile the AMD demo (for both GNU make or original make) #----------------------------------------------------------------------------- -default: amd_simple amd_demo amd_demo2 amd_l_demo - include ../../UFconfig/UFconfig.mk +default: amd_simple$(EXEEXT) amd_demo$(EXEEXT) amd_demo2$(EXEEXT) amd_l_demo$(EXEEXT) + C = $(CC) $(CFLAGS) -I../Include -I../../UFconfig INC = ../Include/amd.h ../../UFconfig/UFconfig.h @@ -22,54 +22,54 @@ dist: [...3337 lines suppressed...] $(C) -DZLONG -c ../Source/umfpack_save_symbolic.c -o umfpack_zl_save_symbolic.o - $(AR) ../Lib/libumfpack.a \ + $(AR) ../Lib/$(LIBPRE)umfpack.$(LIBEXT) \ umfpack_gn_global.o \ umf_i_analyze.o umf_i_apply_order.o umf_i_colamd.o umf_i_free.o \ umf_i_fsize.o umf_i_is_permutation.o umf_i_malloc.o umf_i_realloc.o \ diff -urb SuiteSparse/UMFPACK/Source/cholmod_blas.h SuiteSparse-new/UMFPACK/Source/cholmod_blas.h --- SuiteSparse/UMFPACK/Source/cholmod_blas.h 2007-05-05 22:01:57.000000000 +0200 +++ SuiteSparse-new/UMFPACK/Source/cholmod_blas.h 2007-06-04 22:26:34.234375000 +0200 @@ -48,8 +48,10 @@ #define CHOLMOD_CYGWIN #else #define CHOLMOD_WINDOWS +#ifndef BLAS_UNDERSCORE #define BLAS_NO_UNDERSCORE #endif +#endif #define CHOLMOD_ARCHITECTURE "Microsoft Windows" #elif defined (__hppa) || defined (__hpux) || defined (MHPUX) || defined (ARCH_HPUX) |