Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/libjingle-0.6.3/talk/libjingle.scons b/libjingle-0.6.3.old/talk/libjingle.scons
- index c5c247f..98e8cb3 100644
- --- a/libjingle-0.6.3/talk/libjingle.scons
- +++ b/libjingle-0.6.3.old/talk/libjingle.scons
- @@ -12,7 +12,6 @@ talk.Library(env, name = "expat",
- ],
- includedirs = [
- "third_party/expat-2.0.1/lib",
- - "third_party/expat-2.0.1",
- ],
- win_cppdefines = [
- "COMPILED_FROM_DSP",
- diff --git a/libjingle-0.6.3/talk/main.scons b/libjingle-0.6.3.old/talk/main.scons
- index 4b1cf12..689288f 100644
- --- a/libjingle-0.6.3/talk/main.scons
- +++ b/libjingle-0.6.3.old/talk/main.scons
- @@ -300,6 +300,7 @@ posix_env.Append(
- CXXFLAGS = [
- '-Wno-non-virtual-dtor',
- '-Wno-ctor-dtor-privacy',
- + '-fno-rtti',
- ],
- )
- @@ -320,7 +321,7 @@ mac_env.Append(
- CCFLAGS = [
- '-m32',
- '-arch', 'i386',
- - '-isysroot', '/Developer/SDKs/MacOSX10.7.sdk',
- + '-isysroot', '/Developer/SDKs/MacOSX10.5.sdk',
- '-fasm-blocks',
- ],
- LINKFLAGS = [
- @@ -332,7 +333,7 @@ mac_env.Append(
- '-ObjC',
- '-arch', 'i386',
- '-mmacosx-version-min=10.5',
- - '-isysroot', '/Developer/SDKs/MacOSX10.7.sdk',
- + '-isysroot', '/Developer/SDKs/MacOSX10.5.sdk',
- '-m32',
- '-dead_strip',
- ],
- @@ -350,9 +351,6 @@ mac_env.Append(
- ]
- )
- -mac_env.Replace(
- - RPATH = [],
- -)
- mac_dbg_env = mac_env.Clone(
- BUILD_TYPE = 'dbg',
- @@ -387,7 +385,6 @@ mac_opt_env.Append(
- ],
- # Hammer automatically specifies -Os for mac opt.
- )
- -
- envs.append(mac_opt_env)
- #-------------------------------------------------------------------------------
- diff --git a/libjingle-0.6.3/talk/session/phone/srtpfilter_unittest.cc b/libjingle-0.6.3.old/talk/session/phone/srtpfilter_unittest.cc
- index 4b1b28f..f519633 100644
- --- a/libjingle-0.6.3/talk/session/phone/srtpfilter_unittest.cc
- +++ b/libjingle-0.6.3.old/talk/session/phone/srtpfilter_unittest.cc
- @@ -32,7 +32,7 @@
- #include "talk/session/phone/cryptoparams.h"
- #include "talk/session/phone/fakertp.h"
- #include "talk/session/phone/srtpfilter.h"
- -#include "third_party/srtp/crypto/include/err.h"
- +#include "third_party/libsrtp/crypto/include/err.h"
- using cricket::CS_AES_CM_128_HMAC_SHA1_80;
- using cricket::CS_AES_CM_128_HMAC_SHA1_32;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement