Pd-cvs June 2005

pd-cvs@lists.iem.at

14 participants
211 discussions

externals/bbogart/popup popup.c,1.13,1.14
by IOhannes m zmölnig 06 Jun '05

06 Jun '05

Update of /cvsroot/pure-data/externals/bbogart/popup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27211 Modified Files: popup.c Log Message: now we can select, change options/name with hidden [popup]s that were already opened Index: popup.c =================================================================== RCS file: /cvsroot/pure-data/externals/bbogart/popup/popup.c,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** popup.c 6 Jun 2005 16:05:31 -0000 1.13 --- popup.c 6 Jun 2005 17:18:18 -0000 1.14 *************** *** 389,397 **** int i; x->x_num_options = argc; /* delete old menu items */ ! if(x->initialized)sys_vgui(".x%x.c.s%x.menu delete 0 end \n", x->x_glist, x); if(argc>x->x_maxoptions){ --- 389,398 ---- int i; + int visible=(x->x_glist)?glist_isvisible(x->x_glist):0; x->x_num_options = argc; /* delete old menu items */ ! if(visible)sys_vgui(".x%x.c.s%x.menu delete 0 end \n", x->x_glist, x); if(argc>x->x_maxoptions){ *************** *** 405,409 **** { x->x_options[i] = atom_getsymbol(argv+i); ! if(x->initialized)sys_vgui(".x%x.c.s%x.menu add command -label \"%s\" -command {.x%x.c.s%x configure -text \"%s\" ; popup_sel%x \"%d\"} \n", x->x_glist, x, x->x_options[i]->s_name, x->x_glist, x, x->x_options[i]->s_name, x, i); } --- 406,410 ---- { x->x_options[i] = atom_getsymbol(argv+i); ! if(visible)sys_vgui(".x%x.c.s%x.menu add command -label \"%s\" -command {.x%x.c.s%x configure -text \"%s\" ; popup_sel%x \"%d\"} \n", x->x_glist, x, x->x_options[i]->s_name, x->x_glist, x, x->x_options[i]->s_name, x, i); } *************** *** 415,422 **** static void popup_bgcolour(t_popup* x, t_symbol* col) { DEBUG(post("bgcolour start");) x->x_colour = col; ! if(x->initialized)sys_vgui(".x%x.c.s%x configure -background \"%s\"\n", x->x_glist, x, col->s_name); } --- 416,424 ---- static void popup_bgcolour(t_popup* x, t_symbol* col) { + int visible=(x->x_glist)?glist_isvisible(x->x_glist):0; DEBUG(post("bgcolour start");) x->x_colour = col; ! if(visible)sys_vgui(".x%x.c.s%x configure -background \"%s\"\n", x->x_glist, x, col->s_name); } *************** *** 424,431 **** static void popup_name(t_popup* x, t_symbol *name) { DEBUG(post("name start");) x->x_name = name; ! if(x->initialized)sys_vgui(".x%x.c.s%x configure -text \"%s\"\n", x->x_glist, x, name->s_name); } --- 426,434 ---- static void popup_name(t_popup* x, t_symbol *name) { + int visible=(x->x_glist)?glist_isvisible(x->x_glist):0; DEBUG(post("name start");) x->x_name = name; ! if(visible)sys_vgui(".x%x.c.s%x configure -text \"%s\"\n", x->x_glist, x, name->s_name); } *************** *** 434,442 **** { DEBUG(post("iselect start");) int i=(int)item; if( i<x->x_num_options && i>=0) { ! if(x->initialized)sys_vgui(".x%x.c.s%x configure -text \"%s\" ; popup_sel%x \"%d\" \n", glist_getcanvas(x->x_glist), x, x->x_options[i]->s_name,x, i); else popup_output(x, i); --- 437,446 ---- { DEBUG(post("iselect start");) + int visible=(x->x_glist)?glist_isvisible(x->x_glist):0; int i=(int)item; if( i<x->x_num_options && i>=0) { ! if(visible)sys_vgui(".x%x.c.s%x configure -text \"%s\" ; popup_sel%x \"%d\" \n", glist_getcanvas(x->x_glist), x, x->x_options[i]->s_name,x, i); else popup_output(x, i); *************** *** 453,456 **** --- 457,461 ---- { int i,match=0; + int visible=(x->x_glist)?glist_isvisible(x->x_glist):0; /* Compare inlet symbol to each option */ *************** *** 459,463 **** if(x->x_options[i]->s_name == s->s_name) { ! if(x->initialized)sys_vgui(".x%x.c.s%x configure -text \"%s\" ; popup_sel%x \"%d\" \n", glist_getcanvas(x->x_glist), x, x->x_options[i]->s_name,x, i); else popup_output(x, i); --- 464,468 ---- if(x->x_options[i]->s_name == s->s_name) { ! if(visible)sys_vgui(".x%x.c.s%x configure -text \"%s\" ; popup_sel%x \"%d\" \n", glist_getcanvas(x->x_glist), x, x->x_options[i]->s_name,x, i); else popup_output(x, i); *************** *** 478,481 **** --- 483,487 ---- int i, new_limit; + int visible=(x->x_glist)?glist_isvisible(x->x_glist):0; new_limit = x->x_num_options + argc; *************** *** 500,504 **** { x->x_options[i] = atom_getsymbol(argv+i-x->x_num_options); ! if(x->initialized)sys_vgui(".x%x.c.s%x.menu add command -label \"%s\" -command {.x%x.c.s%x configure -text \"%s\" ; popup_sel%x \"%d\"} \n", x->x_glist, x, x->x_options[i]->s_name, x->x_glist, x, x->x_options[i]->s_name, x, i); } --- 506,510 ---- { x->x_options[i] = atom_getsymbol(argv+i-x->x_num_options); ! if(visible)sys_vgui(".x%x.c.s%x.menu add command -label \"%s\" -command {.x%x.c.s%x configure -text \"%s\" ; popup_sel%x \"%d\"} \n", x->x_glist, x, x->x_options[i]->s_name, x->x_glist, x, x->x_options[i]->s_name, x, i); }

1 0

externals/bbogart/popup popup.c,1.12,1.13
by IOhannes m zmölnig 06 Jun '05

06 Jun '05

Update of /cvsroot/pure-data/externals/bbogart/popup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28145 Modified Files: popup.c Log Message: removed the constraint about not being able to loadbang the object with options Index: popup.c =================================================================== RCS file: /cvsroot/pure-data/externals/bbogart/popup/popup.c,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** popup.c 6 Jun 2005 15:13:43 -0000 1.12 --- popup.c 6 Jun 2005 16:05:31 -0000 1.13 *************** *** 59,62 **** --- 59,64 ---- t_symbol** x_options; int x_maxoptions; + + int initialized; /* 1 when we are allowed to draw, 0 otherwise */ } t_popup; *************** *** 64,68 **** /* Append " x " to the following line to show debugging messages */ ! #define DEBUG(x) --- 66,70 ---- /* Append " x " to the following line to show debugging messages */ ! #define DEBUG(x) *************** *** 155,166 **** /* Seems we have to delete the widget in case it already exists (Provided by Guenter)*/ ! sys_vgui("destroy .x%x.c.s%x\n",glist_getcanvas(glist),x); ! sys_vgui("set %xw .x%x.c.s%x ; menubutton $%xw -relief raised -background \"%s\" -text \"%s\" -direction flush -menu $%xw.menu ; menu $%xw.menu -tearoff 0\n", x,canvas,x,x,x->x_colour->s_name,temp_name->s_name,x,x); for(i=0 ; i<x->x_num_options ; i++) { ! sys_vgui(".x%x.c.s%x.menu add command -label \"%s\" -command {.x%x.c.s%x configure -text \"%s\" ; popup_sel%x \"%d\"} \n", canvas, x, x->x_options[i]->s_name, canvas, x, x->x_options[i]->s_name, x, i); } --- 157,168 ---- /* Seems we have to delete the widget in case it already exists (Provided by Guenter)*/ ! if(x->initialized)sys_vgui("destroy .x%x.c.s%x\n",glist_getcanvas(glist),x); ! if(x->initialized)sys_vgui("set %xw .x%x.c.s%x ; menubutton $%xw -relief raised -background \"%s\" -text \"%s\" -direction flush -menu $%xw.menu ; menu $%xw.menu -tearoff 0\n", x,canvas,x,x,x->x_colour->s_name,temp_name->s_name,x,x); for(i=0 ; i<x->x_num_options ; i++) { ! if(x->initialized)sys_vgui(".x%x.c.s%x.menu add command -label \"%s\" -command {.x%x.c.s%x configure -text \"%s\" ; popup_sel%x \"%d\"} \n", canvas, x, x->x_options[i]->s_name, canvas, x, x->x_options[i]->s_name, x, i); } *************** *** 174,177 **** --- 176,186 ---- t_canvas *canvas=glist_getcanvas(glist); DEBUG(post("drawme start");) + + /* by drawing, we "initialize" the popup */ + if(!x->initialized){ + x->initialized=1; + } + + DEBUG(post("drawme %d",firsttime);) if (firsttime) { *************** *** 204,216 **** DEBUG(post("erase start");) ! sys_vgui("destroy .x%x.c.s%x\n",glist_getcanvas(glist),x); ! sys_vgui(".x%x.c delete %xS\n",glist_getcanvas(glist), x); /* inlets and outlets */ ! sys_vgui(".x%x.c delete %xi\n",glist_getcanvas(glist),x); /* Added tag for all inlets of one instance */ ! sys_vgui(".x%x.c delete %xo\n",glist_getcanvas(glist),x); /* Added tag for all outlets of one instance */ ! sys_vgui(".x%x.c delete %xhandle\n",glist_getcanvas(glist),x,0); DEBUG(post("erase end");) --- 213,225 ---- DEBUG(post("erase start");) ! if(x->initialized)sys_vgui("destroy .x%x.c.s%x\n",glist_getcanvas(glist),x); ! if(x->initialized)sys_vgui(".x%x.c delete %xS\n",glist_getcanvas(glist), x); /* inlets and outlets */ ! if(x->initialized)sys_vgui(".x%x.c delete %xi\n",glist_getcanvas(glist),x); /* Added tag for all inlets of one instance */ ! if(x->initialized)sys_vgui(".x%x.c delete %xo\n",glist_getcanvas(glist),x); /* Added tag for all outlets of one instance */ ! if(x->initialized)sys_vgui(".x%x.c delete %xhandle\n",glist_getcanvas(glist),x,0); DEBUG(post("erase end");) *************** *** 225,229 **** int *xp1, int *yp1, int *xp2, int *yp2) { ! DEBUG(post("getrect start");) int width, height; --- 234,238 ---- int *xp1, int *yp1, int *xp2, int *yp2) { ! DEBUG(post("getrect start");) int width, height; *************** *** 249,253 **** if (glist_isvisible(glist)) { ! sys_vgui(".x%x.c coords %xSEL %d %d %d %d\n", glist_getcanvas(glist), x, text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist)-1, --- 258,262 ---- if (glist_isvisible(glist)) { ! if(x->initialized)sys_vgui(".x%x.c coords %xSEL %d %d %d %d\n", glist_getcanvas(glist), x, text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist)-1, *************** *** 266,270 **** t_popup *x = (t_popup *)z; if (state) { ! sys_vgui(".x%x.c create rectangle \ %d %d %d %d -tags %xSEL -outline blue\n", glist_getcanvas(glist), --- 275,279 ---- t_popup *x = (t_popup *)z; if (state) { ! if(x->initialized)sys_vgui(".x%x.c create rectangle \ %d %d %d %d -tags %xSEL -outline blue\n", glist_getcanvas(glist), *************** *** 274,278 **** } else { ! sys_vgui(".x%x.c delete %xSEL\n", glist_getcanvas(glist), x); } --- 283,287 ---- } else { ! if(x->initialized)sys_vgui(".x%x.c delete %xSEL\n", glist_getcanvas(glist), x); } *************** *** 384,388 **** /* delete old menu items */ ! sys_vgui(".x%x.c.s%x.menu delete 0 end \n", x->x_glist, x); if(argc>x->x_maxoptions){ --- 393,397 ---- /* delete old menu items */ ! if(x->initialized)sys_vgui(".x%x.c.s%x.menu delete 0 end \n", x->x_glist, x); if(argc>x->x_maxoptions){ *************** *** 396,400 **** { x->x_options[i] = atom_getsymbol(argv+i); ! sys_vgui(".x%x.c.s%x.menu add command -label \"%s\" -command {.x%x.c.s%x configure -text \"%s\" ; popup_sel%x \"%d\"} \n", x->x_glist, x, x->x_options[i]->s_name, x->x_glist, x, x->x_options[i]->s_name, x, i); } --- 405,409 ---- { x->x_options[i] = atom_getsymbol(argv+i); ! if(x->initialized)sys_vgui(".x%x.c.s%x.menu add command -label \"%s\" -command {.x%x.c.s%x configure -text \"%s\" ; popup_sel%x \"%d\"} \n", x->x_glist, x, x->x_options[i]->s_name, x->x_glist, x, x->x_options[i]->s_name, x, i); } *************** *** 409,413 **** x->x_colour = col; ! sys_vgui(".x%x.c.s%x configure -background \"%s\"\n", x->x_glist, x, col->s_name); } --- 418,422 ---- x->x_colour = col; ! if(x->initialized)sys_vgui(".x%x.c.s%x configure -background \"%s\"\n", x->x_glist, x, col->s_name); } *************** *** 418,422 **** x->x_name = name; ! sys_vgui(".x%x.c.s%x configure -text \"%s\"\n", x->x_glist, x, name->s_name); } --- 427,431 ---- x->x_name = name; ! if(x->initialized)sys_vgui(".x%x.c.s%x configure -text \"%s\"\n", x->x_glist, x, name->s_name); } *************** *** 429,437 **** if( i<x->x_num_options && i>=0) { ! sys_vgui(".x%x.c.s%x configure -text \"%s\" ; popup_sel%x \"%d\" \n", glist_getcanvas(x->x_glist), x, x->x_options[i]->s_name,x, i); } else { ! post("popup: Valid menu selections are from %d to %d\npopup: You entered %d.", 0, x->x_num_options, i); } --- 438,447 ---- if( i<x->x_num_options && i>=0) { ! if(x->initialized)sys_vgui(".x%x.c.s%x configure -text \"%s\" ; popup_sel%x \"%d\" \n", glist_getcanvas(x->x_glist), x, x->x_options[i]->s_name,x, i); + else popup_output(x, i); } else { ! pd_error(x, "popup: Valid menu selections are from %d to %d\npopup: You entered %d.", 0, x->x_num_options, i); } *************** *** 449,454 **** if(x->x_options[i]->s_name == s->s_name) { ! sys_vgui(".x%x.c.s%x configure -text \"%s\" ; popup_sel%x \"%d\" \n", glist_getcanvas(x->x_glist), x, x->x_options[i]->s_name,x, i); match = 1; break; --- 459,465 ---- if(x->x_options[i]->s_name == s->s_name) { ! if(x->initialized)sys_vgui(".x%x.c.s%x configure -text \"%s\" ; popup_sel%x \"%d\" \n", glist_getcanvas(x->x_glist), x, x->x_options[i]->s_name,x, i); + else popup_output(x, i); match = 1; break; *************** *** 489,493 **** { x->x_options[i] = atom_getsymbol(argv+i-x->x_num_options); ! sys_vgui(".x%x.c.s%x.menu add command -label \"%s\" -command {.x%x.c.s%x configure -text \"%s\" ; popup_sel%x \"%d\"} \n", x->x_glist, x, x->x_options[i]->s_name, x->x_glist, x, x->x_options[i]->s_name, x, i); } --- 500,504 ---- { x->x_options[i] = atom_getsymbol(argv+i-x->x_num_options); ! if(x->initialized)sys_vgui(".x%x.c.s%x.menu add command -label \"%s\" -command {.x%x.c.s%x configure -text \"%s\" ; popup_sel%x \"%d\"} \n", x->x_glist, x, x->x_options[i]->s_name, x->x_glist, x, x->x_options[i]->s_name, x, i); } *************** *** 533,536 **** --- 544,549 ---- x->x_options[0] = gensym("option"); + x->initialized=0; + switch(argc){ case 0: break; /* just use default values */

1 0

externals/bbogart/popup popup.c,1.11,1.12
by IOhannes m zmölnig 06 Jun '05

06 Jun '05

Update of /cvsroot/pure-data/externals/bbogart/popup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31995 Modified Files: popup.c Log Message: - removed the MAX_OPTIONS; we can now have an "infinite" number of options (without segfaulting !) - you can now specify less than 5 arguments: "popup [<w> <h> [<c> [<n> [<o1> ...]]]]" Index: popup.c =================================================================== RCS file: /cvsroot/pure-data/externals/bbogart/popup/popup.c,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** popup.c 17 Jan 2005 21:06:59 -0000 1.11 --- popup.c 6 Jun 2005 15:13:43 -0000 1.12 *************** *** 45,49 **** t_glist * x_glist; t_outlet* out2; - t_inlet* in2; int x_rect_width; int x_rect_height; --- 45,48 ---- *************** *** 58,63 **** t_symbol* x_name; ! t_symbol* x_options[MAX_OPTIONS]; ! } t_popup; --- 57,62 ---- t_symbol* x_name; ! t_symbol** x_options; ! int x_maxoptions; } t_popup; *************** *** 387,390 **** --- 386,396 ---- sys_vgui(".x%x.c.s%x.menu delete 0 end \n", x->x_glist, x); + if(argc>x->x_maxoptions){ + /* resize the options-array */ + if(x->x_options)freebytes(x->x_options, sizeof(t_symbol*)*x->x_maxoptions); + x->x_maxoptions=argc; + x->x_options=(t_symbol**)getbytes(sizeof(t_symbol*)*x->x_maxoptions); + } + for(i=0 ; i<argc ; i++) { *************** *** 463,466 **** --- 469,488 ---- new_limit = x->x_num_options + argc; + if(new_limit>x->x_maxoptions){ + t_symbol**dummy; + int new_size=new_limit*2; + DEBUG(post("resizing options");) + dummy=(t_symbol**)getbytes(sizeof(t_symbol*)*new_size); + if(dummy) + { + memcpy(dummy, x->x_options, sizeof(t_symbol*)*x->x_maxoptions); + freebytes(x->x_options, sizeof(t_symbol*)*x->x_maxoptions); + x->x_maxoptions=new_size; + x->x_options=dummy; + } else { + error("popup: no memory for options"); + return; + } + } for(i=x->x_num_options ; i<new_limit ; i++) *************** *** 480,483 **** --- 502,510 ---- static t_class *popup_class; + static void popup_free(t_popup*x) + { + if(x->x_options)freebytes(x->x_options, sizeof(t_symbol*)*x->x_maxoptions); + } + static void *popup_new(t_symbol *s, int argc, t_atom *argv) *************** *** 493,529 **** x->x_height = 25; x->current_selection = -1; ! ! if (argc < 5) ! { ! post("popup: You must enter at least 5 arguments. Default values used.\n\nArguments:\npopup [width] [height] [colour] [name] [option-1] [option-2] ..."); ! x->x_width = 124; ! x->x_height = 25; ! x->x_num_options = 1; ! x->x_colour = gensym("#ffffff"); ! x->x_name = gensym("popup"); ! ! x->x_options[0] = gensym("option"); ! ! } else { ! /* Copy args into structure */ ! x->x_width = atom_getint(argv); ! x->x_height = atom_getint(argv+1); ! x->x_colour = atom_getsymbol(argv+2); ! x->x_name = atom_getsymbol(argv+3); ! ! x->x_num_options = argc-4; ! for(i=0 ; i<x->x_num_options ; i++) ! { ! x->x_options[i] = atom_getsymbol( argv+(i+4) ); ! } ! } ! /* Bind the recieve "popup%p" to the widget outlet*/ ! sprintf(buf,"popup%p",x); ! x->x_sym = gensym(buf); ! pd_bind(&x->x_obj.ob_pd, x->x_sym); ! /* define proc in tcl/tk where "popup%p" is the receive, "output" is the method, and "$index" is an argument. */ sys_vgui("proc popup_sel%x {index} {\n pd [concat popup%p output $index \\;]\n }\n",x,x); --- 520,565 ---- x->x_height = 25; x->current_selection = -1; ! ! x->x_maxoptions=MAX_OPTIONS; ! x->x_options=(t_symbol**)getbytes(sizeof(t_symbol*)*x->x_maxoptions); ! ! ! x->x_width = 124; ! x->x_height = 25; ! x->x_num_options = 1; ! x->x_colour = gensym("#ffffff"); ! x->x_name = gensym("popup"); ! ! x->x_options[0] = gensym("option"); ! ! switch(argc){ ! case 0: break; /* just use default values */ ! case 1: ! post("popup: You must enter at least 5 arguments. Default values used.\n\nArguments:\npopup [width] [height] [colour] [name] [option-1] [option-2] ..."); ! break; ! default: ! /* Copy args into structure */ ! x->x_num_options = argc-4; ! for(i=0 ; i<x->x_num_options ; i++) ! { ! x->x_options[i] = atom_getsymbol( argv+(i+4) ); ! } ! case 4: ! x->x_name = atom_getsymbol(argv+3); ! case 3: ! x->x_colour = atom_getsymbol(argv+2); ! case 2: ! x->x_width =atom_getint(argv+0); ! x->x_height=atom_getint(argv+1); ! break; ! } ! /* Bind the recieve "popup%p" to the widget outlet*/ ! sprintf(buf,"popup%p",x); ! x->x_sym = gensym(buf); ! pd_bind(&x->x_obj.ob_pd, x->x_sym); ! /* define proc in tcl/tk where "popup%p" is the receive, "output" is the method, and "$index" is an argument. */ sys_vgui("proc popup_sel%x {index} {\n pd [concat popup%p output $index \\;]\n }\n",x,x); *************** *** 542,546 **** DEBUG(post("setup start");) ! popup_class = class_new(gensym("popup"), (t_newmethod)popup_new, 0, sizeof(t_popup),0,A_GIMME,0); --- 578,582 ---- DEBUG(post("setup start");) ! popup_class = class_new(gensym("popup"), (t_newmethod)popup_new, (t_method)popup_free, sizeof(t_popup),0,A_GIMME,0); *************** *** 577,581 **** class_doaddfloat(popup_class, (t_method)popup_iselect); ! // class_addsymbol(popup_class, (t_method)popup_symselect); class_setwidget(popup_class,&popup_widgetbehavior); --- 613,617 ---- class_doaddfloat(popup_class, (t_method)popup_iselect); ! //class_addsymbol(popup_class, (t_method)popup_symselect); class_setwidget(popup_class,&popup_widgetbehavior);

1 0

externals/iemlib/src/iemlib1 makefile,1.2,1.3
by IOhannes m zmölnig 06 Jun '05

06 Jun '05

Update of /cvsroot/pure-data/externals/iemlib/src/iemlib1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11632/src/iemlib1 Modified Files: makefile Log Message: removed the removal of *.o files after compilation (eases re-compilation) Index: makefile =================================================================== RCS file: /cvsroot/pure-data/externals/iemlib/src/iemlib1/makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile 9 Mar 2005 17:15:59 -0000 1.2 --- makefile 6 Jun 2005 11:38:24 -0000 1.3 *************** *** 54,59 **** clean: ! rm ../../lib/$(TARGET) ! rm *.o all: $(OBJ) --- 54,59 ---- clean: ! -rm ../../lib/$(TARGET) $(TARGET) ! -rm *.o all: $(OBJ) *************** *** 61,66 **** ld $(LDFLAGS) -o $(TARGET) *.o $(LIB) strip --strip-unneeded $(TARGET) ! mv $(TARGET) ../../lib ! rm *.o $(OBJ) : %.o : %.c --- 61,65 ---- ld $(LDFLAGS) -o $(TARGET) *.o $(LIB) strip --strip-unneeded $(TARGET) ! -cp $(TARGET) ../../lib $(OBJ) : %.o : %.c

1 0

externals/iemlib/src/iemlib2 makefile,1.3,1.4
by IOhannes m zmölnig 06 Jun '05

06 Jun '05

Update of /cvsroot/pure-data/externals/iemlib/src/iemlib2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11632/src/iemlib2 Modified Files: makefile Log Message: removed the removal of *.o files after compilation (eases re-compilation) Index: makefile =================================================================== RCS file: /cvsroot/pure-data/externals/iemlib/src/iemlib2/makefile,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** makefile 2 Jun 2005 18:25:00 -0000 1.3 --- makefile 6 Jun 2005 11:38:25 -0000 1.4 *************** *** 72,77 **** clean: ! rm ../../lib/$(TARGET) ! rm *.o all: $(OBJ) --- 72,77 ---- clean: ! -rm ../../lib/$(TARGET) $(TARGET) ! -rm *.o all: $(OBJ) *************** *** 79,84 **** ld $(LDFLAGS) -o $(TARGET) *.o $(LIB) strip --strip-unneeded $(TARGET) ! mv $(TARGET) ../../lib ! rm *.o $(OBJ) : %.o : %.c --- 79,83 ---- ld $(LDFLAGS) -o $(TARGET) *.o $(LIB) strip --strip-unneeded $(TARGET) ! cp $(TARGET) ../../lib $(OBJ) : %.o : %.c

1 0

externals/iemlib/src/iem_mp3 makefile,1.2,1.3
by IOhannes m zmölnig 06 Jun '05

06 Jun '05

Update of /cvsroot/pure-data/externals/iemlib/src/iem_mp3 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11632/src/iem_mp3 Modified Files: makefile Log Message: removed the removal of *.o files after compilation (eases re-compilation) Index: makefile =================================================================== RCS file: /cvsroot/pure-data/externals/iemlib/src/iem_mp3/makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile 9 Mar 2005 17:15:59 -0000 1.2 --- makefile 6 Jun 2005 11:38:23 -0000 1.3 *************** *** 31,36 **** clean: ! rm ../../lib/$(TARGET) ! rm *.o all: $(OBJ) --- 31,36 ---- clean: ! -rm ../../lib/$(TARGET) $(TARGET) ! -rm *.o all: $(OBJ) *************** *** 40,45 **** ld $(LDFLAGS) -o $(TARGET) *.o $(LIB) strip --strip-unneeded $(TARGET) ! mv $(TARGET) ../../lib ! rm *.o $(OBJ) : %.o : %.c --- 40,44 ---- ld $(LDFLAGS) -o $(TARGET) *.o $(LIB) strip --strip-unneeded $(TARGET) ! cp $(TARGET) ../../lib $(OBJ) : %.o : %.c

1 0

externals/iemlib/src/iem_t3_lib makefile,1.2,1.3
by IOhannes m zmölnig 06 Jun '05

06 Jun '05

Update of /cvsroot/pure-data/externals/iemlib/src/iem_t3_lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11632/src/iem_t3_lib Modified Files: makefile Log Message: removed the removal of *.o files after compilation (eases re-compilation) Index: makefile =================================================================== RCS file: /cvsroot/pure-data/externals/iemlib/src/iem_t3_lib/makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile 9 Mar 2005 17:15:59 -0000 1.2 --- makefile 6 Jun 2005 11:38:24 -0000 1.3 *************** *** 36,41 **** clean: ! rm ../../lib/$(TARGET) ! rm *.o all: $(OBJ) --- 36,41 ---- clean: ! -rm ../../lib/$(TARGET) $(TARGET) ! -rm *.o all: $(OBJ) *************** *** 45,50 **** ld $(LDFLAGS) -o $(TARGET) *.o $(LIB) strip --strip-unneeded $(TARGET) ! mv $(TARGET) ../../lib ! rm *.o $(OBJ) : %.o : %.c --- 45,49 ---- ld $(LDFLAGS) -o $(TARGET) *.o $(LIB) strip --strip-unneeded $(TARGET) ! cp $(TARGET) ../../lib $(OBJ) : %.o : %.c

1 0

externals/iemlib Makefile,NONE,1.1
by IOhannes m zmölnig 06 Jun '05

06 Jun '05

Update of /cvsroot/pure-data/externals/iemlib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11224 Added Files: Makefile Log Message: added a common Makefile that builds all the sub-libraries --- NEW FILE: Makefile --- # ############################################### # LATER think about automatic adding of libraries IEMLIBS = iemlib1 iemlib2 iem_t3_lib iem_mp3 # this is where we install to PREFIX =/usr/local/lib/pd # this is where we install to (in detail) INSTALL_BIN=$(PREFIX)/extra INSTALL_DOC=$(PREFIX)/extra/iemhelp # LATER think about separating iemabs and iemhelp # ############################################### .PHONY: iemlibs $(IEMLIBS) iemlibs: $(IEMLIBS) $(IEMLIBS): $(MAKE) -C src/$@ install: install-bin install-doc install-abs install-bin: -install -d ${INSTALL_BIN} -install -m 644 lib/*.* $(INSTALL_BIN) install-doc: -install -d ${INSTALL_DOC} -install -m 644 iemhelp/*.pd $(INSTALL_DOC) install-abs: -install -d ${INSTALL_BIN} -install -m 644 iemabs/*.pd $(INSTALL_BIN)

1 0

packages/darwin_app Makefile,1.12,1.13
by Hans-Christoph Steiner 06 Jun '05

06 Jun '05

Update of /cvsroot/pure-data/packages/darwin_app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14357 Modified Files: Makefile Log Message: - fixed typo in DESTDIR (there was a space after "installroot") - added generated config files to darwin_app_externals_flext_clean target Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/darwin_app/Makefile,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Makefile 5 Jun 2005 10:34:10 -0000 1.12 --- Makefile 6 Jun 2005 02:38:27 -0000 1.13 *************** *** 4,8 **** PD_APP_NAME = Pd ! DESTDIR = installroot PD_APP_CONTENTS = /Applications/$(PD_APP_NAME).app/Contents INSTALL_PREFIX = $(PD_APP_CONTENTS)/Resources --- 4,8 ---- PD_APP_NAME = Pd ! DESTDIR = installroot PD_APP_CONTENTS = /Applications/$(PD_APP_NAME).app/Contents INSTALL_PREFIX = $(PD_APP_CONTENTS)/Resources *************** *** 298,306 **** ( \ ( \ ! cat buildsys/config-mac-pd-gcc.txt | \ ! sed "s/^PDPATH=.*/PDPATH=..\/..\/..\/pd/" > ____c && \ ! cp ____c buildsys/config-mac-pd-gcc.txt && rm -f ____c \ ! ) || \ ! ( \ sed "s/^PDPATH=.*/PDPATH=..\/..\/..\/pd/" buildsys/mac/pd/config-gcc.def > buildsys/config-mac-pd-gcc.txt \ ) \ --- 298,306 ---- ( \ ( \ ! cat buildsys/config-mac-pd-gcc.txt | \ ! sed "s/^PDPATH=.*/PDPATH=..\/..\/..\/pd/" > ____c && \ ! cp ____c buildsys/config-mac-pd-gcc.txt && rm -f ____c \ ! ) || \ ! ( \ sed "s/^PDPATH=.*/PDPATH=..\/..\/..\/pd/" buildsys/mac/pd/config-gcc.def > buildsys/config-mac-pd-gcc.txt \ ) \ *************** *** 591,603 **** darwin_app_externals_flext_clean: ! -rm ../../externals/grill/flext/source/libflext.a ! cd ../../externals/grill/flext && make -f makefile.pd-darwin clean ! cd ../../externals/grill/dyn && make -f makefile.pd-darwin clean ! cd ../../externals/grill/fftease && make -f makefile.pd-darwin clean ! cd ../../externals/grill/pool && make -f makefile.pd-darwin clean ! cd ../../externals/grill/py && make -f makefile.pd-darwin clean ! cd ../../externals/grill/vasp && make -f makefile.pd-darwin clean ! cd ../../externals/grill/vst && make -f makefile.pd-darwin clean ! cd ../../externals/grill/xsample && make -f makefile.pd-darwin clean cd ../../externals/footils/syncgrain && make -f makefile.pd-darwin clean --- 591,606 ---- darwin_app_externals_flext_clean: ! cd ../../externals/grill && ( \ ! rm flext/buildsys/config-mac-pd-gcc.txt config.txt; \ ! rm flext/source/libflext.a; \ ! cd flext && make -f makefile.pd-darwin clean; \ ! cd dyn && make -f makefile.pd-darwin clean; \ ! cd fftease && make -f makefile.pd-darwin clean; \ ! cd pool && make -f makefile.pd-darwin clean; \ ! cd py && make -f makefile.pd-darwin clean; \ ! cd vasp && make -f makefile.pd-darwin clean; \ ! cd vst && make -f makefile.pd-darwin clean; \ ! cd xsample && make -f makefile.pd-darwin clean; \ ! ) cd ../../externals/footils/syncgrain && make -f makefile.pd-darwin clean

1 0

packages/darwin_app Makefile,1.11,1.12
by Thomas Grill 05 Jun '05

05 Jun '05

Update of /cvsroot/pure-data/packages/darwin_app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25675 Modified Files: Makefile Log Message: updates for flext and flext-based externals Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/packages/darwin_app/Makefile,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Makefile 3 Jun 2005 20:28:25 -0000 1.11 --- Makefile 5 Jun 2005 10:34:10 -0000 1.12 *************** *** 4,8 **** PD_APP_NAME = Pd ! DESTDIR = installroot PD_APP_CONTENTS = /Applications/$(PD_APP_NAME).app/Contents INSTALL_PREFIX = $(PD_APP_CONTENTS)/Resources --- 4,8 ---- PD_APP_NAME = Pd ! DESTDIR = installroot PD_APP_CONTENTS = /Applications/$(PD_APP_NAME).app/Contents INSTALL_PREFIX = $(PD_APP_CONTENTS)/Resources *************** *** 54,58 **** CYCLONE_VERSION = $(CYCLONE_MAJOR_VERSION) $(CYCLONE_RELEASE) $(CYCLONE_BUILD) ! FLEXT_VERSION = $(shell grep PROJECT_NUMBER ../../externals/grill/flext/flext.doxy | cut -d '"' -f2 | cut -d ' ' -f2) GEM_VERSION = $(shell grep "GEM_VERSION" ../../Gem/src/Base/GemVersion.h | cut -d '"' -f 2) --- 54,58 ---- CYCLONE_VERSION = $(CYCLONE_MAJOR_VERSION) $(CYCLONE_RELEASE) $(CYCLONE_BUILD) ! FLEXT_VERSION = $(shell grep FLEXTMAJOR ../../externals/grill/flext/buildsys/version.inc | cut -d '=' -f2).$(shell grep FLEXTMINOR ../../externals/grill/flext/buildsys/version.inc | cut -d '=' -f2).$(shell grep FLEXTMICRO ../../externals/grill/flext/buildsys/version.inc | cut -d '=' -f2) GEM_VERSION = $(shell grep "GEM_VERSION" ../../Gem/src/Base/GemVersion.h | cut -d '"' -f 2) *************** *** 295,300 **** #---------------------------------------------------------------------------- # FLEXT ! cd ../../externals/grill/flext && bash build.sh pd gcc build-release-shared ! install -p -m0444 ../../externals/grill/flext/pd-darwin/release-shared/libflext-pd.dylib $(EXTERNALS_DIR) install -d $(HELP_DIR)/tutorials cp -rp ../../externals/grill/flext/tutorial $(HELP_DIR)/tutorials/flext --- 295,315 ---- #---------------------------------------------------------------------------- # FLEXT ! cd ../../externals/grill/flext && \ ! ( \ ! ( \ ! cat buildsys/config-mac-pd-gcc.txt | \ ! sed "s/^PDPATH=.*/PDPATH=..\/..\/..\/pd/" > ____c && \ ! cp ____c buildsys/config-mac-pd-gcc.txt && rm -f ____c \ ! ) || \ ! ( \ ! sed "s/^PDPATH=.*/PDPATH=..\/..\/..\/pd/" buildsys/mac/pd/config-gcc.def > buildsys/config-mac-pd-gcc.txt \ ! ) \ ! ) && \ ! ( \ ! cp -f build/config-mac.def config.txt \ ! ) && \ ! bash build.sh pd gcc build-release-shared ! install -p -m0444 ../../externals/grill/flext/pd-darwin/release-shared/libflext-pd.$(FLEXT_VERSION).dylib $(EXTERNALS_DIR) ! ln -sf libflext-pd.$(FLEXT_VERSION).dylib $(EXTERNALS_DIR)/libflext-pd.dylib install -d $(HELP_DIR)/tutorials cp -rp ../../externals/grill/flext/tutorial $(HELP_DIR)/tutorials/flext *************** *** 307,311 **** ######### # dyn~ ! cd ../../externals/grill/dynext && bash ../flext/build.sh pd gcc build-release-shared install -p -m0444 ../../externals/grill/dynext/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR) install -p -m0644 ../../externals/grill/dynext/pd/*.pd $(HELP_DIR)/5.reference --- 322,326 ---- ######### # dyn~ ! cd ../../externals/grill/dynext && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(EXTERNALS_DIR) FLEXTINC=../flext/source install -p -m0444 ../../externals/grill/dynext/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR) install -p -m0644 ../../externals/grill/dynext/pd/*.pd $(HELP_DIR)/5.reference *************** *** 317,321 **** ######### # pool ! cd ../../externals/grill/pool && bash ../flext/build.sh pd gcc build-release-shared install -p -m0444 ../../externals/grill/pool/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR) install -p -m0644 ../../externals/grill/pool/help-pool.pd $(HELP_DIR)/5.reference --- 332,336 ---- ######### # pool ! cd ../../externals/grill/pool && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(EXTERNALS_DIR) FLEXTINC=../flext/source install -p -m0444 ../../externals/grill/pool/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR) install -p -m0644 ../../externals/grill/pool/help-pool.pd $(HELP_DIR)/5.reference *************** *** 327,332 **** ######### # py/pyext ! # cd ../../externals/grill/py && bash ../flext/build.sh pd gcc build-release-shared ! # install -p -m0444 ../../externals/grill/py/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR) install -d $(HELP_DIR)/py/examples install -d $(HELP_DIR)/py/scripts --- 342,351 ---- ######### # py/pyext ! cd ../../externals/grill/py && \ ! ( \ ! cp -f build/config-mac.def config.txt \ ! ) && \ ! bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(EXTERNALS_DIR) FLEXTINC=../flext/source ! install -p -m0444 ../../externals/grill/py/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR) install -d $(HELP_DIR)/py/examples install -d $(HELP_DIR)/py/scripts *************** *** 342,346 **** # fails without the dir # test -d ../../vasp/pd-darwin || mkdir -p ../../vasp/pd-darwin ! cd ../../externals/grill/vasp/ && bash ../flext/build.sh pd gcc build-release-shared install -p -m0444 ../../externals/grill/vasp/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR) install -p -m0644 ../../externals/grill/vasp/pd-help/*.pd $(HELP_DIR)/5.reference --- 361,365 ---- # fails without the dir # test -d ../../vasp/pd-darwin || mkdir -p ../../vasp/pd-darwin ! cd ../../externals/grill/vasp/ && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(EXTERNALS_DIR) FLEXTINC=../flext/source install -p -m0444 ../../externals/grill/vasp/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR) install -p -m0644 ../../externals/grill/vasp/pd-help/*.pd $(HELP_DIR)/5.reference *************** *** 355,359 **** ######### # xsample ! cd ../../externals/grill/xsample && bash ../flext/build.sh pd gcc build-release-shared install -p -m0444 ../../externals/grill/xsample/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR) install -p -m0644 ../../externals/grill/xsample/pd/*.pd $(HELP_DIR)/5.reference --- 374,378 ---- ######### # xsample ! cd ../../externals/grill/xsample && bash ../flext/build.sh pd gcc build-release-shared FLEXTPREFIX=. FLEXTLIB=$(EXTERNALS_DIR) FLEXTINC=../flext/source install -p -m0444 ../../externals/grill/xsample/pd-darwin/release-shared/*.pd_darwin $(EXTERNALS_DIR) install -p -m0644 ../../externals/grill/xsample/pd/*.pd $(HELP_DIR)/5.reference

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs June 2005