[PD-cvs] pd/src SConscript, 1.1.4.11, 1.1.4.12 s_entry.c, 1.2.4.2, 1.2.4.2.2.1 t_tkcmd.c, 1.2.4.1.2.1, 1.2.4.1.2.2
carmen rocco
ix9 at users.sourceforge.net
Sat Jul 16 23:18:35 CEST 2005
Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6154/src
Modified Files:
Tag: devel_0_39
SConscript s_entry.c t_tkcmd.c
Log Message:
:
AasdasdOMGFUCKINGVI I HATE YOU!!!!
A
----------------------------------------------------------------------
Index: SConscript
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v
retrieving revision 1.1.4.11
retrieving revision 1.1.4.12
diff -C2 -d -r1.1.4.11 -r1.1.4.12
*** SConscript 14 Jul 2005 19:56:27 -0000 1.1.4.11
--- SConscript 16 Jul 2005 21:18:33 -0000 1.1.4.12
***************
*** 11,14 ****
--- 11,15 ----
BoolOption('debug', 'Build with debugging symbols', False),
BoolOption('nosimd', 'Build without simd instructions', False),
+ BoolOption('portaudio', 'Build with portaudio', True),
BoolOption('threadedsf', 'Build with threaded soundfiler', False),
BoolOption('atomic', 'Build with atomic operations', False),
***************
*** 98,101 ****
--- 99,138 ----
defs = []
+
+ ######################################################################
+ #
+ # system specific configuration
+
+ set = "."
+ pthreadLib = "pthread"
+
+ if pdenv['PLATFORM'] == 'posix':
+ if conf.CheckLib('dl', 'dlopen'):
+ defs.append('DL_OPEN')
+ else:
+ print "libdl not found. dynamic loading of externals disabled"
+
+
+ jack = conf.CheckLib('jack','jack_activate')
+ alsa = conf.CheckLib('asound','snd_pcm_info')
+
+
+ if pdenv['PLATFORM'] == 'win32':
+ portaudio = False
+ if ['msvc'] in pdenv['TOOLS']:
+ pthreadLib = "pthreadVC"
+ else:
+ sep = ""
+ pthreadLib = "pthreadGC2"
+ pass
+
+ if pdenv['PLATFORM'] == 'darwin':
+ portaudio = True
+
+ ## hardcoding the search paths ... ugly, but works
+ pdenv.Append(CPPPATH=Split("""/Library/Frameworks/Tk.framework/Headers/
+ /Library/Frameworks/Tcl.framework/Headers/"""))
+
+
######################################################################
######################################################################
***************
*** 113,117 ****
if not conf.CheckLib('tcl'):
for i in range (0,10):
! if conf.CheckLib('tcl8.%d' % i):
break
else:
--- 150,154 ----
if not conf.CheckLib('tcl'):
for i in range (0,10):
! if conf.CheckLib('tcl8%s%d' % (sep,i)):
break
else:
***************
*** 121,125 ****
if not conf.CheckLib('tk'):
for i in range (0,10):
! if conf.CheckLib('tk8.%d' % i):
break
else:
--- 158,162 ----
if not conf.CheckLib('tk'):
for i in range (0,10):
! if conf.CheckLib('tk8%s%d' % (sep,i)):
break
else:
***************
*** 152,156 ****
! if not conf.CheckLib('pthread', 'pthread_create'):
print "can't find pthread library"
Exit(1)
--- 189,193 ----
! if not conf.CheckLib(pthreadLib, 'pthread_create'):
print "can't find pthread library"
Exit(1)
***************
*** 161,191 ****
######################################################################
#
- # system specific configuration
-
- if pdenv['PLATFORM'] == 'posix':
- if conf.CheckLib('dl', 'dlopen'):
- defs.append('DL_OPEN')
- else:
- print "libdl not found. dynamic loading of externals disabled"
-
-
- jack = conf.CheckLib('jack','jack_activate')
- alsa = conf.CheckLib('asound','snd_pcm_info')
-
-
- if pdenv['PLATFORM'] == 'win32':
- portaudio = True
- pass
-
- if pdenv['PLATFORM'] == 'darwin':
- portaudio = True
-
- ## hardcoding the search paths ... ugly, but works
- pdenv.Append(CPPPATH=Split("""/Library/Frameworks/Tk.framework/Headers/
- /Library/Frameworks/Tcl.framework/Headers/"""))
-
-
- ######################################################################
- #
# cleaning up
--- 198,201 ----
***************
*** 248,252 ****
windows_sources = Split("""s_audio_mmio.c
! s_audio_asio.cpp
s_midi_mmio.c""")
windows_defs = Split("MSW USEAPI_ASIO")
--- 258,262 ----
windows_sources = Split("""s_audio_mmio.c
! s_audio_asio.cpp asio.cpp asiodrivers.cpp asiolist.cpp
s_midi_mmio.c""")
windows_defs = Split("MSW USEAPI_ASIO")
***************
*** 259,262 ****
--- 269,275 ----
pdenv.Append(CPPDEFINES=windows_defs)
+ win_libs = Split("ole32 winmm wsock32")
+ pdenv.Append(LIBS=win_libs)
+
pdenv['pdlib'] = True ## split pd to pd.exe and pd.dll
***************
*** 347,352 ****
# portaudio stuff
! pdenv.Append(CPPDEFINES=Split("USEAPI_PORTAUDIO PA19"))
! pdenv.Append(CPPPATH=Split("../portaudio/pa_common ../portaudio/pablio"))
--- 360,366 ----
# portaudio stuff
! if pdenv['portaudio']:
! pdenv.Append(CPPDEFINES=Split("USEAPI_PORTAUDIO PA19"))
! pdenv.Append(CPPPATH=Split("../portaudio/pa_common ../portaudio/pablio"))
***************
*** 410,415 ****
LINKFLAGS='-framework Tcl -framework Tk')
if pdenv['PLATFORM']=='win32':
! pdgui = pdenv.SharedLibrary('../bin/pdtcl', Split("t_main.c t_tkcmd.c"),
! LIBS=Split('tcl tk'))
--- 424,428 ----
LINKFLAGS='-framework Tcl -framework Tk')
if pdenv['PLATFORM']=='win32':
! pdgui = pdenv.SharedLibrary('../bin/pdtcl', Split("t_main.c t_tkcmd.c"))
***************
*** 421,429 ****
pdenv.Append(LIBPATH=['.'])
pd = pdenv.Program('../bin/pd', 's_entry.c', LIBS=['pd'])
! Default(pdwatchdog, pdsend, pdreceive, pdgui, pd, pdlib, pdtk)
else:
pd = pdenv.Program('../bin/pd', ['s_entry.c'] + sources)
pdlib = None
! Default(pdwatchdog, pdsend, pdreceive, pdgui, pd, pdtk)
Export("pdenv")
--- 434,445 ----
pdenv.Append(LIBPATH=['.'])
pd = pdenv.Program('../bin/pd', 's_entry.c', LIBS=['pd'])
! Default(pdsend, pdreceive, pdgui, pd, pdlib, pdtk)
else:
pd = pdenv.Program('../bin/pd', ['s_entry.c'] + sources)
pdlib = None
! Default(pdsend, pdreceive, pdgui, pd, pdtk)
!
! if pdenv['PLATFORM'] != 'win32':
! Default(pdwatchdog)
Export("pdenv")
Index: t_tkcmd.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/t_tkcmd.c,v
retrieving revision 1.2.4.1.2.1
retrieving revision 1.2.4.1.2.2
diff -C2 -d -r1.2.4.1.2.1 -r1.2.4.1.2.2
*** t_tkcmd.c 12 Jul 2005 15:11:12 -0000 1.2.4.1.2.1
--- t_tkcmd.c 16 Jul 2005 21:18:33 -0000 1.2.4.1.2.2
***************
*** 572,576 ****
}
! #ifndef MSW
void pdgui_setname(char *s)
{
--- 572,576 ----
}
! #if !defined(MSW) || (defined(MSW) && defined (__GNUC__))
void pdgui_setname(char *s)
{
Index: s_entry.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/s_entry.c,v
retrieving revision 1.2.4.2
retrieving revision 1.2.4.2.2.1
diff -C2 -d -r1.2.4.2 -r1.2.4.2.2.1
*** s_entry.c 11 Jan 2005 21:41:14 -0000 1.2.4.2
--- s_entry.c 16 Jul 2005 21:18:33 -0000 1.2.4.2.2.1
***************
*** 4,8 ****
int sys_main(int argc, char **argv);
! #ifdef MSW
#include <windows.h>
#include <stdio.h>
--- 4,8 ----
int sys_main(int argc, char **argv);
! #if defined(MSW) && !defined (__GNUC__)
#include <windows.h>
#include <stdio.h>
***************
*** 22,26 ****
}
! #else /* not MSW */
int main(int argc, char **argv)
{
--- 22,26 ----
}
! #else /* not MSVC */
int main(int argc, char **argv)
{
More information about the Pd-cvs
mailing list