mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 04:17:35 +00:00
Ladybird: Do not require Qt6 Multimedia if PulseAudio is available
If PulseAudio is available, the Qt6 audio plugin will never be used. So let's remove it from the build. Note that on macOS, the Qt6 audio plugin will be used if the Qt chrome is enabled. Otherwise, Audio Unit will be used for the AppKit chrome.
This commit is contained in:
parent
b98864e022
commit
bbdd624d50
4 changed files with 23 additions and 8 deletions
|
@ -16,8 +16,6 @@ set(WEBCONTENT_SOURCES
|
|||
if (ENABLE_QT)
|
||||
qt_add_executable(WebContent ${WEBCONTENT_SOURCES})
|
||||
target_sources(WebContent PRIVATE
|
||||
../Qt/AudioCodecPluginQt.cpp
|
||||
../Qt/AudioThread.cpp
|
||||
../Qt/EventLoopImplementationQt.cpp
|
||||
../Qt/EventLoopImplementationQtEventTarget.cpp
|
||||
../Qt/RequestManagerQt.cpp
|
||||
|
@ -27,8 +25,20 @@ if (ENABLE_QT)
|
|||
../Qt/WebSocketImplQt.cpp
|
||||
main.cpp
|
||||
)
|
||||
target_link_libraries(WebContent PRIVATE Qt::Core Qt::Network Qt::Multimedia)
|
||||
target_link_libraries(WebContent PRIVATE Qt::Core Qt::Network)
|
||||
target_compile_definitions(WebContent PRIVATE HAVE_QT=1)
|
||||
|
||||
if (NOT HAVE_PULSEAUDIO)
|
||||
find_package(Qt6 REQUIRED COMPONENTS Multimedia)
|
||||
|
||||
target_sources(WebContent PRIVATE
|
||||
../Qt/AudioCodecPluginQt.cpp
|
||||
../Qt/AudioThread.cpp
|
||||
)
|
||||
|
||||
target_link_libraries(WebContent PRIVATE Qt::Multimedia)
|
||||
target_compile_definitions(WebContent PRIVATE HAVE_QT_MULTIMEDIA=1)
|
||||
endif()
|
||||
else()
|
||||
set(LIB_TYPE STATIC)
|
||||
if (ANDROID)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue