Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-06 22:25:41 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into rhappy

Browse source
This commit is contained in:
wheremyfoodat 2023-09-30 14:56:47 +03:00
commit 5426ddfd78
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/Qt_Build.yml vendored
View file

@ -105,7 +105,7 @@ jobs:
- name: Install misc packages - name: Install misc packages
run: | 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 add-apt-repository -y ppa:savoury1/qt-6-2
sudo apt update sudo apt update
sudo apt install qt6-base-dev qt6-base-private-dev sudo apt install qt6-base-dev qt6-base-private-dev

5
CMakeLists.txt
View file

@ -403,6 +403,11 @@ endif()
if(ENABLE_QT_GUI) if(ENABLE_QT_GUI)
target_compile_definitions(Alber PUBLIC "PANDA3DS_FRONTEND_QT=1") target_compile_definitions(Alber PUBLIC "PANDA3DS_FRONTEND_QT=1")
target_link_libraries(Alber PRIVATE Qt6::Widgets) target_link_libraries(Alber PRIVATE Qt6::Widgets)
if(LINUX OR FREEBSD)
find_package(X11 REQUIRED)
target_link_libraries(Alber PRIVATE ${X11_LIBRARIES})
endif()
else() else()
target_compile_definitions(Alber PUBLIC "PANDA3DS_FRONTEND_SDL=1") target_compile_definitions(Alber PUBLIC "PANDA3DS_FRONTEND_SDL=1")
endif() endif()