Pd-cvs December 2006

pd-cvs@lists.iem.at

19 participants
825 discussions

pd/src desire.c,1.1.2.217.2.22,1.1.2.217.2.23
by Mathieu Bouchard 05 Dec '06

05 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10649 Modified Files: Tag: desiredata desire.c Log Message: fixed serials again Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.22 retrieving revision 1.1.2.217.2.23 diff -C2 -d -r1.1.2.217.2.22 -r1.1.2.217.2.23 *** desire.c 5 Dec 2006 03:15:49 -0000 1.1.2.217.2.22 --- desire.c 5 Dec 2006 03:18:24 -0000 1.1.2.217.2.23 *************** *** 849,853 **** if (!origin) return; /* the following only applies to objects created by client */ unsigned short serial = manager->serial++; ! sys_vgui("serial %x %x\n",serial,x); } --- 849,853 ---- if (!origin) return; /* the following only applies to objects created by client */ unsigned short serial = manager->serial++; ! sys_vgui("serial %x x%lx\n",serial,(long)x); }

1 0

pd/src desire.c, 1.1.2.217.2.21, 1.1.2.217.2.22 desire.tk, 1.1.2.600.2.12, 1.1.2.600.2.13
by Mathieu Bouchard 05 Dec '06

05 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9618 Modified Files: Tag: desiredata desire.c desire.tk Log Message: no more iemgui-specific methods in server-side canvas class Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.12 retrieving revision 1.1.2.600.2.13 diff -C2 -d -r1.1.2.600.2.12 -r1.1.2.600.2.13 *** desire.tk 5 Dec 2006 02:42:56 -0000 1.1.2.600.2.12 --- desire.tk 5 Dec 2006 03:15:51 -0000 1.1.2.600.2.13 *************** *** 221,230 **** proc pd {args} { ! puts "[VTyellow]warning: proc pd is obsolete (called from [info level -1]).[VTgrey]" netsend [join $args] } # you pass the 2nd argument if and only if the message creates an object (or pretends to). ! # this is every #X line except #X coords. # #N doesn't count and instead #X restore counts and #X pop counts. proc netsend {message {callback nonesuch}} { --- 221,236 ---- proc pd {args} { ! if {[info level] > 1} { ! set level [info level -1] ! } else { ! set level toplevel ! } ! puts "[VTyellow]warning: proc pd is obsolete (called from $level).[VTgrey]" netsend [join $args] } # you pass the 2nd argument if and only if the message creates an object (or pretends to). ! # this happens with those methods of #X (canvases): ! # obj, msg, floatatom, symbolatom, text, pop, connect, text_setto. # #N doesn't count and instead #X restore counts and #X pop counts. proc netsend {message {callback nonesuch}} { *************** *** 526,530 **** ^-valgrind\$ {set cmdline(valgrind) 1} ^-novalgrind\$ {set cmdline(valgrind) 0} ! ^-h|-help|--help\$ {cmdline_help; exit 1} ^- {puts "ERROR: command line argument: unknown $o"} default {lappend files_to_open [lindex $argv $i]} --- 532,536 ---- ^-valgrind\$ {set cmdline(valgrind) 1} ^-novalgrind\$ {set cmdline(valgrind) 0} ! ^(-h|-help|--help)\$ {cmdline_help; exit 1} ^- {puts "ERROR: command line argument: unknown $o"} default {lappend files_to_open [lindex $argv $i]} *************** *** 1287,1292 **** if {$@gop} {foreach x $@children {$x outside_of_the_box}} #set @mapped 0 ! if {$@gop} {set @mapped 1; pd .$self map 1} {set @mapped 0; pd .$self map 0} ! #pd .$self map 0 pd .$self close return --- 1293,1301 ---- if {$@gop} {foreach x $@children {$x outside_of_the_box}} #set @mapped 0 ! if {$@gop} { ! set @mapped 1; netsend ".$self map 1" ! } else { ! set @mapped 0; netsend ".$self map 0" ! } pd .$self close return *************** *** 5630,5649 **** set butt { ! {object Object {pd %W obj 0}} ! {message Message {pd %W msg 0}} ! {number Number {pd %W floatatom 0}} ! {symbol Symbol {pd %W symbolatom 0}} ! {comment Comment {pd %W text 0}} ! {bang bng {pd %W bng 0}} ! {toggle tgl {pd %W toggle 0}} ! {number2 nbx {pd %W numbox 0}} ! {vslider vsl {pd %W vslider 0}} ! {hslider hsl {pd %W hslider 0}} ! {vradio vradio {pd %W vradio 0}} ! {hradio hradio {pd %W hradio 0}} ! {vu vu {pd %W vumeter 0}} ! {canvas cnv {pd %W mycnv 0}} ! {graph graph {pd %W graph}} ! {array array {pd %W menuarray 0}} } # {dropper dropper {pd %W dropper 0}} --- 5639,5658 ---- set butt { ! {object Object {pd .%W obj 0}} ! {message Message {pd .%W msg 0}} ! {number Number {pd .%W floatatom 0}} ! {symbol Symbol {pd .%W symbolatom 0}} ! {comment Comment {pd .%W text 0}} ! {bang bng {%W new_object obj bng}} ! {toggle tgl {%W new_object obj tgl 0}} ! {number2 nbx {%W new_object obj nbx 0}} ! {vslider vsl {%W new_object obj vsl 0}} ! {hslider hsl {%W new_object obj hsl 0}} ! {vradio vradio {%W new_object obj vradio 0}} ! {hradio hradio {%W new_object obj hradio 0}} ! {vu vu {%W new_object obj vumeter 0}} ! {canvas cnv {%W new_object obj cnv 0}} ! {graph graph {pd .%W graph}} ! {array array {pd .%W menuarray 0}} } # {dropper dropper {pd %W dropper 0}} *************** *** 5679,5683 **** mset {icon name cmd} $e pack [button $bb._$name -image icon_$icon -border 1 \ ! -command "$@canvas editmode= 1; [regsub -all -- %W $cmd .$@canvas]"] -side left balloon $bb._$name [say $name] } --- 5688,5692 ---- mset {icon name cmd} $e pack [button $bb._$name -image icon_$icon -border 1 \ ! -command "$@canvas editmode= 1; [regsub -all -- %W $cmd $@canvas]"] -side left balloon $bb._$name [say $name] } Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.21 retrieving revision 1.1.2.217.2.22 diff -C2 -d -r1.1.2.217.2.21 -r1.1.2.217.2.22 *** desire.c 5 Dec 2006 02:57:47 -0000 1.1.2.217.2.21 --- desire.c 5 Dec 2006 03:15:49 -0000 1.1.2.217.2.22 *************** *** 6016,6035 **** } - void canvas_iemguis(t_canvas *gl, t_symbol *guiobjname) { - t_atom at; - t_binbuf *b = binbuf_new(); - SETSYMBOL(&at, guiobjname); - binbuf_restore(b, 1, &at); - canvas_objtext(gl,0,0,1,b); - } - - #define Z(a,b) \ - void canvas_##a(t_canvas *gl, t_symbol *s, int argc, t_atom *argv) {canvas_iemguis(gl,gensym(#b));} - Z(bng,bng) Z(toggle,tgl) - Z(vslider,vsl) Z(hslider,hsl) - Z(hdial,hdl) Z(vdial,vdl) Z(hradio,hradio) Z(vradio,vradio) - Z(vumeter,vu) Z(mycnv,cnv) Z(numbox,nbx) - #undef Z - void canvas_objfor(t_canvas *gl, t_text *x, int argc, t_atom *argv) { x->width = 0; --- 6016,6019 ---- *************** *** 7497,7511 **** class_addmethod3(c,canvas_canvas,"graph","*"); class_addmethod3(c,canvas_scalar,"scalar","*"); - class_addmethod3(c,canvas_bng,"bng","*"); - class_addmethod3(c,canvas_toggle,"toggle","*"); - class_addmethod3(c,canvas_vslider,"vslider","*"); - class_addmethod3(c,canvas_hslider,"hslider","*"); - class_addmethod3(c,canvas_hdial,"hdial","*"); - class_addmethod3(c,canvas_vdial,"vdial","*"); - class_addmethod3(c,canvas_hradio,"hradio","*"); - class_addmethod3(c,canvas_vradio,"vradio","*"); - class_addmethod3(c,canvas_vumeter,"vumeter","*"); - class_addmethod3(c,canvas_mycnv,"mycnv","*"); - class_addmethod3(c,canvas_numbox,"numbox","*"); class_addmethod3(c,canvas_push,"push",""); --- 7481,7484 ----

1 0

pd/src desire.c,1.1.2.217.2.20,1.1.2.217.2.21
by Mathieu Bouchard 05 Dec '06

05 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3070 Modified Files: Tag: desiredata desire.c Log Message: fixed serial for #X msg, floatatom, symbolatom, comment. Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.20 retrieving revision 1.1.2.217.2.21 diff -C2 -d -r1.1.2.217.2.20 -r1.1.2.217.2.21 *** desire.c 5 Dec 2006 01:28:04 -0000 1.1.2.217.2.20 --- desire.c 5 Dec 2006 02:57:47 -0000 1.1.2.217.2.21 *************** *** 5968,5971 **** --- 5968,5972 ---- canvas_add(gl,x); } + pd_set_newest(x); } *************** *** 6100,6103 **** --- 6101,6105 ---- canvas_add(gl,x); } + pd_set_newest(x); } *************** *** 6207,6210 **** --- 6209,6213 ---- if (argc >= 2) gatom_reload(x,&s_,argc-2,argv+2); canvas_add(gl,x); + pd_set_newest(x); }

1 0

pd/src desire.tk,1.1.2.600.2.11,1.1.2.600.2.12
by Mathieu Bouchard 05 Dec '06

05 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30155 Modified Files: Tag: desiredata desire.tk Log Message: fixed rightclick help and added rightclick copy_id Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.11 retrieving revision 1.1.2.600.2.12 diff -C2 -d -r1.1.2.600.2.11 -r1.1.2.600.2.12 *** desire.tk 5 Dec 2006 00:13:17 -0000 1.1.2.600.2.11 --- desire.tk 5 Dec 2006 02:42:56 -0000 1.1.2.600.2.12 *************** *** 225,228 **** --- 225,231 ---- } + # you pass the 2nd argument if and only if the message creates an object (or pretends to). + # this is every #X line except #X coords. + # #N doesn't count and instead #X restore counts and #X pop counts. proc netsend {message {callback nonesuch}} { global serial replyset sock *************** *** 2957,2965 **** } else { $id populate_menu $p {popup_properties popup_open popup_help ! popup_clear_wires popup_auto_wire} } tk_popup $p [expr $x-5] [expr $y-5] } def Canvas disconnect {wire} { puts "$@wires_pair" --- 2960,2973 ---- } else { $id populate_menu $p {popup_properties popup_open popup_help ! popup_clear_wires popup_auto_wire popup_copy_id} } tk_popup $p [expr $x-5] [expr $y-5] } + def View popup_copy_id {} { + clipboard clear + clipboard append $self + } + def Canvas disconnect {wire} { puts "$@wires_pair" *************** *** 4306,4311 **** if {[info exists classinfo($class)]} { set _class [lindex $classinfo($class) 0] ! } { ! set class obj set _class ObjectBox # this is not the same @isnew as $isnew ! --- 4314,4319 ---- if {[info exists classinfo($class)]} { set _class [lindex $classinfo($class) 0] ! } else { ! #set class obj set _class ObjectBox # this is not the same @isnew as $isnew ! *************** *** 4318,4322 **** default {$self position= [lrange $mess 2 3]} } ! $self pdclass= $class #!@#$ goes with the request tracking feature to be impl in the server if {[info exists canvas(msg_isnew)]} { --- 4326,4330 ---- default {$self position= [lrange $mess 2 3]} } ! $self pdclass= $class #!@#$ goes with the request tracking feature to be impl in the server if {[info exists canvas(msg_isnew)]} {

1 0

pd/src desire.c,1.1.2.217.2.19,1.1.2.217.2.20
by Mathieu Bouchard 05 Dec '06

05 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3563 Modified Files: Tag: desiredata desire.c Log Message: canvas text_setto always uses a serial Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.19 retrieving revision 1.1.2.217.2.20 diff -C2 -d -r1.1.2.217.2.19 -r1.1.2.217.2.20 *** desire.c 4 Dec 2006 20:59:49 -0000 1.1.2.217.2.19 --- desire.c 5 Dec 2006 01:28:04 -0000 1.1.2.217.2.20 *************** *** 6268,6271 **** --- 6268,6273 ---- binbuf_free(x->binbuf); x->binbuf = b; + /* fake object creation, for simplicity of client, until the "general reply system" comes, if it does */ + pd_set_newest(x); } else { int xwas=x->x, ywas=x->y;

1 0

pd/src desire.tk,1.1.2.600.2.10,1.1.2.600.2.11
by Mathieu Bouchard 05 Dec '06

05 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8512 Modified Files: Tag: desiredata desire.tk Log Message: fix typos. Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.10 retrieving revision 1.1.2.600.2.11 diff -C2 -d -r1.1.2.600.2.10 -r1.1.2.600.2.11 *** desire.tk 4 Dec 2006 21:27:35 -0000 1.1.2.600.2.10 --- desire.tk 5 Dec 2006 00:13:17 -0000 1.1.2.600.2.11 *************** *** 854,857 **** --- 854,858 ---- set untitled_folder [pwd] + # just a dummy proc proc none {args} {} *************** *** 1750,1755 **** set x1 [expr $x/$@zoom] set y1 [expr $y/$@zoom] ! #eval [concat [list pd .$self $sel $x $y] $args] ! netsend [join [concat [list pd .$self $sel $x $y] $args]] {$self new_object_callback} } --- 1751,1755 ---- set x1 [expr $x/$@zoom] set y1 [expr $y/$@zoom] ! netsend [join [concat [list .$self $sel $x $y] $args]] [list $self new_object_callback] } *************** *** 1942,1948 **** set c [lindex $mess 4] if {$c != ""} { ! set c_pos [string first $c $mess 0] ! set s [string range $mess $c_pos end] ! regsub -all {\\} $s "" text } else { set text "" --- 1942,1947 ---- set c [lindex $mess 4] if {$c != ""} { ! # what's this hack? ! regsub -all {\\} [string range $mess [string first $c $mess 0] end] "" text } else { set text "" *************** *** 7487,7491 **** #vwait foo } - - set t0 [expr [clock clicks -millis]-$t0] - puts "time to load: $t0 ms" --- 7486,7487 ----

1 0

pd/src desire.tk,1.1.2.600.2.9,1.1.2.600.2.10
by Mathieu Bouchard 04 Dec '06

04 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15901 Modified Files: Tag: desiredata desire.tk Log Message: some work on serial Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.600.2.9 retrieving revision 1.1.2.600.2.10 diff -C2 -d -r1.1.2.600.2.9 -r1.1.2.600.2.10 *** desire.tk 4 Dec 2006 14:20:41 -0000 1.1.2.600.2.9 --- desire.tk 4 Dec 2006 21:27:35 -0000 1.1.2.600.2.10 *************** *** 47,52 **** if {[file exists debug.tcl]} { source debug.tcl - } else { - puts "not loading debug.tcl, because it isn't there." } --- 47,50 ---- *************** *** 218,226 **** global serial replyset if {$n > $serial} {error "object creation serial number is in the future"} ! eval [concat $replyset($serial) [list $obj]] ! array unset replyset $serial } ! proc pd {args} {netsend [join $args]} proc netsend {message {callback nonesuch}} { --- 216,227 ---- global serial replyset if {$n > $serial} {error "object creation serial number is in the future"} ! eval [concat $replyset($n) [list $obj]] ! array unset replyset $n } ! proc pd {args} { ! puts "[VTyellow]warning: proc pd is obsolete (called from [info level -1]).[VTgrey]" ! netsend [join $args] ! } proc netsend {message {callback nonesuch}} { *************** *** 684,688 **** -variable $y -anchor w -command $z] -side left } ! pack [button .controls.switches.dio -text [say io_errors] -command {pd pd audiostatus}] pack .controls.switches -side right frame .debug --- 685,689 ---- -variable $y -anchor w -command $z] -side left } ! pack [button .controls.switches.dio -text [say io_errors] -command {pd pd audiostatus} -padx 5] pack .controls.switches -side right frame .debug *************** *** 781,787 **** return } ! post "connected!" fconfigure $sock -blocking 0 -buffering line ! pd pd init poll_sock foreach f $::files_to_open { --- 782,788 ---- return } ! post "Connected to server" fconfigure $sock -blocking 0 -buffering line ! netsend "pd init" poll_sock foreach f $::files_to_open { *************** *** 853,860 **** set untitled_folder [pwd] def Client new_file {} { global untitled_number untitled_folder ! pd pd filename Untitled-$untitled_number $untitled_folder ! pd {#N canvas; #X pop 1} incr untitled_number } --- 854,864 ---- set untitled_folder [pwd] + proc none {args} {} + def Client new_file {} { global untitled_number untitled_folder ! netsend "pd filename Untitled-$untitled_number $untitled_folder" ! netsend "#N canvas" ! netsend "#X pop 1" {none} incr untitled_number } *************** *** 1746,1750 **** set x1 [expr $x/$@zoom] set y1 [expr $y/$@zoom] ! eval [concat [list pd .$self $sel $x $y] $args] } --- 1750,1759 ---- set x1 [expr $x/$@zoom] set y1 [expr $y/$@zoom] ! #eval [concat [list pd .$self $sel $x $y] $args] ! netsend [join [concat [list pd .$self $sel $x $y] $args]] {$self new_object_callback} ! } ! ! def Canvas new_object_callback {obj} { ! ... } *************** *** 5548,5552 **** pack [frame $serf.1.1] -side bottom pack [button $serf.1.1.expander -image icon_plus -command "$self toggle_expand"] -side left ! pack [label $serf.1.1.label -text "$name: " -font $look(View:font)] -side left pack [entry $serf.entry -width 40 -font $look(View:font)] -side left -fill x -expand yes pack $serf -fill x -expand no --- 5557,5561 ---- pack [frame $serf.1.1] -side bottom pack [button $serf.1.1.expander -image icon_plus -command "$self toggle_expand"] -side left ! pack [label $serf.1.1.label -width 10 -text "$name: " -font $look(View:font)] -side left pack [entry $serf.entry -width 40 -font $look(View:font)] -side left -fill x -expand yes pack $serf -fill x -expand no *************** *** 7478,7479 **** --- 7487,7491 ---- #vwait foo } + + set t0 [expr [clock clicks -millis]-$t0] + puts "time to load: $t0 ms"

1 0

pd/src main.c, NONE, 1.1.2.1 desire.c, 1.1.2.217.2.18, 1.1.2.217.2.19
by Mathieu Bouchard 04 Dec '06

04 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13996 Modified Files: Tag: desiredata desire.c Added Files: Tag: desiredata main.c Log Message: libpd.so --- NEW FILE: main.c --- /* this file is separate because it is outside of libpd.so */ extern "C" int sys_main(int argc, char **argv); #if defined(_WIN32) && !defined(_CONSOLE) #include <windows.h> #include <stdio.h> int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { __try { sys_main(__argc,__argv); } __finally { printf("caught an exception; stopping\n"); } } #else /* not MSVC */ int main(int argc, char **argv) {return sys_main(argc, argv);} #endif Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.217.2.18 retrieving revision 1.1.2.217.2.19 diff -C2 -d -r1.1.2.217.2.18 -r1.1.2.217.2.19 *** desire.c 3 Dec 2006 16:45:49 -0000 1.1.2.217.2.18 --- desire.c 4 Dec 2006 20:59:49 -0000 1.1.2.217.2.19 *************** *** 8001,8020 **** }; - /* In MSW, this is all there is to pd; the rest sits in a "pdlib" dll so - that externs can link back to functions defined in pd. */ - - extern "C" int sys_main(int argc, char **argv); - #if defined(_WIN32) && !defined(_CONSOLE) - #include <windows.h> - #include <stdio.h> - int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { - __try { - sys_main(__argc,__argv); - } __finally { - printf("caught an exception; stopping\n"); - } - } - #else /* not MSVC */ - int main(int argc, char **argv) {return sys_main(argc, argv);} - #endif - --- 8001,8002 ----

1 0

pd/src makefile.in,1.4.4.2.2.21.2.6,1.4.4.2.2.21.2.7
by Mathieu Bouchard 04 Dec '06

04 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13947 Modified Files: Tag: desiredata makefile.in Log Message: libpd.so Index: makefile.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/makefile.in,v retrieving revision 1.4.4.2.2.21.2.6 retrieving revision 1.4.4.2.2.21.2.7 diff -C2 -d -r1.4.4.2.2.21.2.6 -r1.4.4.2.2.21.2.7 *** makefile.in 3 Dec 2006 02:09:01 -0000 1.4.4.2.2.21.2.6 --- makefile.in 4 Dec 2006 20:59:22 -0000 1.4.4.2.2.21.2.7 *************** *** 1,7 **** EXT= @EXT@ INSTALL_PREFIX = @prefix@ - MANDIR = @mandir@ MORECFLAGS = @MORECFLAGS@ LDFLAGS = @LDFLAGS@ OPT_CFLAGS = @OPT_CFLAGS@ ARCH_CFLAGS = -DPD --- 1,8 ---- EXT= @EXT@ + LIBSUFFIX = @LIBSUFFIX@ INSTALL_PREFIX = @prefix@ MORECFLAGS = @MORECFLAGS@ LDFLAGS = @LDFLAGS@ + LDSOFLAGS = @LDSOFLAGS@ OPT_CFLAGS = @OPT_CFLAGS@ ARCH_CFLAGS = -DPD *************** *** 30,33 **** --- 31,36 ---- OBJ = $(SRCXX:.c=.o) $(SRC:.c=.o) + SO = libpd$(LIBSUFFIX) + # ------------------ targets ------------------------------------ *************** *** 44,49 **** $(CC) $(CFLAGS) -Wno-parentheses -Wno-switch -Wno-unused-variable -Wstrict-prototypes -c -o $*.o $*.c ! pd: $(OBJ) config.log ! $(CXX) $(LDFLAGS) $(DBG_CFLAGS) -o pd $(OBJ) pd-watchdog: s_watchdog.c --- 47,55 ---- $(CC) $(CFLAGS) -Wno-parentheses -Wno-switch -Wno-unused-variable -Wstrict-prototypes -c -o $*.o $*.c ! $(SO): $(OBJ) config.log ! $(CXX) $(LDSOFLAGS) $(LDFLAGS) $(DBG_CFLAGS) -o $(SO) $(OBJ) ! ! pd: $(OBJ) config.log $(SO) main.c ! $(CXX) $(LDFLAGS) $(DBG_CFLAGS) $$PWD/$(SO) main.c -o pd pd-watchdog: s_watchdog.c *************** *** 51,58 **** pdsend: u_pdsend.c ! $(CC) $(CFLAGS) $(STRIPFLAG) -o pdsend u_pdsend.c pdreceive: u_pdreceive.c ! $(CC) $(CFLAGS) $(STRIPFLAG) -o pdreceive u_pdreceive.c externs: --- 57,64 ---- pdsend: u_pdsend.c ! $(CC) $(CFLAGS) $(STRIPFLAG) -o pdsend u_pdsend.c pdreceive: u_pdreceive.c ! $(CC) $(CFLAGS) $(STRIPFLAG) -o pdreceive u_pdreceive.c externs: *************** *** 60,93 **** cd $$ext; make @EXTERNTARGET@ || break; cd ..; done ! INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX) ! MANINSTDIR = $(DESTDIR)/$(INSTALL_PREFIX)/$(MANDIR) install: all install -d $(INSTDIR)/bin install -d $(INSTDIR)/lib/pd/bin - install pd-watchdog $(INSTDIR)/lib/pd/bin/pd-watchdog - install -m755 desire.tk $(INSTDIR)/bin/desire for file in defaults.ddrc pkgIndex.tcl pre8.5.tcl poe.tcl bgerror.tcl; do \ install $$file $(INSTDIR)/lib/pd/bin/$$file; done cp -r locale icons $(INSTDIR)/lib/pd/bin ! install $(BINARYMODE) pd $(INSTDIR)/bin/pd ! install -m755 pdsend $(INSTDIR)/bin/pdsend ! install -m755 pdreceive $(INSTDIR)/bin/pdreceive cp -pr ../doc ../extra $(INSTDIR)/lib/pd/ rm -f $(INSTDIR)/extra/*/*.o install -d $(INSTDIR)/include ! install -m644 m_pd.h $(INSTDIR)/include/m_pd.h install -m644 desire.h $(INSTDIR)/include/desire.h ! install -d $(MANINSTDIR)/man1 ! gzip < ../man/pd.1 > $(MANINSTDIR)/man1/pd.1.gz ! chmod 644 $(MANINSTDIR)/man1/pd.1.gz ! gzip < ../man/pdsend.1 > $(MANINSTDIR)/man1/pdsend.1.gz ! chmod 644 $(MANINSTDIR)/man1/pdsend.1.gz ! gzip < ../man/pdreceive.1 > $(MANINSTDIR)/man1/pdreceive.1.gz ! chmod 644 $(MANINSTDIR)/man1/pdreceive.1.gz local-clean: ! -rm -f *.o pd pdsend \ ! pdreceive pd-watchdog m_stamp.c -rm -f *~ -(cd ../doc/6.externs; rm -f *.pd_linux) --- 66,96 ---- cd $$ext; make @EXTERNTARGET@ || break; cd ..; done ! #INSTDIR = $(DESTDIR)/$(INSTALL_PREFIX) ! INSTDIR = $(INSTALL_PREFIX) install: all install -d $(INSTDIR)/bin install -d $(INSTDIR)/lib/pd/bin for file in defaults.ddrc pkgIndex.tcl pre8.5.tcl poe.tcl bgerror.tcl; do \ install $$file $(INSTDIR)/lib/pd/bin/$$file; done cp -r locale icons $(INSTDIR)/lib/pd/bin ! install $(BINARYMODE) $(SO) $(INSTDIR)/lib/$(SO) ! test -w /etc/ld.so.cache && ldconfig || true ! $(CXX) $(LDFLAGS) $(DBG_CFLAGS) -lpd main.c -o $(INSTDIR)/bin/pd ! install -m755 desire.tk $(INSTDIR)/bin/desire ! install -m755 pdsend $(INSTDIR)/bin/pdsend ! install -m755 pdreceive $(INSTDIR)/bin/pdreceive ! install -m755 pd-watchdog $(INSTDIR)/lib/pd/bin/pd-watchdog cp -pr ../doc ../extra $(INSTDIR)/lib/pd/ rm -f $(INSTDIR)/extra/*/*.o install -d $(INSTDIR)/include ! install -m644 m_pd.h $(INSTDIR)/include/m_pd.h install -m644 desire.h $(INSTDIR)/include/desire.h ! install -d $(INSTDIR)/man/man1 ! for page in pd.1 pdsend.1 pdreceive.1; do \ ! gzip < ../man/$$page > $(INSTDIR)/man/man1/$$page.gz; chmod 644 $(INSTDIR)/man/man1/$$page.gz; done local-clean: ! -rm -f *.o pd pdsend pdreceive pd-watchdog m_stamp.c -rm -f *~ -(cd ../doc/6.externs; rm -f *.pd_linux) *************** *** 127,128 **** --- 130,133 ---- include makefile.deps + + # echo $$LD_LIBRARY_PATH | sed 's/:/\n/g' | grep -q '^$(INSTDIR)$$'

1 0

pd/src configure.in, 1.5.4.5.2.16.2.1, 1.5.4.5.2.16.2.2 configure, 1.6.2.14, 1.6.2.14.2.1
by Mathieu Bouchard 04 Dec '06

04 Dec '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13785 Modified Files: Tag: desiredata configure.in configure Log Message: added LDSOFLAGS (for building libpd.so) Index: configure =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/configure,v retrieving revision 1.6.2.14 retrieving revision 1.6.2.14.2.1 diff -C2 -d -r1.6.2.14 -r1.6.2.14.2.1 *** configure 23 Nov 2006 19:10:14 -0000 1.6.2.14 --- configure 4 Dec 2006 20:57:08 -0000 1.6.2.14.2.1 *************** *** 310,314 **** #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS oss alsa jack portaudio portmidi MORECFLAGS EXT OPT_CFLAGS USE_DEBUG_CFLAGS AUDIOSRC MIDISRC STRIPFLAG EXTERNTARGET CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP ALLOCA LIBOBJS LTLIBOBJS' ac_subst_files='' --- 310,314 ---- #endif" ! ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS oss alsa jack portaudio portmidi MORECFLAGS EXT OPT_CFLAGS USE_DEBUG_CFLAGS AUDIOSRC MIDISRC STRIPFLAG EXTERNTARGET LIBSUFFIX LDSOFLAGS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA SET_MAKE CPP EGREP ALLOCA LIBOBJS LTLIBOBJS' ac_subst_files='' *************** *** 1316,1319 **** --- 1316,1321 ---- + + # Check whether --enable-alsa or --disable-alsa was given. if test "${enable_alsa+set}" = set; then *************** *** 4304,4309 **** --- 4306,4313 ---- LDFLAGS="-Wl,-export-dynamic " EXT=pd_linux + LIBSUFFIX=.so MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD -fno-strict-aliasing" STRIPFLAG=-s + LDSOFLAGS="-shared" fi *************** *** 4311,4316 **** --- 4315,4322 ---- LDFLAGS="-Wl" EXT=pd_darwin + LIBSUFFIX=.dylib MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO" STRIPFLAG="" + LDSOFLAGS="-flat_namespace -undefined suppress" EXTERNTARGET=pd_darwin fi *************** *** 5933,5936 **** --- 5939,5944 ---- s,@STRIPFLAG@,$STRIPFLAG,;t t s,@EXTERNTARGET@,$EXTERNTARGET,;t t + s,@LIBSUFFIX@,$LIBSUFFIX,;t t + s,@LDSOFLAGS@,$LDSOFLAGS,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t Index: configure.in =================================================================== RCS file: /cvsroot/pure-data/pd/src/configure.in,v retrieving revision 1.5.4.5.2.16.2.1 retrieving revision 1.5.4.5.2.16.2.2 diff -C2 -d -r1.5.4.5.2.16.2.1 -r1.5.4.5.2.16.2.2 *** configure.in 3 Dec 2006 16:52:48 -0000 1.5.4.5.2.16.2.1 --- configure.in 4 Dec 2006 20:57:08 -0000 1.5.4.5.2.16.2.2 *************** *** 21,24 **** --- 21,25 ---- AC_SUBST(EXTERNTARGET) AC_SUBST(LIBSUFFIX) + AC_SUBST(LDSOFLAGS) dnl Checks for features. *************** *** 64,67 **** --- 65,69 ---- MORECFLAGS="-DDL_OPEN -DPA_USE_OSS -DUNIX -DUNISTD -fno-strict-aliasing" STRIPFLAG=-s + LDSOFLAGS="-shared" fi *************** *** 72,75 **** --- 74,78 ---- MORECFLAGS="-DMACOSX -DUNISTD -I/usr/X11R6/include -DPA_USE_COREAUDIO" STRIPFLAG="" + LDSOFLAGS="-flat_namespace -undefined suppress" EXTERNTARGET=pd_darwin fi

1 0

← Newer
1
...
73
74
75
76
77
78
79
...
83
Older →

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 December 2006