[PD-cvs] pd/src SConscript, 1.1.4.49, 1.1.4.50 desire.c, 1.1.2.93, 1.1.2.94 s_main.c, 1.7.4.17.2.16, 1.7.4.17.2.17
Thomas Grill
xovo at users.sourceforge.net
Tue Aug 1 15:25:28 CEST 2006
Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30717/src
Modified Files:
Tag: devel_0_39
SConscript desire.c s_main.c
Log Message:
fixes for MSVC
Index: SConscript
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v
retrieving revision 1.1.4.49
retrieving revision 1.1.4.50
diff -C2 -d -r1.1.4.49 -r1.1.4.50
*** SConscript 30 Jul 2006 20:58:14 -0000 1.1.4.49
--- SConscript 1 Aug 2006 13:25:26 -0000 1.1.4.50
***************
*** 153,175 ****
if pdenv['PLATFORM'] == 'darwin':
! portaudio = True
!
! if conf.CheckLib('dl', 'dlopen'):
! defs.append('DL_OPEN')
! else:
! print "libdl not found. dynamic loading of externals disabled"
!
! if conf.CheckLib('jack','jack_activate'):
! jack = True
! else:
! print "jack not found, so it's not enabled"
! ## hardcoding the search paths ... ugly, but works
! if not pdenv['app_pkg']:
! pdenv.Append(CPPPATH=Split("""/Library/Frameworks/Tk.framework/Headers/
! /Library/Frameworks/Tcl.framework/Headers/"""))
! else:
! pdenv.Append(CPPPATH=Split("""@executable_path/../Frameworks/Tk.framework/Headers/
! @executable_path/../Frameworks/Tcl.framework/Headers/"""))
--- 153,175 ----
if pdenv['PLATFORM'] == 'darwin':
! portaudio = True
!
! if conf.CheckLib('dl', 'dlopen'):
! defs.append('DL_OPEN')
! else:
! print "libdl not found. dynamic loading of externals disabled"
!
! if conf.CheckLib('jack','jack_activate'):
! jack = True
! else:
! print "jack not found, so it's not enabled"
! ## hardcoding the search paths ... ugly, but works
! if not pdenv['app_pkg']:
! pdenv.Append(CPPPATH=Split("""/Library/Frameworks/Tk.framework/Headers/
! /Library/Frameworks/Tcl.framework/Headers/"""))
! else:
! pdenv.Append(CPPPATH=Split("""@executable_path/../Frameworks/Tk.framework/Headers/
! @executable_path/../Frameworks/Tcl.framework/Headers/"""))
***************
*** 185,189 ****
if not conf.CheckLib('m','sin'):
print "can't find Math library"
! Exit(1)
if pdenv['PLATFORM'] != 'darwin':
--- 185,189 ----
if not conf.CheckLib('m','sin'):
print "can't find Math library"
! # Exit(1)
if pdenv['PLATFORM'] != 'darwin':
***************
*** 230,238 ****
if not conf.CheckLib(pthreadLib, 'pthread_create'):
print "can't find pthread library (%s)" % pthreadLib
! Exit(1)
if not conf.CheckHeader('pthread.h'):
print "can't find pthread.h"
! Exit(1)
if conf.CheckLib('fftw3f'):
--- 230,238 ----
if not conf.CheckLib(pthreadLib, 'pthread_create'):
print "can't find pthread library (%s)" % pthreadLib
! # Exit(1)
if not conf.CheckHeader('pthread.h'):
print "can't find pthread.h"
! # Exit(1)
if conf.CheckLib('fftw3f'):
***************
*** 342,346 ****
sources += pa_sources+pa_common_sources
sources += map(lambda x: papath+x,
! Split("""
/pa_asio/pa_asio.cpp
/pa_win/pa_win_hostapis.c
--- 342,346 ----
sources += pa_sources+pa_common_sources
sources += map(lambda x: papath+x,
! Split("""
/pa_asio/pa_asio.cpp
/pa_win/pa_win_hostapis.c
***************
*** 433,457 ****
pm_osx_sources = map(lambda x: pmpath + x,
Split("""
! /pm_mac/pmmac.c
! /pm_mac/pmmacosxcm.c
! /pm_common/pmutil.c
! /pm_common/portmidi.c
! /porttime/porttime.c
! /porttime/ptmacosx_cf.c
""")
)
pa_osx_sources = map(lambda x: papath + x,
! Split("""
! /pa_mac_core/pa_mac_core.c
! /pa_mac/pa_mac_hostapis.c
! /pa_unix/pa_unix_util.c
! """)
! )
osx_sources = pa_sources + pa_common_sources + pa_osx_sources + pm_sources + pm_osx_sources + simd_ve_gcc_sources
osx_defs = Split("UNISTD PA_USE_COREAUDIO MACOSX")
!
! # if pdenv['portaudio']:
! # osx_sources += pa_sources
if jack:
--- 433,457 ----
pm_osx_sources = map(lambda x: pmpath + x,
Split("""
! /pm_mac/pmmac.c
! /pm_mac/pmmacosxcm.c
! /pm_common/pmutil.c
! /pm_common/portmidi.c
! /porttime/porttime.c
! /porttime/ptmacosx_cf.c
""")
)
pa_osx_sources = map(lambda x: papath + x,
! Split("""
! /pa_mac_core/pa_mac_core.c
! /pa_mac/pa_mac_hostapis.c
! /pa_unix/pa_unix_util.c
! """)
! )
osx_sources = pa_sources + pa_common_sources + pa_osx_sources + pm_sources + pm_osx_sources + simd_ve_gcc_sources
osx_defs = Split("UNISTD PA_USE_COREAUDIO MACOSX")
!
! # if pdenv['portaudio']:
! # osx_sources += pa_sources
if jack:
***************
*** 466,471 ****
pdenv.Append(LINKFLAGS=" -framework CoreAudio -framework AudioUnit "
! +" -framework AudioToolbox -framework Carbon -framework CoreMIDI "
! +" -mmacosx-version-min=10.3 -lgcc")
ldflags = ''
--- 466,471 ----
pdenv.Append(LINKFLAGS=" -framework CoreAudio -framework AudioUnit "
! +" -framework AudioToolbox -framework Carbon -framework CoreMIDI "
! +" -mmacosx-version-min=10.3 -lgcc")
ldflags = ''
***************
*** 486,490 ****
if pdenv['portaudio']:
pdenv.Append(CPPDEFINES=Split("USEAPI_PORTAUDIO PA19"))
! pdenv.Append(CPPPATH=[papath+'/pa_common',papath+'/pablio'])
######################################################################
--- 486,490 ----
if pdenv['portaudio']:
pdenv.Append(CPPDEFINES=Split("USEAPI_PORTAUDIO PA19"))
! pdenv.Append(CPPPATH=[papath+'/pa_common',papath+'/pa_asio',papath+'/pablio'])
######################################################################
***************
*** 526,533 ****
cflags += " /Ox"
else:
! if pdenv['PLATFORM'] != 'darwin':
! cflags += " -O3"
else:
! cflags += " -Os"
if pdenv.Dictionary().has_key('optimize'):
--- 526,533 ----
cflags += " /Ox"
else:
! if pdenv['PLATFORM'] != 'darwin':
! cflags += " -O3"
else:
! cflags += " -Os"
if pdenv.Dictionary().has_key('optimize'):
***************
*** 561,567 ****
if pdenv['PLATFORM'] == 'darwin':
! if pdenv['lockfree']:
! cflags += " -fnested-functions -fasm-blocks"
!
######################################################################
#
--- 561,567 ----
if pdenv['PLATFORM'] == 'darwin':
! if pdenv['lockfree']:
! cflags += " -fnested-functions -fasm-blocks"
!
######################################################################
#
Index: s_main.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_main.c,v
retrieving revision 1.7.4.17.2.16
retrieving revision 1.7.4.17.2.17
diff -C2 -d -r1.7.4.17.2.16 -r1.7.4.17.2.17
*** s_main.c 3 Jul 2006 21:03:06 -0000 1.7.4.17.2.16
--- s_main.c 1 Aug 2006 13:25:26 -0000 1.7.4.17.2.17
***************
*** 220,225 ****
{
char cwd[666];
- getcwd(cwd,665);
t_namelist *nl;
/* load dynamic libraries specified with "-lib" args */
for (nl = sys_externlist; nl; nl = nl->nl_next)
--- 220,225 ----
{
char cwd[666];
t_namelist *nl;
+ getcwd(cwd,665);
/* load dynamic libraries specified with "-lib" args */
for (nl = sys_externlist; nl; nl = nl->nl_next)
Index: desire.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v
retrieving revision 1.1.2.93
retrieving revision 1.1.2.94
diff -C2 -d -r1.1.2.93 -r1.1.2.94
*** desire.c 29 Jul 2006 16:25:43 -0000 1.1.2.93
--- desire.c 1 Aug 2006 13:25:26 -0000 1.1.2.94
***************
*** 12784,12791 ****
static void visualloader_anything(t_gobj *self, t_symbol *s, int argc, t_atom *argv) {
- printf("visualloader_anything start newest=%p\n",newest);
//t_hash *h = self->g_adix->visual;
t_hash *h = ((t_gobj *)newest)->g_adix->visual;
int i=0,j=0;
while (j<argc) {
t_arglist *al;
--- 12784,12793 ----
static void visualloader_anything(t_gobj *self, t_symbol *s, int argc, t_atom *argv) {
//t_hash *h = self->g_adix->visual;
t_hash *h = ((t_gobj *)newest)->g_adix->visual;
int i=0,j=0;
+
+ printf("visualloader_anything start newest=%p\n",newest);
+
while (j<argc) {
t_arglist *al;
More information about the Pd-cvs
mailing list