Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3022
Modified Files: Tag: devel_0_38 SConscript d_array.c d_fft.c d_osc.c g_canvas.c g_editor.c g_text.c s_audio_jack.c s_file.c s_inter.c s_loader.c s_stuff.h t_main.c t_tkcmd.c x_arithmetic.c x_misc.c Log Message: scons __apple__
Index: x_arithmetic.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/x_arithmetic.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** x_arithmetic.c 6 Sep 2004 20:20:36 -0000 1.2 --- x_arithmetic.c 2 Jul 2005 15:12:12 -0000 1.2.4.1 *************** *** 12,16 ****
/* MSW and OSX don't appear to have single-precision ANSI math */ ! #if defined(MSW) || defined(MACOSX) #define sinf sin #define cosf cos --- 12,16 ----
/* MSW and OSX don't appear to have single-precision ANSI math */ ! #if defined(MSW) || defined(__APPLE__) #define sinf sin #define cosf cos
Index: s_loader.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_loader.c,v retrieving revision 1.4.4.5 retrieving revision 1.4.4.6 diff -C2 -d -r1.4.4.5 -r1.4.4.6 *** s_loader.c 3 Mar 2005 13:39:46 -0000 1.4.4.5 --- s_loader.c 2 Jul 2005 15:12:12 -0000 1.4.4.6 *************** *** 14,18 **** #include <windows.h> #endif ! #ifdef MACOSX #include <mach-o/dyld.h> #endif --- 14,18 ---- #include <windows.h> #endif ! #ifdef __APPLE__ #include <mach-o/dyld.h> #endif *************** *** 38,42 **** ".pd_linux"; #endif ! #ifdef MACOSX ".pd_darwin"; #endif --- 38,42 ---- ".pd_linux"; #endif ! #ifdef __APPLE__ ".pd_darwin"; #endif *************** *** 94,98 **** *lastdot = 0;
! #ifdef MACOSX strcpy(symname, "_"); strcat(symname, nameptr); --- 94,98 ---- *lastdot = 0;
! #ifdef __APPLE__ strcpy(symname, "_"); strcat(symname, nameptr); *************** *** 123,127 **** makeout = (t_xxx)GetProcAddress(ntdll, symname); #endif ! #ifdef MACOSX { NSObjectFileImage image; --- 123,127 ---- makeout = (t_xxx)GetProcAddress(ntdll, symname); #endif ! #ifdef __APPLE__ { NSObjectFileImage image;
Index: g_text.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_text.c,v retrieving revision 1.5.4.2 retrieving revision 1.5.4.3 diff -C2 -d -r1.5.4.2 -r1.5.4.3 *** g_text.c 14 Jan 2005 18:34:13 -0000 1.5.4.2 --- g_text.c 2 Jul 2005 15:12:11 -0000 1.5.4.3 *************** *** 1101,1105 **** /* -------------------- the "text" class ------------ */
! #ifdef MACOSX #define EXTRAPIX 2 #else --- 1101,1105 ---- /* -------------------- the "text" class ------------ */
! #ifdef __APPLE__ #define EXTRAPIX 2 #else
Index: t_tkcmd.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/t_tkcmd.c,v retrieving revision 1.2.4.1 retrieving revision 1.2.4.2 diff -C2 -d -r1.2.4.1 -r1.2.4.2 *** t_tkcmd.c 5 Nov 2004 14:27:47 -0000 1.2.4.1 --- t_tkcmd.c 2 Jul 2005 15:12:12 -0000 1.2.4.2 *************** *** 41,45 **** #endif
! #ifdef MACOSX #define STARTGUI #endif --- 41,45 ---- #endif
! #ifdef __APPLE__ #define STARTGUI #endif *************** *** 529,533 **** is done by passing the name of the file as a startup argument to the wish shell.) */ ! #if !defined(MSW) && !defined(MACOSX) void pdgui_doevalfile(Tcl_Interp *interp, char *s) { --- 529,533 ---- is done by passing the name of the file as a startup argument to the wish shell.) */ ! #if !defined(MSW) && !defined(__APPLE__) void pdgui_doevalfile(Tcl_Interp *interp, char *s) { *************** *** 567,571 **** pdgui_setupsocket(); /* read in the startup file */ ! #if !defined(MSW) && !defined(MACOSX) pdgui_evalfile("pd.tk"); #endif --- 567,571 ---- pdgui_setupsocket(); /* read in the startup file */ ! #if !defined(MSW) && !defined(__APPLE__) pdgui_evalfile("pd.tk"); #endif
Index: s_file.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_file.c,v retrieving revision 1.2.4.9 retrieving revision 1.2.4.10 diff -C2 -d -r1.2.4.9 -r1.2.4.10 *** s_file.c 16 Jun 2005 12:46:05 -0000 1.2.4.9 --- s_file.c 2 Jul 2005 15:12:12 -0000 1.2.4.10 *************** *** 206,210 **** #endif /* MSW */
! #ifdef MACOSX
static void sys_initloadpreferences( void) --- 206,210 ---- #endif /* MSW */
! #ifdef __APPLE__
static void sys_initloadpreferences( void) *************** *** 256,260 **** }
! #endif /* MACOSX */
void sys_loadpreferences( void) --- 256,260 ---- }
! #endif /* __APPLE__ */
void sys_loadpreferences( void)
Index: s_stuff.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_stuff.h,v retrieving revision 1.5.4.11 retrieving revision 1.5.4.12 diff -C2 -d -r1.5.4.11 -r1.5.4.12 *** s_stuff.h 16 Jun 2005 12:57:12 -0000 1.5.4.11 --- s_stuff.h 2 Jul 2005 15:12:12 -0000 1.5.4.12 *************** *** 186,190 **** #define API_DEFSTRING "MMIO" #endif ! #ifdef MACOSX #define API_DEFAULT API_PORTAUDIO #define API_DEFSTRING "portaudio" --- 186,190 ---- #define API_DEFSTRING "MMIO" #endif ! #ifdef __APPLE__ #define API_DEFAULT API_PORTAUDIO #define API_DEFSTRING "portaudio"
Index: s_inter.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_inter.c,v retrieving revision 1.5.4.13 retrieving revision 1.5.4.14 diff -C2 -d -r1.5.4.13 -r1.5.4.14 *** s_inter.c 21 Jun 2005 14:56:35 -0000 1.5.4.13 --- s_inter.c 2 Jul 2005 15:12:12 -0000 1.5.4.14 *************** *** 42,46 **** #include <stdio.h>
! #ifdef MACOSX #include <sys/types.h> #include <sys/stat.h> --- 42,46 ---- #include <stdio.h>
! #ifdef __APPLE__ #include <sys/types.h> #include <sys/stat.h> *************** *** 1054,1058 **** { seteuid(getuid()); /* lose setuid priveliges */ ! #ifndef MACOSX /* the wish process in Unix will make a wish shell and read/write standard in and out unless we close the --- 1054,1058 ---- { seteuid(getuid()); /* lose setuid priveliges */ ! #ifndef __APPLE__ /* the wish process in Unix will make a wish shell and read/write standard in and out unless we close the *************** *** 1073,1077 **** if (!sys_guicmd) { ! #ifdef MACOSX char *homedir = getenv("HOME"), filename[250]; struct stat statbuf; --- 1073,1077 ---- if (!sys_guicmd) { ! #ifdef __APPLE__ char *homedir = getenv("HOME"), filename[250]; struct stat statbuf; *************** *** 1227,1231 **** fprintf(stderr, "pd: couldn't set high priority class\n"); #endif ! #ifdef MACOSX if (sys_hipriority) { --- 1227,1231 ---- fprintf(stderr, "pd: couldn't set high priority class\n"); #endif ! #ifdef __APPLE__ if (sys_hipriority) { *************** *** 1239,1243 **** post("warning: high priority scheduling failed\n"); } ! #endif /* MACOSX */
if (!sys_nogui && !sys_guisetportnumber) --- 1239,1243 ---- post("warning: high priority scheduling failed\n"); } ! #endif /* __APPLE__ */
if (!sys_nogui && !sys_guisetportnumber)
Index: d_array.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_array.c,v retrieving revision 1.3.4.3 retrieving revision 1.3.4.4 diff -C2 -d -r1.3.4.3 -r1.3.4.4 *** d_array.c 11 Jan 2005 21:41:14 -0000 1.3.4.3 --- d_array.c 2 Jul 2005 15:12:11 -0000 1.3.4.4 *************** *** 571,580 ****
#else ! #ifdef MACOSX #define HIOFFSET 0 /* word offset to find MSB */ #define LOWOFFSET 1 /* word offset to find LSB */ #define int32 int /* a data type that has 32 bits */
! #endif /* MACOSX */ #endif /* __linux__ */ #endif /* MSW */ --- 571,580 ----
#else ! #ifdef __APPLE__ #define HIOFFSET 0 /* word offset to find MSB */ #define LOWOFFSET 1 /* word offset to find LSB */ #define int32 int /* a data type that has 32 bits */
! #endif /* __APPLE__ */ #endif /* __linux__ */ #endif /* MSW */
Index: d_fft.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_fft.c,v retrieving revision 1.2.4.3 retrieving revision 1.2.4.4 diff -C2 -d -r1.2.4.3 -r1.2.4.4 *** d_fft.c 29 Jun 2005 16:32:39 -0000 1.2.4.3 --- d_fft.c 2 Jul 2005 15:12:11 -0000 1.2.4.4 *************** *** 381,386 **** while (n!=0) { ! --n; ! s[n]=-s[n]; } } --- 381,386 ---- while (n!=0) { ! --n; ! s[n]=-s[n]; } }
Index: t_main.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/t_main.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** t_main.c 6 Sep 2004 20:20:36 -0000 1.2 --- t_main.c 2 Jul 2005 15:12:12 -0000 1.2.4.1 *************** *** 15,19 ****
! #ifndef MACOSX /* linux and IRIX only; in MACOSX we don't link this in */ #include "tk.h" #include <stdlib.h> --- 15,19 ----
! #ifndef __APPLE__ /* linux and IRIX only; in MACOSX we don't link this in */ #include "tk.h" #include <stdlib.h> *************** *** 113,115 **** }
! #endif /* MACOSX */ --- 113,115 ---- }
! #endif /* __APPLE__ */
Index: s_audio_jack.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/s_audio_jack.c,v retrieving revision 1.5.4.9 retrieving revision 1.5.4.10 diff -C2 -d -r1.5.4.9 -r1.5.4.10 *** s_audio_jack.c 16 Jun 2005 12:44:55 -0000 1.5.4.9 --- s_audio_jack.c 2 Jul 2005 15:12:11 -0000 1.5.4.10 *************** *** 178,182 **** static int jack_graph_order_callback(void* arg) { - post("graph order"); sys_callback(jack_save_connection_state, NULL, 0); return 0; --- 178,181 ---- *************** *** 552,563 ****
/* tb: save the current state of pd's jack connections */ - /* static t_int jack_shutdown_handler(t_int* none) */ t_int jack_save_connection_state(t_int* dummy) { int i; - return 0; for (i = 0; i != NUM_JACK_PORTS; ++i) { - post("%d", i); /* saving the inputs connections */ if (jack_in_connections[i]) --- 551,559 ----
Index: d_osc.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/d_osc.c,v retrieving revision 1.2.4.1 retrieving revision 1.2.4.2 diff -C2 -d -r1.2.4.1 -r1.2.4.2 *** d_osc.c 5 Nov 2004 13:55:58 -0000 1.2.4.1 --- d_osc.c 2 Jul 2005 15:12:11 -0000 1.2.4.2 *************** *** 57,66 ****
#else ! #ifdef MACOSX #define HIOFFSET 0 /* word offset to find MSB */ #define LOWOFFSET 1 /* word offset to find LSB */ #define int32 int /* a data type that has 32 bits */
! #endif /* MACOSX */ #endif /* __linux__ */ #endif /* MSW */ --- 57,66 ----
#else ! #ifdef __APPLE__ #define HIOFFSET 0 /* word offset to find MSB */ #define LOWOFFSET 1 /* word offset to find LSB */ #define int32 int /* a data type that has 32 bits */
! #endif /* __APPLE__ */ #endif /* __linux__ */ #endif /* MSW */
Index: g_canvas.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_canvas.c,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.2 diff -C2 -d -r1.4.4.1 -r1.4.4.2 *** g_canvas.c 5 Nov 2004 14:27:45 -0000 1.4.4.1 --- g_canvas.c 2 Jul 2005 15:12:11 -0000 1.4.4.2 *************** *** 39,43 **** #define GLIST_DEFCANVASHEIGHT 300
! #ifdef MACOSX #define GLIST_DEFCANVASYLOC 22 #else --- 39,43 ---- #define GLIST_DEFCANVASHEIGHT 300
! #ifdef __APPLE__ #define GLIST_DEFCANVASYLOC 22 #else
Index: g_editor.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/g_editor.c,v retrieving revision 1.4.4.2 retrieving revision 1.4.4.3 diff -C2 -d -r1.4.4.2 -r1.4.4.3 *** g_editor.c 11 Nov 2004 22:30:41 -0000 1.4.4.2 --- g_editor.c 2 Jul 2005 15:12:11 -0000 1.4.4.3 *************** *** 972,976 **** /* on one-button-mouse machines, you can use double click to mean right click (which gets the popup menu.) Do this for Mac. */ ! #ifdef MACOSX #define SIMULATERIGHTCLICK #endif --- 972,976 ---- /* on one-button-mouse machines, you can use double click to mean right click (which gets the popup menu.) Do this for Mac. */ ! #ifdef __APPLE__ #define SIMULATERIGHTCLICK #endif *************** *** 1454,1458 **** keynamesym = gensym("#keyname"); } ! #ifdef MACOSX if (keynum == 30) keynum = 0, gotkeysym = gensym("Up"); --- 1454,1458 ---- keynamesym = gensym("#keyname"); } ! #ifdef __APPLE__ if (keynum == 30) keynum = 0, gotkeysym = gensym("Up");
Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** SConscript 28 Jun 2005 13:30:58 -0000 1.1.2.5 --- SConscript 2 Jul 2005 15:12:11 -0000 1.1.2.6 *************** *** 3,7 **** pdenv = env.Copy()
- ###################################################################### # --- 3,6 ---- *************** *** 104,107 **** --- 103,108 ---- # configure the build # + + conf = pdenv.Configure()
*************** *** 110,116 **** Exit(1)
if not conf.CheckLib('tcl'): ! for i in range (2,10): ! if conf.CheckLib('tcl-8.%d' % i): break else: --- 111,118 ---- Exit(1)
+ if not conf.CheckLib('tcl'): ! for i in range (0,10): ! if conf.CheckLib('tcl8.%d' % i): break else: *************** *** 119,132 ****
if not conf.CheckLib('tk'): ! for i in range (2,10): ! if conf.CheckLib('tk-8.%d' % i): break else: print "can't find tk" ! Exit(1)
if not conf.CheckHeader('tcl.h'): ! for i in range (2,10): ! if conf.CheckLib('tcl-8.%d/tcl' % i): break else: --- 121,134 ----
if not conf.CheckLib('tk'): ! for i in range (0,10): ! if conf.CheckLib('tk8.%d' % i): break else: print "can't find tk" !
if not conf.CheckHeader('tcl.h'): ! for i in range (0,10): ! if conf.CheckHeader('tcl8.%d/tcl.h' % i): break else: *************** *** 135,144 ****
if not conf.CheckHeader('tk.h'): ! for i in range (2,10): ! if conf.CheckLib('tk-8.%d/tk' % i): break else: print "can't find tk header" ! Exit(1)
--- 137,146 ----
if not conf.CheckHeader('tk.h'): ! for i in range (8,10): ! if conf.CheckHeader('tk8.%d/tk.h' % i): break else: print "can't find tk header" !
*************** *** 154,158 **** # system specific configuration
! if env['PLATFORM'] == 'posix': if conf.CheckLib('dl', 'dlopen'): defs.append('DL_OPEN') --- 156,160 ---- # system specific configuration
! if pdenv['PLATFORM'] == 'posix': if conf.CheckLib('dl', 'dlopen'): defs.append('DL_OPEN') *************** *** 165,179 ****
! portaudio = conf.CheckLib('portaudio','Pa_Initialize')
if not portaudio: print "libportaudio not found"
- if env['PLATFORM'] == 'win32': - pass
! if env['PLATFORM'] == 'osx': pass
env=conf.Finish()
--- 167,195 ----
! portaudio = conf.CheckLib('portaudio','Pa_Initialize') ## on linux portaudio is a shared library
if not portaudio: print "libportaudio not found"
! ! if pdenv['PLATFORM'] == 'win32': ! portaudio = True pass
+ if pdenv['PLATFORM'] == 'darwin': + portaudio = True + + pdenv.Append(CPPPATH=Split("""/Library/Frameworks/Tk.framework/Headers/ + /Library/Frameworks/Tcl.framework/Headers/""")) + # conf.CheckHeader('/Library/Frameworks/Tk.framework/Headers/tk.h') + + + + + ###################################################################### + # + # cleaning up + env=conf.Finish()
*************** *** 206,218 **** pm_sources = Split("s_midi_pm.c")
simd_sse_vc_sources = Split("m_simd_sse_vc.c") simd_sse_gcc_sources = Split("m_simd_sse_gcc.c") simd_ve_gcc_sources = Split("m_simd_ve_gcc.c")
- if portaudio: - sources.append(pa_sources) - pdenv.Append(CPPDEFINES=Split("USEAPI_PORTAUDIO PA19")) - pdenv.Append(CPPPATH=Split("../portaudio ../portaudio/pa_common ../portaudio/pablio")) - pdenv.Append(CPPPATH=".") pdenv.Append(LIBPATH=".") --- 222,230 ---- pm_sources = Split("s_midi_pm.c")
+ simd_sse_vc_sources = Split("m_simd_sse_vc.c") simd_sse_gcc_sources = Split("m_simd_sse_gcc.c") simd_ve_gcc_sources = Split("m_simd_ve_gcc.c")
pdenv.Append(CPPPATH=".") pdenv.Append(LIBPATH=".") *************** *** 240,275 **** # # linux configuration
! jack_sources = Split("s_audio_jack.c") ! alsa_sources = Split("""s_audio_alsamm.c s_audio_alsa.c""") ! oss_sources = Split("s_audio_oss.c") ! ! linux_defs = Split("UNISTD UNIX USEAPI_OSS") ! linux_defs.append('INSTALL_PREFIX=\"%s\"' % pdenv['prefix']) ! ! linux_libs = []
! if alsa: ! midi_sources = Split("s_midi_alsa.c") ! else: ! midi_sources = Split("s_midi_oss.c")
! linux_sources = oss_sources + midi_sources
! if not pdenv['nosimd']: ! linux_sources.append(simd_sse_gcc_sources)
! if alsa: ! linux_sources.append(alsa_sources) ! linux_defs.append("USEAPI_ALSA") ! linux_libs.append('asound') ! if jack: ! linux_sources.append(jack_sources) ! linux_defs.append("USEAPI_JACK") ! linux_libs.append('jack')
- if pdenv['PLATFORM'] == 'posix': sources.append(linux_sources) pdenv.Append(CPPDEFINES=linux_defs) --- 252,287 ---- # # linux configuration + if pdenv['PLATFORM'] == 'posix':
! jack_sources = Split("s_audio_jack.c") ! alsa_sources = Split("""s_audio_alsamm.c s_audio_alsa.c""") ! oss_sources = Split("s_audio_oss.c")
! linux_defs = Split("UNISTD UNIX USEAPI_OSS") ! linux_defs.append('INSTALL_PREFIX=\"%s\"' % pdenv['prefix'])
! linux_libs = []
! if alsa: ! midi_sources = Split("s_midi_alsa.c") ! else: ! midi_sources = Split("s_midi_oss.c") ! ! linux_sources = oss_sources + midi_sources ! ! if not pdenv['nosimd']: ! linux_sources.append(simd_sse_gcc_sources)
! if alsa: ! linux_sources.append(alsa_sources) ! linux_defs.append("USEAPI_ALSA") ! linux_libs.append('asound') ! if jack: ! linux_sources.append(jack_sources) ! linux_defs.append("USEAPI_JACK") ! linux_libs.append('jack')
sources.append(linux_sources) pdenv.Append(CPPDEFINES=linux_defs) *************** *** 280,290 **** # osx configuration
! osx_sources = pa_sources + pm_sources + simd_ve_gcc_sources ! osx_defs = Split("UNIX MACOSX")
- if pdenv['PLATFORM'] == 'osx': sources.append(osx_sources) pdenv.Append(CPPDEFINES=osx_defs)
###################################################################### # --- 292,319 ---- # osx configuration
! if pdenv['PLATFORM'] == 'darwin': ! pm_osx_sources = Split("""../portmidi_osx/pmdarwin.c ! ../portmidi_osx/pmmacosx.c ! ../portmidi_osx/pmutil.c ! ../portmidi_osx/portmidi.c ! ../portmidi_osx/ptdarwin.c""") ! ! pa_osx_sources = (Split("""../portaudio/pa_common/pa_lib.c ! ../portaudio/pa_common/pa_trace.c ! ../portaudio/pa_common/pa_convert.c ! ../portaudio/pa_mac_core/pa_mac_core.c""")) ! ! ! osx_sources = pa_osx_sources + pm_sources + pm_osx_sources + simd_ve_gcc_sources ! ! osx_defs = Split("MACOSX UNISTD PA_BIG_ENDIAN")
sources.append(osx_sources) pdenv.Append(CPPDEFINES=osx_defs)
+ pdenv.Append(LINKFLAGS=" -framework CoreAudio -framework AudioUnit " + +" -framework AudioToolbox -framework Carbon -framework CoreMIDI") + + ###################################################################### # *************** *** 299,302 **** --- 328,342 ---- ###################################################################### # + # portaudio stuff + + if portaudio: + sources.append(pa_sources) + pdenv.Append(CPPDEFINES=Split("USEAPI_PORTAUDIO PA19")) + pdenv.Append(CPPPATH=Split("../portaudio ../portaudio/pa_common ../portaudio/pablio")) + + + + ###################################################################### + # # compiler options flags = '' *************** *** 324,328 **** if not pdenv['nosimd']: ! flags += " -mfpmath=sse -mmmx -msse -msse2"
pdenv.Append(CCFLAGS=flags) --- 364,369 ---- if not pdenv['nosimd']: ! if pdenv['PLATFORM'] != 'darwin': ! flags += " -mfpmath=sse -mmmx -msse -msse2"
pdenv.Append(CCFLAGS=flags) *************** *** 330,333 **** --- 371,376 ---- pdenv.Append(LINKFLAGS=flags)
+ + ###################################################################### ###################################################################### # *************** *** 337,346 **** pdsend = pdenv.Program('pdsend', "u_pdsend.c") pdreceive = pdenv.Program('pdreceive', "u_pdreceive.c") - pdgui = pdenv.Program('pd-gui', Split("t_main.c t_tkcmd.c"))
if pdenv['pdlib']: - # pdenv.Append(LIBPATH="#") pdlib = pdenv.SharedLibrary('pd', sources) pd = pdenv.Program('pd', 's_entry.c', LIBS=['pd']) Default(pdwatchdog, pdsend, pdreceive, pdgui, pd, pdlib) --- 380,404 ---- pdsend = pdenv.Program('pdsend', "u_pdsend.c") pdreceive = pdenv.Program('pdreceive', "u_pdreceive.c")
+ ###################################################################### + # build pd's gui + if pdenv['PLATFORM']=='posix': + pdgui = pdenv.Program('pd-gui', Split("t_main.c t_tkcmd.c")) + + if pdenv['PLATFORM']=='darwin': + pdgui = pdenv.SharedLibrary('pdtcl', Split("t_main.c t_tkcmd.c"), + LINKFLAGS='-framework Tcl -framework Tk') + if pdenv['PLATFORM']=='win32': + pdgui = pdenv.SharedLibrary('pdtcl', Split("t_main.c t_tkcmd.c"), + LIBS=Split('tcl tk')) + + + ###################################################################### + # build pd's kernel + if pdenv['pdlib']: pdlib = pdenv.SharedLibrary('pd', sources) + pdenv.Append(LIBPATH=['.']) pd = pdenv.Program('pd', 's_entry.c', LIBS=['pd']) Default(pdwatchdog, pdsend, pdreceive, pdgui, pd, pdlib)
Index: x_misc.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/x_misc.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** x_misc.c 6 Sep 2004 20:20:36 -0000 1.2 --- x_misc.c 2 Jul 2005 15:12:12 -0000 1.2.4.1 *************** *** 22,26 **** #endif
! #if defined (MACOSX) || defined (__FreeBSD__) #define HZ CLK_TCK #endif --- 22,26 ---- #endif
! #if defined (__APPLE__) || defined (__FreeBSD__) #define HZ CLK_TCK #endif