Skip to content

Commit a79e472

Browse files
committed
try to fix build pb for sound support on arm
1 parent a5fdffc commit a79e472

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

CMakeLists.txt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if (NOT EXISTS ${WEBRTCOBJS}/${CMAKE_STATIC_LIBRARY_PREFIX}webrtc${CMAKE_STATIC_
5252
string(REGEX REPLACE "'src/resources'],[^']" "'src/resources'],'condition':'rtc_include_tests==true'," filecontent "${filecontent}")
5353
file(WRITE ${WEBRTCROOT}/src/DEPS "${filecontent}")
5454

55-
EXECUTE_PROCESS(WORKING_DIRECTORY ${WEBRTCROOT}/src COMMAND gclient sync --nohooks)
55+
EXECUTE_PROCESS(WORKING_DIRECTORY ${WEBRTCROOT}/src COMMAND gclient sync)
5656

5757
if(CMAKE_SYSTEM_PROCESSOR MATCHES "armv.*")
5858
EXECUTE_PROCESS(WORKING_DIRECTORY ${WEBRTCROOT}/src
@@ -82,9 +82,6 @@ if (NOT EXISTS ${WEBRTCOBJS}/${CMAKE_STATIC_LIBRARY_PREFIX}webrtc${CMAKE_STATIC_
8282
endif()
8383
endif()
8484

85-
EXECUTE_PROCESS(WORKING_DIRECTORY ${WEBRTCROOT}/src COMMAND gclient sync)
86-
87-
8885
set (WEBRTCARGS rtc_include_tests=false\nrtc_enable_protobuf=false\nrtc_build_examples=false\nrtc_build_tools=false\ntreat_warnings_as_errors=false\nenable_js_protobuf=false\nuse_glib=false\n)
8986
set (WEBRTCARGS use_custom_libcxx=false\nlibyuv_use_sme=false\n${WEBRTCARGS})
9087
# debug/release
@@ -127,12 +124,7 @@ if (NOT EXISTS ${WEBRTCOBJS}/${CMAKE_STATIC_LIBRARY_PREFIX}webrtc${CMAKE_STATIC_
127124
file(WRITE ${WEBRTCROOT}/src/call/rtp_config.cc "${filecontent}")
128125

129126
# sound support
130-
if (APPLE)
131-
set (WEBRTCARGS rtc_include_internal_audio_device=true\n${WEBRTCARGS})
132-
set (WEBRTCARGS rtc_include_pulse_audio=true\n${WEBRTCARGS})
133-
elseif (WIN32)
134-
set (WEBRTCARGS rtc_include_internal_audio_device=true\n${WEBRTCARGS})
135-
else()
127+
if (NOT DEFINED CMAKE_FIND_ROOT_PATH)
136128
if (NOT PulseAudio_FOUND)
137129
set (WEBRTCARGS rtc_include_pulse_audio=false\n${WEBRTCARGS})
138130
endif()

0 commit comments

Comments
 (0)