Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9041
Modified Files: Tag: impd_0_37 s_inter.c Log Message: look for wish anywhere in PATH
Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.1.1.3.2.9.2.2 retrieving revision 1.1.1.3.2.9.2.3 diff -C2 -d -r1.1.1.3.2.9.2.2 -r1.1.1.3.2.9.2.3 *** s_inter.c 30 Mar 2004 01:46:27 -0000 1.1.1.3.2.9.2.2 --- s_inter.c 1 Apr 2004 23:42:44 -0000 1.1.1.3.2.9.2.3 *************** *** 634,638 **** { #ifdef MSW ! char scriptbuf[MAXPDSTRING+30], wishbuf[MAXPDSTRING+30], portbuf[80]; int spawnret;
--- 634,638 ---- { #ifdef MSW ! char scriptbuf[MAXPDSTRING+30], portbuf[80]; int spawnret;
*************** *** 764,793 **** #endif /* UNIX */
! #ifdef MSW ! /* in MSW land "guipath" is unused; we just do everything from ! the libdir. */ ! fprintf(stderr, "%s\n", sys_libdir->s_name); ! strcpy(scriptbuf, """); strcat(scriptbuf, sys_libdir->s_name); strcat(scriptbuf, "/" PDBINDIR "pd.tk""); sys_bashfilename(scriptbuf, scriptbuf); ! ! sprintf(portbuf, "%d", portno);
! 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) { ! perror("spawnl"); ! fprintf(stderr, "%s: couldn't load TCL\n", wishbuf); exit(1); } - - #endif /* MSW */ }
#ifdef __linux__ --- 764,783 ---- #endif /* UNIX */
! #ifdef MSW strcpy(scriptbuf, """); strcat(scriptbuf, sys_libdir->s_name); strcat(scriptbuf, "/" PDBINDIR "pd.tk""); sys_bashfilename(scriptbuf, scriptbuf); ! sprintf(portbuf, "%d", portno);
! spawnret = _spawnlp(P_NOWAIT, WISHAPP, WISHAPP, scriptbuf, portbuf, 0); if (spawnret < 0) { ! perror(WISHAPP); ! fprintf(stderr, "%s %s %s\n", WISHAPP, scriptbuf, portbuf); exit(1); } } + #endif /* MSW */
#ifdef __linux__