Commits

Ivan Vučica  committed 743bd06

Semi-tested update for r127 of libjingle. Includes a small configuration patch for building under OS X Lion.

  • Participants
  • Parent commits 2c24985

Comments (0)

Files changed (2)

-
-svn checkout -r 57 http://libjingle.googlecode.com/svn/trunk/ .
 
 wget http://prdownloads.sourceforge.net/scons/scons-2.0.1.tar.gz
 wget http://swtoolkit.googlecode.com/files/swtoolkit.0.9.1.zip
 wget http://libjingle.googlecode.com/files/srtp-cvs.zip
 wget http://prdownloads.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz
 
-
+wget http://googletest.googlecode.com/files/gtest-1.6.0.zip
 
 tar xvvfz scons-2.0.1.tar.gz
 cd scons-2.0.1
 tar xvvfz expat-2.0.1.tar.gz
 cd -
 
+mv gtest-1.6.0.zip talk/third_party
+cd talk/third_party
+unzip gtest-1.6.0.zip
+mv gtest-1.6.0 gtest
+cd -

File osx10.7.patch

+diff -r 62d0656f99c0 talk/libjingle.scons
+--- a/talk/libjingle.scons	Fri Mar 23 23:15:35 2012 +0000
++++ b/talk/libjingle.scons	Sat Mar 24 22:03:40 2012 +0100
+@@ -12,6 +12,7 @@
+              ],
+              includedirs = [
+                "third_party/expat-2.0.1/lib",
++               "third_party/expat-2.0.1",
+              ],
+              win_cppdefines = [
+                "COMPILED_FROM_DSP",
+diff -r 62d0656f99c0 talk/main.scons
+--- a/talk/main.scons	Fri Mar 23 23:15:35 2012 +0000
++++ b/talk/main.scons	Sat Mar 24 22:03:40 2012 +0100
+@@ -345,7 +345,6 @@
+   CXXFLAGS = [
+     '-Wno-non-virtual-dtor',
+     '-Wno-ctor-dtor-privacy',
+-    '-fno-rtti',
+   ],
+ )
+ 
+@@ -369,7 +368,7 @@
+   CCFLAGS = [
+     '-m32',
+     '-arch', 'i386',
+-    '-isysroot', '/Developer/SDKs/MacOSX10.5.sdk',
++    '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk',
+     '-fasm-blocks',
+   ],
+   LINKFLAGS = [
+@@ -381,7 +380,7 @@
+     '-ObjC',
+     '-arch', 'i386',
+     '-mmacosx-version-min=10.5',
+-    '-isysroot', '/Developer/SDKs/MacOSX10.5.sdk',
++    '-isysroot', '/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk',
+     '-m32',
+     '-dead_strip',
+   ],