diff --git a/.github/workflows/Qt_Build.yml b/.github/workflows/Qt_Build.yml index a9bed901..3cb25dd2 100644 --- a/.github/workflows/Qt_Build.yml +++ b/.github/workflows/Qt_Build.yml @@ -108,7 +108,7 @@ jobs: sudo apt-get update && sudo apt install libx11-dev libgl1-mesa-glx mesa-common-dev libfuse2 sudo add-apt-repository -y ppa:savoury1/qt-6-2 sudo apt update - sudo apt install qt6-base-dev + sudo apt install qt6-base-dev qt6-base-private-dev - name: Install newer Clang run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index 254f2d2f..f5463bc2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -184,6 +184,7 @@ if(ENABLE_QT_GUI) source_group("Source Files\\Qt" FILES ${FRONTEND_SOURCE_FILES}) source_group("Header Files\\Qt" FILES ${FRONTEND_HEADER_FILES}) + include_directories(${Qt6Gui_PRIVATE_INCLUDE_DIRS}) else() set(FRONTEND_SOURCE_FILES src/panda_sdl/main.cpp) set(FRONTEND_HEADER_FILES "") diff --git a/src/panda_qt/screen.cpp b/src/panda_qt/screen.cpp index 4d21bbc7..62cac106 100644 --- a/src/panda_qt/screen.cpp +++ b/src/panda_qt/screen.cpp @@ -8,9 +8,14 @@ #include #include +#if !defined(_WIN32) && !defined(APPLE) +#include +#endif + #include "panda_qt/screen.hpp" -// OpenGL screen widget, based on https://github.com/melonDS-emu/melonDS/blob/master/src/frontend/qt_sdl/main.cpp +// OpenGL screen widget, based on https://github.com/stenzek/duckstation/blob/master/src/duckstation-qt/displaywidget.cpp +// and https://github.com/melonDS-emu/melonDS/blob/master/src/frontend/qt_sdl/main.cpp #ifdef PANDA3DS_ENABLE_OPENGL ScreenWidget::ScreenWidget(QWidget* parent) : QWidget(parent) {