Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1:/tmp/cvs-serv31825
Modified Files: Tag: devel_0_37 s_inter.c s_midi_pm.c Log Message: make the tcl stuff a little more configurable (e.g. for 8.4 under Windows) fix some small compilation issue
Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.1.1.3.2.7 retrieving revision 1.1.1.3.2.8 diff -C2 -d -r1.1.1.3.2.7 -r1.1.1.3.2.8 *** s_inter.c 24 Nov 2003 16:27:49 -0000 1.1.1.3.2.7 --- s_inter.c 11 Dec 2003 13:32:52 -0000 1.1.1.3.2.8 *************** *** 48,51 **** --- 48,60 ---- #define DEBUG_MESSDOWN 2 /* messages down from pd-gui to pd */
+ /* T.Grill - make it a _little_ more adaptable... */ + #ifndef PDBINDIR + #define PDBINDIR "bin/" + #endif + + #ifndef WISHAPP + #define WISHAPP "wish83.exe" + #endif + extern char pd_version[];
*************** *** 738,742 **** strcpy(scriptbuf, """); strcat(scriptbuf, sys_libdir->s_name); ! strcat(scriptbuf, "/bin/pd.tk""); sys_bashfilename(scriptbuf, scriptbuf); --- 747,751 ---- strcpy(scriptbuf, """); strcat(scriptbuf, sys_libdir->s_name); ! strcat(scriptbuf, "/" PDBINDIR "pd.tk""); sys_bashfilename(scriptbuf, scriptbuf); *************** *** 744,751 ****
strcpy(wishbuf, sys_libdir->s_name); ! strcat(wishbuf, "/bin/wish83.exe"); sys_bashfilename(wishbuf, wishbuf); ! spawnret = _spawnl(P_NOWAIT, wishbuf, "wish83", scriptbuf, portbuf, 0); if (spawnret < 0) { --- 753,760 ----
strcpy(wishbuf, sys_libdir->s_name); ! strcat(wishbuf, "/" PDBINDIR WISHAPP); sys_bashfilename(wishbuf, wishbuf); ! spawnret = _spawnl(P_NOWAIT, wishbuf, WISHAPP, scriptbuf, portbuf, 0); if (spawnret < 0) {
Index: s_midi_pm.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_midi_pm.c,v retrieving revision 1.1.1.1.2.3 retrieving revision 1.1.1.1.2.4 diff -C2 -d -r1.1.1.1.2.3 -r1.1.1.1.2.4 *** s_midi_pm.c 18 Nov 2003 10:34:10 -0000 1.1.1.1.2.3 --- s_midi_pm.c 11 Dec 2003 13:32:52 -0000 1.1.1.1.2.4 *************** *** 133,137 **** }
! static int writemidi4(PortMidiStream* stream, int a, int b, int c, int d) { PmEvent buffer; --- 133,137 ---- }
! static void writemidi4(PortMidiStream* stream, int a, int b, int c, int d) { PmEvent buffer;