[PD-cvs] externals/iem/iemmatrix/src iemmatrix.dsp, NONE, 1.1 iemmatrix.dsw, NONE, 1.1 makefile_win, NONE, 1.1 iemmatrix.h, 1.8, 1.9 mtx_gauss.c, 1.1, 1.2 mtx_mul.c, 1.2, 1.3
musil
tmusil at users.sourceforge.net
Thu Jun 16 14:43:09 CEST 2005
Update of /cvsroot/pure-data/externals/iem/iemmatrix/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13881/iem/iemmatrix/src
Modified Files:
iemmatrix.h mtx_gauss.c mtx_mul.c
Added Files:
iemmatrix.dsp iemmatrix.dsw makefile_win
Log Message:
MSVCC makefile fixed some files
Index: mtx_gauss.c
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/mtx_gauss.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mtx_gauss.c 9 May 2005 16:31:56 -0000 1.1
--- mtx_gauss.c 16 Jun 2005 12:43:07 -0000 1.2
***************
*** 43,46 ****
--- 43,47 ----
int col=atom_getfloat(argv+1);
int i, j, k, row2=row*row;
+ const t_matrixfloat singrange = 1.0e-10;
t_matrixfloat *original, *gaussed;
***************
*** 63,67 ****
original=matrix2float(argv);
- const t_matrixfloat singrange = 1.0e-10;
// Gauss elimination
for(i=0; i<row; i++) {
--- 64,67 ----
--- NEW FILE: iemmatrix.dsp ---
# Microsoft Developer Studio Project File - Name="iemmatrix" - Package Owner=<4>
# Microsoft Developer Studio Generated Build File, Format Version 6.00
# ** NICHT BEARBEITEN **
# TARGTYPE "Win32 (x86) External Target" 0x0106
CFG=iemmatrix - Win32 Debug
!MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
!MESSAGE
!MESSAGE NMAKE /f "iemmatrix.mak".
!MESSAGE
!MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
!MESSAGE
!MESSAGE NMAKE /f "iemmatrix.mak" CFG="iemmatrix - Win32 Debug"
!MESSAGE
!MESSAGE Für die Konfiguration stehen zur Auswahl:
!MESSAGE
!MESSAGE "iemmatrix - Win32 Release" (basierend auf "Win32 (x86) External Target")
!MESSAGE "iemmatrix - Win32 Debug" (basierend auf "Win32 (x86) External Target")
!MESSAGE
# Begin Project
# PROP AllowPerConfigDependencies 0
# PROP Scc_ProjName ""
# PROP Scc_LocalPath ""
!IF "$(CFG)" == "iemmatrix - Win32 Release"
# PROP BASE Use_Debug_Libraries 0
# PROP BASE Output_Dir "Release"
# PROP BASE Intermediate_Dir "Release"
# PROP BASE Cmd_Line "NMAKE /f makefile_win"
# PROP BASE Rebuild_Opt "/a"
# PROP BASE Target_File "makefile_win.exe"
# PROP BASE Bsc_Name "makefile_win.bsc"
# PROP BASE Target_Dir ""
# PROP Use_Debug_Libraries 0
# PROP Output_Dir "Release"
# PROP Intermediate_Dir "Release"
# PROP Cmd_Line "NMAKE /f makefile_win"
# PROP Rebuild_Opt "/a"
# PROP Target_File "iemmatrix.exe"
# PROP Bsc_Name "iemmatrix.bsc"
# PROP Target_Dir ""
!ELSEIF "$(CFG)" == "iemmatrix - Win32 Debug"
# PROP BASE Use_Debug_Libraries 1
# PROP BASE Output_Dir "Debug"
# PROP BASE Intermediate_Dir "Debug"
# PROP BASE Cmd_Line "NMAKE /f makefile_win"
# PROP BASE Rebuild_Opt "/a"
# PROP BASE Target_File "makefile_win.exe"
# PROP BASE Bsc_Name "makefile_win.bsc"
# PROP BASE Target_Dir ""
# PROP Use_Debug_Libraries 1
# PROP Output_Dir "Debug"
# PROP Intermediate_Dir "Debug"
# PROP Cmd_Line "NMAKE /f makefile_win"
# PROP Rebuild_Opt "/a"
# PROP Target_File "iemmatrix.exe"
# PROP Bsc_Name "iemmatrix.bsc"
# PROP Target_Dir ""
!ENDIF
# Begin Target
# Name "iemmatrix - Win32 Release"
# Name "iemmatrix - Win32 Debug"
!IF "$(CFG)" == "iemmatrix - Win32 Release"
!ELSEIF "$(CFG)" == "iemmatrix - Win32 Debug"
!ENDIF
# Begin Source File
SOURCE=.\makefile_win
# End Source File
# End Target
# End Project
--- NEW FILE: iemmatrix.dsw ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: makefile_win ---
all: ..\iemmatrix.dll
VIS_CPP_PATH = "C:\Programme\Microsoft Visual Studio\Vc98"
PD_INST_PATH = "C:\Programme\pd-0.37-1"
PD_WIN_INCLUDE_PATH = /I. /I$(PD_INST_PATH)\src /I$(VIS_CPP_PATH)\include
PD_WIN_C_FLAGS = /nologo /W3 /WX /DPD /D__WIN32__ /Ox -DPA_LITTLE_ENDIAN
PD_WIN_L_FLAGS = /nologo
PD_WIN_LIB = /NODEFAULTLIB:libc /NODEFAULTLIB:oldnames /NODEFAULTLIB:kernel /NODEFAULTLIB:uuid \
$(VIS_CPP_PATH)\lib\libc.lib \
$(PD_INST_PATH)\bin\pd.lib
SRC = mtx_add.c \
mtx_binops.c \
mtx_check.c \
mtx_cholesky.c \
mtx_col.c \
mtx_diag.c \
mtx_diegg.c \
mtx_distance2.c \
mtx_egg.c \
mtx_element.c \
mtx_exp.c \
mtx_eye.c \
mtx_gauss.c \
mtx_inverse.c \
mtx_log.c \
mtx_matrix.c \
mtx_mean.c \
mtx_mul.c \
mtx_mul~.c \
mtx_ones.c \
mtx_pivot.c \
mtx_pow.c \
mtx_print.c \
mtx_prod.c \
mtx_rand.c \
mtx_resize.c \
mtx_roll.c \
mtx_row.c \
mtx_scroll.c \
mtx_size.c \
mtx_sub.c \
mtx_sum.c \
mtx_trace.c \
mtx_transpose.c \
mtx_zeros.c \
iemmatrix.c
OBJ = $(SRC:.c=.obj)
.c.obj:
cl $(PD_WIN_C_FLAGS) $(PD_WIN_INCLUDE_PATH) /c $*.c
..\iemmatrix.dll: $(OBJ)
link $(PD_WIN_L_FLAGS) /dll /export:iemmatrix_setup \
/out:..\iemmatrix.dll $(OBJ) $(PD_WIN_LIB)
clean:
del *.obj
Index: mtx_mul.c
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/mtx_mul.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mtx_mul.c 11 May 2005 14:06:26 -0000 1.2
--- mtx_mul.c 16 Jun 2005 12:43:07 -0000 1.3
***************
*** 26,32 ****
t_matrixfloat*mtx_doMultiply(int rowA, t_matrixfloat*A, int colArowB, t_matrixfloat*B, int colB){
t_matrixfloat*result=0;
if(!A || !B || !rowA || !colArowB || !colB)return 0;
result=(t_matrixfloat*)getbytes(sizeof(t_matrixfloat)*rowA*colB);
! int r, c, n;
for(r=0; r<rowA; r++){
for(c=0; c<colB; c++){
--- 26,34 ----
t_matrixfloat*mtx_doMultiply(int rowA, t_matrixfloat*A, int colArowB, t_matrixfloat*B, int colB){
t_matrixfloat*result=0;
+ int r, c, n;
+
if(!A || !B || !rowA || !colArowB || !colB)return 0;
result=(t_matrixfloat*)getbytes(sizeof(t_matrixfloat)*rowA*colB);
!
for(r=0; r<rowA; r++){
for(c=0; c<colB; c++){
Index: iemmatrix.h
===================================================================
RCS file: /cvsroot/pure-data/externals/iem/iemmatrix/src/iemmatrix.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** iemmatrix.h 11 May 2005 14:30:49 -0000 1.8
--- iemmatrix.h 16 Jun 2005 12:43:07 -0000 1.9
***************
*** 63,66 ****
--- 63,68 ----
# define fabsf fabs
# define sqrtf sqrt
+ # define powf pow
+
#endif
More information about the Pd-cvs
mailing list