Skip to content

Commit 1c7bc35

Browse files
roxanneskellyroxanneskelly
authored
Merge pull request #2328 from secondlife/roxie/webrtc-airpod-fixes
2 parents 0f3ffb0 + 2dae5a8 commit 1c7bc35

File tree

4 files changed

+112
-64
lines changed

4 files changed

+112
-64
lines changed

‎autobuild.xml

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -745,18 +745,6 @@
745745
</map>
746746
<key>glm</key>
747747
<map>
748-
<key>canonical_repo</key>
749-
<string>https://github.com/secondlife/3p-glm</string>
750-
<key>copyright</key>
751-
<string>Copyright (c) 2005 - G-Truc Creation</string>
752-
<key>description</key>
753-
<string>OpenGL Mathematics</string>
754-
<key>license</key>
755-
<string>MIT</string>
756-
<key>license_file</key>
757-
<string>LICENSES/glm_license.txt</string>
758-
<key>name</key>
759-
<string>glm</string>
760748
<key>platforms</key>
761749
<map>
762750
<key>common</key>
@@ -774,16 +762,28 @@
774762
<string>common</string>
775763
</map>
776764
</map>
777-
<key>source_type</key>
778-
<string>git</string>
765+
<key>license</key>
766+
<string>MIT</string>
767+
<key>license_file</key>
768+
<string>LICENSES/glm_license.txt</string>
769+
<key>copyright</key>
770+
<string>Copyright (c) 2005 - G-Truc Creation</string>
771+
<key>version</key>
772+
<string>v1.0.1</string>
773+
<key>name</key>
774+
<string>glm</string>
779775
<key>vcs_branch</key>
780776
<string>refs/tags/v1.0.1-r1</string>
781777
<key>vcs_revision</key>
782778
<string>399cd5ba57a9267a560ce07e50a0f8c5fe3dc66f</string>
783779
<key>vcs_url</key>
784780
<string>git://github.com/secondlife/3p-glm.git</string>
785-
<key>version</key>
786-
<string>v1.0.1</string>
781+
<key>canonical_repo</key>
782+
<string>https://github.com/secondlife/3p-glm</string>
783+
<key>description</key>
784+
<string>OpenGL Mathematics</string>
785+
<key>source_type</key>
786+
<string>git</string>
787787
</map>
788788
<key>gstreamer</key>
789789
<map>
@@ -1418,14 +1418,6 @@
14181418
</map>
14191419
<key>llphysicsextensions_source</key>
14201420
<map>
1421-
<key>copyright</key>
1422-
<string>Copyright (c) 2010, Linden Research, Inc.</string>
1423-
<key>license</key>
1424-
<string>internal</string>
1425-
<key>license_file</key>
1426-
<string>LICENSES/llphysicsextensions.txt</string>
1427-
<key>name</key>
1428-
<string>llphysicsextensions_source</string>
14291421
<key>platforms</key>
14301422
<map>
14311423
<key>darwin64</key>
@@ -1477,8 +1469,16 @@
14771469
<string>windows64</string>
14781470
</map>
14791471
</map>
1472+
<key>license</key>
1473+
<string>internal</string>
1474+
<key>license_file</key>
1475+
<string>LICENSES/llphysicsextensions.txt</string>
1476+
<key>copyright</key>
1477+
<string>Copyright (c) 2010, Linden Research, Inc.</string>
14801478
<key>version</key>
14811479
<string>1.0.b8b1f73</string>
1480+
<key>name</key>
1481+
<string>llphysicsextensions_source</string>
14821482
</map>
14831483
<key>llphysicsextensions_stub</key>
14841484
<map>
@@ -2008,16 +2008,6 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
20082008
</map>
20092009
<key>openal</key>
20102010
<map>
2011-
<key>copyright</key>
2012-
<string>Copyright (C) 1999-2007 by authors.</string>
2013-
<key>description</key>
2014-
<string>OpenAL Soft is a software implementation of the OpenAL 3D audio API.</string>
2015-
<key>license</key>
2016-
<string>LGPL2</string>
2017-
<key>license_file</key>
2018-
<string>LICENSES/openal-soft.txt</string>
2019-
<key>name</key>
2020-
<string>openal</string>
20212011
<key>platforms</key>
20222012
<map>
20232013
<key>darwin64</key>
@@ -2063,8 +2053,18 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
20632053
<string>windows64</string>
20642054
</map>
20652055
</map>
2056+
<key>license</key>
2057+
<string>LGPL2</string>
2058+
<key>license_file</key>
2059+
<string>LICENSES/openal-soft.txt</string>
2060+
<key>copyright</key>
2061+
<string>Copyright (C) 1999-2007 by authors.</string>
20662062
<key>version</key>
20672063
<string>1.23.1</string>
2064+
<key>name</key>
2065+
<string>openal</string>
2066+
<key>description</key>
2067+
<string>OpenAL Soft is a software implementation of the OpenAL 3D audio API.</string>
20682068
</map>
20692069
<key>openjpeg</key>
20702070
<map>
@@ -2793,11 +2793,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
27932793
<key>archive</key>
27942794
<map>
27952795
<key>hash</key>
2796-
<string>194b4f5957c9f003c46e61a434e23a7c3d1180d6</string>
2796+
<string>3570b6442d472cd97bad8622c2ec2571d72218a0</string>
27972797
<key>hash_algorithm</key>
27982798
<string>sha1</string>
27992799
<key>url</key>
2800-
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.70-debug/webrtc-m114.5735.08.70-debug.10377605436-darwin64-10377605436.tar.zst</string>
2800+
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.72-test/webrtc-m114.5735.08.72-test.10444682919-darwin64-10444682919.tar.zst</string>
28012801
</map>
28022802
<key>name</key>
28032803
<string>darwin64</string>
@@ -2807,11 +2807,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
28072807
<key>archive</key>
28082808
<map>
28092809
<key>hash</key>
2810-
<string>38e0c7d30b4c40eb04e60ab199440b847cc7c6cf</string>
2810+
<string>eadf6aa99313940ded11801d42c11375669f1628</string>
28112811
<key>hash_algorithm</key>
28122812
<string>sha1</string>
28132813
<key>url</key>
2814-
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.70-debug/webrtc-m114.5735.08.70-debug.10377605436-linux64-10377605436.tar.zst</string>
2814+
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.72-test/webrtc-m114.5735.08.72-test.10444682919-linux64-10444682919.tar.zst</string>
28152815
</map>
28162816
<key>name</key>
28172817
<string>linux64</string>
@@ -2821,11 +2821,11 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
28212821
<key>archive</key>
28222822
<map>
28232823
<key>hash</key>
2824-
<string>053fb5c873df9192e34cddcf2db1c5fdcff76ba1</string>
2824+
<string>0081fd35290adbc8e66dd366535fb6cd8a966f1e</string>
28252825
<key>hash_algorithm</key>
28262826
<string>sha1</string>
28272827
<key>url</key>
2828-
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.70-debug/webrtc-m114.5735.08.70-debug.10377605436-windows64-10377605436.tar.zst</string>
2828+
<string>https://github.com/secondlife/3p-webrtc-build/releases/download/m114.5735.08.72-test/webrtc-m114.5735.08.72-test.10444682919-windows64-10444682919.tar.zst</string>
28292829
</map>
28302830
<key>name</key>
28312831
<string>windows64</string>
@@ -2838,7 +2838,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
28382838
<key>copyright</key>
28392839
<string>Copyright (c) 2011, The WebRTC project authors. All rights reserved.</string>
28402840
<key>version</key>
2841-
<string>m114.5735.08.70-debug.10377605436</string>
2841+
<string>m114.5735.08.72-test.10444682919</string>
28422842
<key>name</key>
28432843
<string>webrtc</string>
28442844
<key>vcs_branch</key>

‎indra/llwebrtc/CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ add_library (llwebrtc SHARED ${llwebrtc_SOURCE_FILES})
3131
set_target_properties(llwebrtc PROPERTIES PUBLIC_HEADER llwebrtc.h)
3232

3333
if (WINDOWS)
34+
cmake_policy(SET CMP0091 NEW)
3435
set_target_properties(llwebrtc
3536
PROPERTIES
3637
LINK_FLAGS "/debug /LARGEADDRESSAWARE"
@@ -42,7 +43,10 @@ if (WINDOWS)
4243
wmcodecdspuuid
4344
msdmo
4445
strmiids
45-
iphlpapi)
46+
iphlpapi
47+
libcmt)
48+
# as the webrtc libraries are release, build this binary as release as well.
49+
target_compile_options(llwebrtc PRIVATE "/MT")
4650
if (USE_BUGSPLAT)
4751
set_target_properties(llwebrtc PROPERTIES PDB_OUTPUT_DIRECTORY "${SYMBOLS_STAGING_DIR}")
4852
endif (USE_BUGSPLAT)

0 commit comments

Comments
 (0)