Commit 3a551743 authored by Jonathan Wilkes's avatar Jonathan Wilkes

Merge branch 'master' into fix-makefilename

parents 3d5a8454 731f1a77
......@@ -134,11 +134,9 @@ ifeq ($(LIGHT),yes)
lib_targets = loaders-libdir pddp
INCREMENTAL = yes
else
lib_targets = adaptive arraysize autotune bassemu boids bsaylor comport creb cxc cyclone disis earplug ekext ext13 fftease fluid freeverb ggee hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders-libdir lyonpotpourri mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp pdlua pdogg plugin pmpd rjlib sigpack smlib tof unauthorized vbap windowing zexy
lib_targets = adaptive arraysize autotune bassemu boids bsaylor comport creb cxc cyclone disis earplug ekext ext13 fftease flatgui fluid freeverb ggee hcs iem_ambi iem_bin_ambi iemlib iemgui iemguts iem_adaptfilt iemmatrix iemxmlrpc iem_delay iem_roomsim iem_spec2 iem_tab jasch_lib loaders-libdir lyonpotpourri mapping markex maxlib mjlib moocow moonlib motex mrpeach oscx pan pdcontainer pddp pdlua pdogg plugin pmpd rjlib sigpack smlib tof unauthorized vbap windowing zexy
endif
# DISABLED: flatgui
# NEW (IN-PROGRESS): flext
# this is for libraries that don't compile (yet) on all platforms
......@@ -538,16 +536,21 @@ fftease_clean:
#------------------------------------------------------------------------------#
# FLATGUI
#
# Right now we're just building footils/knob and throwing it in the flatgui
# external directory for compatibility
#
flatgui:
make -C $(externals_src)/flatgui CFLAGS="$(CFLAGS)" \
PD_PATH=$(pd_src) PD_INCLUDE=$(pd_src)/src
make -C $(externals_src)/footils/knob CFLAGS="$(CFLAGS)" \
PD_PATH=$(pd_src) pdbinpath=$(pd_src)/src \
PD_INCLUDE=$(pd_src)/src
flatgui_install:
make -C $(externals_src)/flatgui STRIP="$(STRIP)" \
make -C $(externals_src)/footils/knob STRIP="$(STRIP)" \
DESTDIR="$(DESTDIR)" objectsdir="$(objectsdir)" install
flatgui_clean:
make -C $(externals_src)/flatgui clean
make -C $(externals_src)/footils/knob clean
#------------------------------------------------------------------------------#
# FLEXT and FLEXT externals
......
This diff is collapsed.
This diff is collapsed.
NAME=knob
CSYM=knob
# !!!
# change these two
PD_DIR=../../../pd
#current: pd_nt pd_linux
current: pd_linux
# ----------------------- NT -----------------------
pd_nt: $(NAME).dll
.SUFFIXES: .dll
PDNTCFLAGS = /W3 /WX /O2 /G6 /DNT /DPD /nologo
# where is VC++ ???
VC="C:\Programme\Microsoft Visual Studio\VC98"
# where is your m_pd.h ???
PDNTINCLUDE = /I. /Ic:\pd\tcl\include /Ic:\pd\src /I$(VC)\include /Iinclude
PDNTLDIR = $(VC)\Lib
PDNTLIB = $(PDNTLDIR)\libc.lib \
$(PDNTLDIR)\oldnames.lib \
$(PDNTLDIR)\kernel32.lib \
$(PDNTLDIR)\user32.lib \
$(PDNTLDIR)\uuid.lib \
$(PDNTLDIR)\ws2_32.lib \
c:\pd\bin\pd.lib
.c.dll:
cl $(PDNTCFLAGS) $(PDNTINCLUDE) /c $*.c
link /dll /export:$(CSYM)_setup $*.obj $(PDNTLIB)
# ----------------------- IRIX 5.x -----------------------
pd_irix5: $(NAME).pd_irix5
.SUFFIXES: .pd_irix5
SGICFLAGS5 = -o32 -DPD -DUNIX -DIRIX -O2
SGIINCLUDE = -I../../src
.c.pd_irix5:
cc $(SGICFLAGS5) $(SGIINCLUDE) -o $*.o -c $*.c
ld -elf -shared -rdata_shared -o $*.pd_irix5 $*.o
rm $*.o
# ----------------------- IRIX 6.x -----------------------
pd_irix6: $(NAME).pd_irix6
.SUFFIXES: .pd_irix6
SGICFLAGS6 = -n32 -DPD -DUNIX -DIRIX -DN32 -woff 1080,1064,1185 \
-OPT:roundoff=3 -OPT:IEEE_arithmetic=3 -OPT:cray_ivdep=true \
-Ofast=ip32
.c.pd_irix6:
cc $(SGICFLAGS6) $(SGIINCLUDE) -o $*.o -c $*.c
ld -n32 -IPA -shared -rdata_shared -o $*.pd_irix6 $*.o
rm $*.o
# ----------------------- LINUX i386 -----------------------
pd_linux: $(NAME).pd_linux
.SUFFIXES: .pd_linux
LINUXCFLAGS = -DPD -DUNIX -O2 -funroll-loops -fomit-frame-pointer \
-Wall -W -Wshadow -Wstrict-prototypes -Werror \
-Wno-unused -Wno-parentheses -Wno-switch
# where is your m_pd.h ???
LINUXINCLUDE = -I../../src -I$(PD_DIR)/src
.c.pd_linux:
cc -O2 -Wall -DPD -fPIC $(LINUXINCLUDE) -c $*.c
ld --export-dynamic -shared -o $*.pd_linux $*.o -lc
strip $*.pd_linux
# ----------------------------------------------------------
install:
cp help-*.pd ../../doc/5.reference
clean:
rm -f *.o *.pd_* so_locations
# Makefile for mylib
lib.name = flatgui
class.sources = knob.c
# ldlibs = -lfluidsynth
datafiles = knob-help.pd clock.pd README
externalsdir = ../../
include Makefile.pdlibbuilder.revised
This diff is collapsed.
This diff is collapsed.
......@@ -744,7 +744,7 @@ static void *mknob_new(t_symbol *s, int argc, t_atom *argv)
x->x_thick = 0;
iemgui_verify_snd_ne_rcv(&x->x_gui);
outlet_new(&x->x_gui.x_obj, &s_float);
x->x_gui.x_obj.te_iemgui = 1;
x->x_gui.x_obj.te_iemgui = 1;
x->x_gui.x_handle = scalehandle_new((t_object *)x,
x->x_gui.x_glist, 1, mknob__clickhook, mknob__motionhook);
......
......@@ -108,7 +108,7 @@ ifneq ($(LIGHT),yes)
install -p $(bin_src)/libsystre-0.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/libtre-5.dll $(DESTDIR)$(bindir)/
# For fluid~
install -p $(bin_src)/libfluidsynth-1.dll $(DESTDIR)$(bindir)/
install -p $(bin_src)/libfluidsynth-2.dll $(DESTDIR)$(bindir)/
# For other external libs
install -p $(bin_src)/lua53.dll $(DESTDIR)$(bindir)/
#install -p $(bin_src)/pthreadGC2.dll $(DESTDIR)$(bindir)/
......
#N canvas 430 62 555 619 10;
#X obj 0 585 cnv 15 552 21 empty \$0-pddp.cnv.footer empty 20 12 0
14 -228856 -66577 0;
#X obj 0 0 cnv 15 552 40 empty \$0-pddp.cnv.header unpost 3 12 0 18
-204280 -1 0;
#X obj 0 279 cnv 3 550 3 empty \$0-pddp.cnv.inlets inlets 8 12 0 13
-228856 -1 0;
#N canvas 497 325 482 332 META 0;
#X text 12 145 LIBRARY internal;
#X text 12 185 WEBSITE http://crca.ucsd.edu/~msp/;
#X text 12 45 LICENSE SIBSD;
#X text 12 165 AUTHOR Miller Puckette;
#X text 12 225 HELP_PATCH_AUTHORS Jonathan Wilkes revised the patch
to conform to the PDDP template for Pd version 0.42.;
#X text 12 25 KEYWORDS control storage;
#X text 12 205 RELEASE_DATE 1997;
#X text 12 65 DESCRIPTION reroute console messages to an outlet;
#X text 12 85 INLET_0 anything;
#X text 12 125 OUTLET_1 anything;
#X text 12 105 OUTLET_0 symbol;
#X restore 500 587 pd META;
#X obj 0 336 cnv 3 550 3 empty \$0-pddp.cnv.outlets outlets 8 12 0
13 -228856 -1 0;
#X obj 0 503 cnv 3 550 3 empty \$0-pddp.cnv.argument arguments 8 12
0 13 -228856 -1 0;
#X obj 0 553 cnv 3 550 3 empty \$0-pddp.cnv.more_info more_info 8 12
0 13 -228856 -1 0;
#X obj 78 352 cnv 17 3 17 empty \$0-pddp.cnv.let.0 0 5 9 0 16 -228856
-162280 0;
#N canvas 215 545 428 131 Related_objects 0;
#X obj 1 1 cnv 15 425 20 empty \$0-pddp.cnv.subheading empty 3 12 0
14 -204280 -1 0;
#X text 7 1 [unpost] Related Objects;
#X obj 22 36 print;
#X restore 101 587 pd Related_objects;
#X obj 78 295 cnv 17 3 17 empty \$0-pddp.cnv.let.0 0 5 9 0 16 -228856
-162280 0;
#X obj 4 587 pddp/pddplink all_about_help_patches.pd -text Usage Guide
;
#X text 11 20 reroute console messages to an outlet;
#X obj 502 12 unpost;
#X msg 58 60 bad_method;
#X obj 58 112 unpost;
#X symbolatom 58 194 0 0 0 0 - - -;
#X text 98 351 symbol;
#X text 168 351 - outputs the console messages. The messages triggered
by the right outlet are split at newlines. Then each resulting line
is converted to a symbol and output in sequence. (This means a single
message to the inlet of [unpost] may trigger multiple messages to this
outlet.;
#X text 99 295 anything;
#X text 169 295 - then input is sent to the right outlet;
#X obj 78 432 cnv 17 3 17 empty \$0-pddp.cnv.let.1 1 5 9 0 16 -228856
-162280 0;
#X text 98 431 anything;
#X obj 91 163 print redirected;
#X msg 81 85 1;
#X obj 91 141 + 41;
#X msg 238 60 bad_method;
#X symbolatom 238 194 0 0 0 0 - - -;
#X obj 271 163 print redirected;
#X msg 261 85 1;
#X obj 271 141 + 41;
#X obj 238 112 unpost error;
#X text 319 112 <- only reroute errors;
#X text 168 431 - the message sent to the inlet is received to this
outlet. Any console messages which are triggered from the rest of object
chain connected below it will get forwarded to the left outlet. If
the "error" argument was given \, then only error messages will be
redirected to the left outlet.;
#X text 81 520 1) symbol;
#X text 171 520 - the symbol "error" will only redirect error messages.
All other console messages will get printed as usual.;
#X connect 13 0 14 0;
#X connect 14 0 15 0;
#X connect 14 1 24 0;
#X connect 23 0 14 0;
#X connect 24 0 22 0;
#X connect 25 0 30 0;
#X connect 28 0 30 0;
#X connect 29 0 27 0;
#X connect 30 0 26 0;
#X connect 30 1 29 0;
This diff is collapsed.
This diff is collapsed.
......@@ -513,7 +513,6 @@ void iemgui_displace_withtag(t_gobj *z, t_glist *glist, int dx, int dy)
canvas_fixlinesfor(glist_getcanvas(glist), (t_text *)z);
}
void iemgui_select(t_gobj *z, t_glist *glist, int selected)
{
t_iemgui *x = (t_iemgui *)z;
......
......@@ -14,6 +14,7 @@
#endif
t_printhook sys_printhook;
t_printhook sys_printhook_error;
int sys_printtostderr;
/* escape characters for tcl/tk */
......@@ -51,11 +52,13 @@ static void doerror(const void *object, const char *s)
char upbuf[MAXPDSTRING];
upbuf[MAXPDSTRING-1]=0;
// what about sys_printhook_error ?
if (sys_printhook)
if (sys_printhook || sys_printhook_error)
{
snprintf(upbuf, MAXPDSTRING-1, "error: %s", s);
(*sys_printhook)(upbuf);
if (sys_printhook_error)
(*sys_printhook_error)(upbuf);
if (sys_printhook)
(*sys_printhook)(upbuf);
}
else if (sys_printtostderr)
fprintf(stderr, "error: %s", s);
......
This diff is collapsed.
......@@ -34,10 +34,13 @@ is handy for some binbuf tests.;
#X text 536 150 <- we have to escape the arg;
#X text 556 190 escape it in a comment.;
#X text 556 170 in bash but we can't;
#X obj 521 374 spigot;
#X obj 537 440 route 1;
#X obj 537 495 print success;
#X obj 145 353 rtest makefilename_percent_parsing;
#X obj 391 374 spigot;
#X obj 407 440 route 1;
#X obj 407 495 print success;
#X obj 145 358 rtest unpost_sanity;
#X obj 145 414 rtest unpost_error;
#X obj 145 465 rtest unpost_print;
#X obj 145 516 rtest unpost_long_message;
#X connect 0 0 1 0;
#X connect 1 0 7 0;
#X connect 1 1 29 0;
......@@ -64,3 +67,6 @@ is handy for some binbuf tests.;
#X connect 29 0 7 0;
#X connect 30 0 31 0;
#X connect 30 1 2 0;
#X connect 32 0 33 0;
#X connect 33 0 34 0;
#X connect 34 0 35 0;
#N canvas 34 75 582 396 12;
#N canvas 37 104 582 396 12;
#X obj 36 25 inlet;
#X msg 152 97 click 0 0 0 0 0;
#X msg 152 122 \$1;
......
#N canvas 170 138 650 396 12;
#X obj 36 25 inlet;
#X obj 36 349 outlet;
#X msg 36 63 unknown_method;
#X obj 61 126 unpost error;
#X obj 36 226 list;
#X obj 36 251 route bang;
#X text 155 16 Unpost takes an argument "error" to set it to only redirect
error messages. Here we make sure it redirects an error message.;
#X obj 36 88 trigger bang anything bang;
#X obj 142 181 float;
#X text 189 181 <- trigger an error;
#X obj 36 276 f 0;
#X msg 103 276 1;
#X obj 36 309 list append unpost with "error" argument should redirect
an error message;
#X connect 0 0 2 0;
#X connect 2 0 7 0;
#X connect 3 0 4 1;
#X connect 3 1 8 0;
#X connect 4 0 5 0;
#X connect 5 0 10 0;
#X connect 5 1 11 0;
#X connect 7 0 4 0;
#X connect 7 1 3 0;
#X connect 7 2 4 1;
#X connect 10 0 12 0;
#X connect 11 0 12 0;
#X connect 12 0 1 0;
#N canvas 170 138 650 396 12;
#X obj 36 25 inlet;
#X obj 36 349 outlet;
#X msg 36 63 unknown_method;
#X text 155 16 Unpost takes an argument "error" to set it to only redirect
error messages. Here we make sure it doesn't allow non-error messages
through;
#X obj 61 126 unpost error;
#X obj 142 211 print -n;
#X obj 36 226 list;
#X obj 36 88 trigger bang bang bang;
#X obj 36 251 route bang;
#X obj 36 309 list append unpost with "error" argument should not redirect
non-error messages;
#X obj 36 276 f 1;
#X msg 103 276 0;
#X msg 142 186 unpost_error test message;
#X connect 0 0 2 0;
#X connect 2 0 7 0;
#X connect 4 0 6 1;
#X connect 4 1 12 0;
#X connect 6 0 8 0;
#X connect 7 0 6 0;
#X connect 7 1 4 0;
#X connect 7 2 6 1;
#X connect 8 0 10 0;
#X connect 8 1 11 0;
#X connect 9 0 1 0;
#X connect 10 0 9 0;
#X connect 11 0 9 0;
#X connect 12 0 5 0;
#N canvas 86 182 696 396 12;
#X obj 36 25 inlet;
#X obj 36 349 outlet;
#X obj 36 266 f 1;
#X text 155 16 Unpost should be able to handle long messages. Here
we trigger one by sending a list of all the class names to the left
inlet of unpost.;
#X msg 36 63 classlist;
#X obj 36 88 unpost;
#X obj 75 116 pdinfo;
#X obj 75 148 print long_message;
#X obj 36 113 b;
#X obj 36 299 list append unpost should print long messages without
crashing;
#X connect 0 0 4 0;
#X connect 2 0 9 0;
#X connect 4 0 5 0;
#X connect 5 0 8 0;
#X connect 5 1 6 0;
#X connect 6 0 7 0;
#X connect 8 0 2 0;
#X connect 9 0 1 0;
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment