Update of /cvsroot/pure-data/externals/k_cext
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17733
Modified Files:
Makefile k_cext.c k_cext.h k_cext_win.c
Log Message:
Index: k_cext_win.c
===================================================================
RCS file: /cvsroot/pure-data/externals/k_cext/k_cext_win.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** k_cext_win.c 8 Jan 2004 14:55:24 -0000 1.1
--- k_cext_win.c 8 Aug 2004 13:09:02 -0000 1.2
***************
*** 81,91 ****
}
! void k_sys_writeincludes(FILE *file){
! fprintf(file,"#include \"" INCLUDEPATH "\\src\\m_pd.h\"\n");
! fprintf(file,"#include \"" INCLUDEPATH "\\src\\k_cext.h\"\n"); /* needs to be in pd/src, sorry.. */
}
void k_sys_makecompilestring(char *to,char *name,char *funcname){
! sprintf(to,"cl %s " INCLUDEPATH "\\bin\\pd.lib /LD /Gd /GD /Ox /DNT /link /export:%s",
name, funcname);
}
--- 81,91 ----
}
! void k_sys_writeincludes(FILE *file){
! fprintf(file,"#include \"" INCLUDEPATH "\\src\\m_pd.h\"\n");
! fprintf(file,"#include \"" INCLUDEPATH "\\src\\k_cext.h\"\n"); /* needs to be in pd/src, sorry.. */
}
void k_sys_makecompilestring(char *to,char *name,char *funcname){
! sprintf(to,"cl %s " INCLUDEPATH "\\bin\\pd.lib " INCLUDEPATH "\\bin\\k_cext.lib /LD /Gd /GD /Ox /DNT /link /export:%s",
name, funcname);
}
Index: k_cext.h
===================================================================
RCS file: /cvsroot/pure-data/externals/k_cext/k_cext.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** k_cext.h 30 Jun 2004 10:46:14 -0000 1.4
--- k_cext.h 8 Aug 2004 13:09:02 -0000 1.5
***************
*** 18,27 ****
*/
-
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
! #include <stdbool.h>
#ifdef _MSC_VER
typedef int bool;
--- 18,26 ----
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>
! //#include <stdbool.h>
#ifdef _MSC_VER
typedef int bool;
***************
*** 34,37 ****
--- 33,42 ----
#include <stdarg.h>
+ #ifdef MSW
+ #define K_EXTERN __declspec(dllexport) extern
+ #else
+ #define K_EXTERN extern
+ #endif
+
typedef struct k_cext
{
***************
*** 57,62 ****
/* The following functions are used by intsort and floatsort */
! extern int k_cext_intcompare(const void *p1, const void *p2);
! extern int k_cext_floatcompare(const void *p1, const void *p2);
--- 62,67 ----
/* The following functions are used by intsort and floatsort */
! K_EXTERN int k_cext_intcompare(const void *p1, const void *p2);
! K_EXTERN int k_cext_floatcompare(const void *p1, const void *p2);
***************
*** 65,76 ****
*/
! extern int k_sys_getprocessfunction(t_k_cext *x,char *funcname,char *name);
! extern void k_sys_freehandle(t_k_cext *x);
! extern void k_sys_mktempfilename(char *to);
! extern void k_sys_writeincludes(FILE *file);
! extern void k_sys_makecompilestring(char *to,char *name,char *funcname);
! extern void k_sys_deletefile(char *name);
! extern void k_sys_init(void);
--- 70,84 ----
*/
! K_EXTERN int k_sys_getprocessfunction(t_k_cext *x,char *funcname,char *name);
! K_EXTERN void k_sys_freehandle(t_k_cext *x);
! K_EXTERN void k_sys_mktempfilename(char *to);
! K_EXTERN void k_sys_writeincludes(FILE *file);
! K_EXTERN void k_sys_makecompilestring(char *to,char *name,char *funcname);
! K_EXTERN void k_sys_deletefile(char *name);
! K_EXTERN void k_sys_init(void);
+ /* TB value accessing functions*/
+ K_EXTERN t_float k_cext_getvalue(char c[]);
+ K_EXTERN int k_cext_setvalue(char c[],float f);
***************
*** 109,113 ****
/* TB: values and bang outlets */
#define Ob(a) outlet_bang(x->outlets[a]);
! t_float k_cext_getvalue(char c[]);
int k_cext_setvalue(char c[],float f);
#define VALUE(char) k_cext_getvalue(char)
--- 117,121 ----
/* TB: values and bang outlets */
#define Ob(a) outlet_bang(x->outlets[a]);
! float k_cext_getvalue(char c[]);
int k_cext_setvalue(char c[],float f);
#define VALUE(char) k_cext_getvalue(char)
Index: k_cext.c
===================================================================
RCS file: /cvsroot/pure-data/externals/k_cext/k_cext.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** k_cext.c 29 Jun 2004 20:49:31 -0000 1.2
--- k_cext.c 8 Aug 2004 13:09:02 -0000 1.3
***************
*** 23,26 ****
--- 23,28 ----
#include "k_cext.h"
+ #include <ctype.h>
+
static char *version =
"k_cext v0.3.0, written by Kjetil S. Matheussen, k.s.matheussen(a)notam02.no\n"
Index: Makefile
===================================================================
RCS file: /cvsroot/pure-data/externals/k_cext/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile 8 Jan 2004 14:55:24 -0000 1.1
--- Makefile 8 Aug 2004 13:09:01 -0000 1.2
***************
*** 12,23 ****
.SUFFIXES: .dll
! PDNTCFLAGS = /W3 /WX /DNT /DPD /nologo /DINCLUDEPATH=\"c:\\programme\\audio\\pd\"
! PDNTINCLUDE = /I. /Ic:\programme\audio\pd\src
! PDNTLIB = libc.lib oldnames.lib kernel32.lib c:\programme\audio\pd\bin\pd.lib
.c.dll:
- cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c k_cext_win.c
cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c
link /dll /export:$(CSYM)_setup $*.obj k_cext_win.obj $(PDNTLIB)
--- 12,23 ----
.SUFFIXES: .dll
! PDNTCFLAGS = /W3 /DNT /DPD /nologo /DINCLUDEPATH=\"D:\\sourcescvs\\pd\"
! PDNTINCLUDE = /I. /ID:\sourcescvs\pd\src
! PDNTLIB = libc.lib oldnames.lib kernel32.lib "C:\Pure Data\bin\pd.lib"
.c.dll:
cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c
+ cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c k_cext_win.c
link /dll /export:$(CSYM)_setup $*.obj k_cext_win.obj $(PDNTLIB)