commit 37682ba709f585e2c4f879658497304657c146b5
author Ke Dong <kedong@google.com> Mon Dec 05 01:13:18 2011 -0800
committer Ke Dong <kedong@google.com> Mon Dec 05 04:54:36 2011 -0800
tree 2919b25f912974b34f06a03f995f25e3e2429dd3
parent 18d9478023828cf44c20410a99f4919cc152fe99

Hook vcme audio library to libjingle.

Change-Id: I39dc8db57dbe50b56d54ad23fc6adbf8ee35afc7

talk/libjingle.scons

diff --git a/talk/libjingle.scons b/talk/libjingle.scons
index 5ad357e..bfd82b0 100644
--- a/talk/libjingle.scons
+++ b/talk/libjingle.scons
@@ -119,7 +119,6 @@
                "SRTP_RELATIVE_PATH",
                "XML_STATIC",
                "HAVE_GIPS",
-               "BRUNO",
              ],
              srcs = [
                "base/asyncfile.cc",
@@ -284,6 +283,7 @@
                "examples/login/xmppsocket.cc",
              ],
 )
+
 talk.Library(env, name = "unittest_main",
              libs = [
                "gunit",
@@ -365,6 +365,8 @@
            "srtp",
            "xmpphelp",
            "VoiceEngine_Linux_gcc",
+           "vcme_audio",
+           "nexus",
          ],
 )
 talk.App(env, name = "relayserver",

talk/main.scons

diff --git a/talk/main.scons b/talk/main.scons
index 1940875..5ad5065 100644
--- a/talk/main.scons
+++ b/talk/main.scons
@@ -41,6 +41,7 @@
 
 CROSS_COMPILE = os.environ['CROSS_COMPILE']
 
+
 # The root of all builds.
 root_env = Environment(
   tools = [
@@ -392,6 +393,7 @@
 linux_common_env.Append(
   CPPDEFINES = [
     'LINUX',
+    'BRUNO',
   ],
   CCFLAGS = [
     # Needed for link-time dead-code removal to work properly.