Merge branch 'master' into rhappy
This commit is contained in:
2
.github/workflows/Qt_Build.yml
vendored
2
.github/workflows/Qt_Build.yml
vendored
@@ -105,7 +105,7 @@ jobs:
|
||||
|
||||
- name: Install misc packages
|
||||
run: |
|
||||
sudo apt-get update && sudo apt install libx11-dev libgl1-mesa-glx mesa-common-dev libfuse2
|
||||
sudo apt-get update && sudo apt install libx11-dev libgl1-mesa-glx mesa-common-dev libfuse2 libwayland-dev
|
||||
sudo add-apt-repository -y ppa:savoury1/qt-6-2
|
||||
sudo apt update
|
||||
sudo apt install qt6-base-dev qt6-base-private-dev
|
||||
|
||||
@@ -403,6 +403,11 @@ endif()
|
||||
if(ENABLE_QT_GUI)
|
||||
target_compile_definitions(Alber PUBLIC "PANDA3DS_FRONTEND_QT=1")
|
||||
target_link_libraries(Alber PRIVATE Qt6::Widgets)
|
||||
|
||||
if(LINUX OR FREEBSD)
|
||||
find_package(X11 REQUIRED)
|
||||
target_link_libraries(Alber PRIVATE ${X11_LIBRARIES})
|
||||
endif()
|
||||
else()
|
||||
target_compile_definitions(Alber PUBLIC "PANDA3DS_FRONTEND_SDL=1")
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user