Update of /cvsroot/audacity/lib-src/portaudio-v19/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv22516/src
Modified Files:
SConscript
Log Message:
Bringing PortAudio up to their latest SVN sources.
Index: SConscript
===================================================================
RCS file: /cvsroot/audacity/lib-src/portaudio-v19/src/SConscript,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- SConscript 10 Jun 2006 21:30:55 -0000 1.1
+++ SConscript 23 Sep 2006 18:42:46 -0000 1.2
@@ -74,6 +74,8 @@
if env["useOSS"]:
# TODO: It looks like the prefix for soundcard.h depends on the
platform
optionalImpls["OSS"] = ("oss", "sys/soundcard.h", None)
+ if env["useASIHPI"]:
+ optionalImpls["ASIHPI"] = ("hpi", "asihpi/hpi.h", "HPI_SubSysCreate")
else:
raise ConfigurationError("unknown platform %s" % Platform)
@@ -126,13 +128,13 @@
# Use an absolute path for conf_dir, otherwise it gets created both relative
to current directory and build directory
conf = env.Configure(log_file=os.path.join(sconsDir, "sconf.log"),
custom_tests={"CheckCTypeSize": CheckCTypeSize},
conf_dir=os.path.join(sconsDir, ".sconf_temp"))
-env.Append(CPPDEFINES=["SIZEOF_SHORT=%d" % conf.CheckCTypeSize("short")])
-env.Append(CPPDEFINES=["SIZEOF_INT=%d" % conf.CheckCTypeSize("int")])
-env.Append(CPPDEFINES=["SIZEOF_LONG=%d" % conf.CheckCTypeSize("long")])
+conf.env.Append(CPPDEFINES=["SIZEOF_SHORT=%d" % conf.CheckCTypeSize("short")])
+conf.env.Append(CPPDEFINES=["SIZEOF_INT=%d" % conf.CheckCTypeSize("int")])
+conf.env.Append(CPPDEFINES=["SIZEOF_LONG=%d" % conf.CheckCTypeSize("long")])
if checkSymbol(conf, "time.h", "rt", "clock_gettime"):
- env.Append(CPPDEFINES=["HAVE_CLOCK_GETTIME"])
+ conf.env.Append(CPPDEFINES=["HAVE_CLOCK_GETTIME"])
if checkSymbol(conf, "time.h", symbol="nanosleep"):
- env.Append(CPPDEFINES=["HAVE_NANOSLEEP"])
+ conf.env.Append(CPPDEFINES=["HAVE_NANOSLEEP"])
# Look for needed libraries and link with them
for lib, hdr, sym in neededLibs:
@@ -141,7 +143,7 @@
for name, val in optionalImpls.items():
lib, hdr, sym = val
if checkSymbol(conf, hdr, lib, sym, critical=False, pkgName=name.lower()):
- env.Append(CPPDEFINES=["PA_USE_%s=1" % name.upper()])
+ conf.env.Append(CPPDEFINES=["PA_USE_%s=1" % name.upper()])
else:
del optionalImpls[name]
@@ -163,6 +165,9 @@
ImplSources.append(os.path.join("hostapi", "jack", "pa_jack.c"))
if "OSS" in optionalImpls:
ImplSources.append(os.path.join("hostapi", "oss", "pa_unix_oss.c"))
+if "ASIHPI" in optionalImpls:
+ ImplSources.append(os.path.join("hostapi", "asihpi", "pa_linux_asihpi.c"))
+
sources = CommonSources + ImplSources
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
