mirror of
https://github.com/wheremyfoodat/Panda3DS.git
synced 2025-04-16 02:49:48 +12:00
Add QPlatformNative include for Linux/BSD
This commit is contained in:
parent
45a80c9e39
commit
8c3dd70c5a
3 changed files with 8 additions and 2 deletions
2
.github/workflows/Qt_Build.yml
vendored
2
.github/workflows/Qt_Build.yml
vendored
|
@ -108,7 +108,7 @@ jobs:
|
||||||
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
|
||||||
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
|
sudo apt install qt6-base-dev qt6-base-private-dev
|
||||||
|
|
||||||
- name: Install newer Clang
|
- name: Install newer Clang
|
||||||
run: |
|
run: |
|
||||||
|
|
|
@ -184,6 +184,7 @@ if(ENABLE_QT_GUI)
|
||||||
|
|
||||||
source_group("Source Files\\Qt" FILES ${FRONTEND_SOURCE_FILES})
|
source_group("Source Files\\Qt" FILES ${FRONTEND_SOURCE_FILES})
|
||||||
source_group("Header Files\\Qt" FILES ${FRONTEND_HEADER_FILES})
|
source_group("Header Files\\Qt" FILES ${FRONTEND_HEADER_FILES})
|
||||||
|
include_directories(${Qt6Gui_PRIVATE_INCLUDE_DIRS})
|
||||||
else()
|
else()
|
||||||
set(FRONTEND_SOURCE_FILES src/panda_sdl/main.cpp)
|
set(FRONTEND_SOURCE_FILES src/panda_sdl/main.cpp)
|
||||||
set(FRONTEND_HEADER_FILES "")
|
set(FRONTEND_HEADER_FILES "")
|
||||||
|
|
|
@ -8,9 +8,14 @@
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <optional>
|
#include <optional>
|
||||||
|
|
||||||
|
#if !defined(_WIN32) && !defined(APPLE)
|
||||||
|
#include <qpa/qplatformnativeinterface.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "panda_qt/screen.hpp"
|
#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
|
#ifdef PANDA3DS_ENABLE_OPENGL
|
||||||
ScreenWidget::ScreenWidget(QWidget* parent) : QWidget(parent) {
|
ScreenWidget::ScreenWidget(QWidget* parent) : QWidget(parent) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue