Changeset 1354

Timestamp:

02/21/08 15:42:43 (6 months ago)

Author:

jpgrayson

Message:

Modify scons build system to now work on MacOSX (darwin). Thanks Jorge Maciá.

Location:

portaudio/branches/v19-devel

Files:

• SConstruct (modified) (2 diffs)
• bindings/cpp/SConscript (modified) (1 diff)
• build/scons/SConscript_opts (modified) (1 diff)
• src/SConscript (modified) (4 diffs)

portaudio/branches/v19-devel/SConstruct

@@ -37 +37 @@
 # Determine parameters to build tools
 if Platform in Posix:
-    baseLinkFlags = threadCFlags = "-pthread"
+    threadCFlags = ''
+    if Platform != 'darwin':
+        threadCFlags = "-pthread "
+    baseLinkFlags = threadCFlags
     baseCxxFlags = baseCFlags = "-Wall -pedantic -pipe " + threadCFlags
     debugCxxFlags = debugCFlags = "-g"
     optCxxFlags = optCFlags  = "-O2"
-env["CCFLAGS"] = baseCFlags.split()
-env["CXXFLAGS"] = baseCxxFlags.split()
-env["LINKFLAGS"] = baseLinkFlags.split()
+env.Append(CCFLAGS = baseCFlags)
+env.Append(CXXFLAGS = baseCxxFlags)
+env.Append(LINKFLAGS = baseLinkFlags)
 if env["enableDebug"]:
     env.AppendUnique(CCFLAGS=debugCFlags.split())
@@ -181 +184 @@
 
 # Define the builder for the config header
-env.Append(BUILDERS={"portaudioConfig": env.Builder(action=Action(buildConfigH,
-        "generating '$TARGET'"), target_factory=env.fs.File,)})
+env.Append(BUILDERS={"portaudioConfig": env.Builder(
+            action=Action(buildConfigH), target_factory=env.fs.File)})
 
 confH = env.portaudioConfig(File("portaudio_config.h", "include"),

portaudio/branches/v19-devel/bindings/cpp/SConscript

@@ -13 +13 @@
     env["SHLIBSUFFIX"] = ".so.%d.%d.%d" % (Major, Minor, Micro)
     soFile = "libportaudiocpp.so"
-    env.AppendUnique(SHLINKFLAGS="-Wl,-soname=%s.%d" % (soFile, Major))
+    if Platform != 'darwin':
+        env.AppendUnique(SHLINKFLAGS="-Wl,-soname=%s.%d" % (soFile, Major))
 
     # Create symlinks

portaudio/branches/v19-devel/build/scons/SConscript_opts

@@ -64 +64 @@
     apis.append(_PackageOption("OSS"))
     apis.append(_PackageOption("JACK"))
-    if Platform == "linux":
-        apis.append(_PackageOption("ALSA"))
-        apis.append(_PackageOption("ASIHPI"))
+    apis.append(_PackageOption("ALSA", Platform == "linux"))
+    apis.append(_PackageOption("ASIHPI", Platform == "linux"))
+    apis.append(_PackageOption("COREAUDIO", Platform == "darwin"))
 elif Platform in Windows:
     if Platform == "cygwin":
         apis.append(_EnumOption("winAPI", "Windows API to use", ("wmme", "directx", "asio"), "wmme"))
-elif Platform == "darwin":
-    apis.append(_EnumOption("macAPI", "Mac API to use", ("asio", "core", "sm"), "core"))
+
 opts["Host APIs"] = apis
 

portaudio/branches/v19-devel/src/SConscript

@@ -77 +77 @@
     if env["useASIHPI"]:
         optionalImpls["ASIHPI"] = ("hpi", "asihpi/hpi.h", "HPI_SubSysCreate")
+    if env["useCOREAUDIO"]:
+        optionalImpls["COREAUDIO"] = ("CoreAudio", "CoreAudio/CoreAudio.h", None)
 else:
     raise ConfigurationError("unknown platform %s" % Platform)
 
 if Platform == "darwin":
-    env.Append(LINKFLAGS=["-framework CoreAudio", "-framework AudioToolBox"])
-    env.Append(CPPDEFINES=["PA_USE_COREAUDIO"])
+    env.Append(LINKFLAGS="-framework CoreFoundation -framework CoreServices -framework CoreAudio -framework AudioToolBox -framework AudioUnit")
 elif Platform == "cygwin":
     env.Append(LIBS=["winmm"])
@@ -161 +162 @@
         pa_process.c pa_skeleton.c pa_stream.c pa_trace.c pa_debugprint.c pa_ringbuffer.c".split()]
 
-# Host API implementations
+# Host APIs implementations
 ImplSources = []
 if Platform in Posix:
@@ -174 +175 @@
 if "ASIHPI" in optionalImpls:
     ImplSources.append(os.path.join("hostapi", "asihpi", "pa_linux_asihpi.c"))
+if "COREAUDIO" in optionalImpls:
+    ImplSources.append([os.path.join("hostapi", "coreaudio", f) for f in """
+        pa_mac_core.c  pa_mac_core_blocking.c  pa_mac_core_utilities.c 
+    """.split()])
 
 
@@ -181 +186 @@
 if Platform in Posix:
     # Add soname to library, this is so a reference is made to the versioned library in programs linking against libportaudio.so
-    sharedLibEnv.AppendUnique(SHLINKFLAGS="-Wl,-soname=libportaudio.so.%d" % int(ApiVer.split(".")[0]))
+    if Platform != 'darwin':
+        sharedLibEnv.AppendUnique(SHLINKFLAGS="-Wl,-soname=libportaudio.so.%d" % int(ApiVer.split(".")[0]))
 sharedLib = sharedLibEnv.SharedLibrary(target="portaudio", source=sources)