jfjoch_viewer: Add wayland support
This commit is contained in:
@@ -37,6 +37,7 @@ RUN dnf -y update && \
|
||||
xcb-util-devel \
|
||||
libxkbcommon-devel \
|
||||
libxkbcommon-x11-devel \
|
||||
libwayland-devel \
|
||||
libX11-devel \
|
||||
libXext-devel \
|
||||
libXrender-devel \
|
||||
@@ -120,6 +121,7 @@ RUN set -eux; \
|
||||
-DQT_FEATURE_xcb=ON \
|
||||
-DQT_FEATURE_xcb_xlib=OFF \
|
||||
-DQT_FEATURE_xkbcommon_x11=ON \
|
||||
-DQT_FEATURE_wayland_client=ON \
|
||||
-DQT_FEATURE_opengl=ON \
|
||||
-DQT_FEATURE_opengl_desktop=ON \
|
||||
-DQT_FEATURE_opengl_dynamic=OFF \
|
||||
|
||||
@@ -62,6 +62,7 @@ RUN dnf -y update && \
|
||||
libdrm-devel \
|
||||
libglvnd-core-devel \
|
||||
libglvnd-devel \
|
||||
libwayland-devel \
|
||||
freetype-devel && \
|
||||
dnf clean all && rm -rf /var/cache/dnf
|
||||
|
||||
@@ -107,6 +108,7 @@ RUN set -eux; \
|
||||
-DQT_FEATURE_xcb=ON \
|
||||
-DQT_FEATURE_xcb_xlib=OFF \
|
||||
-DQT_FEATURE_xkbcommon_x11=ON \
|
||||
-DQT_FEATURE_wayland_client=ON \
|
||||
-DQT_FEATURE_opengl=ON \
|
||||
-DQT_FEATURE_opengl_desktop=ON \
|
||||
-DQT_FEATURE_opengl_dynamic=OFF \
|
||||
|
||||
@@ -74,6 +74,7 @@ RUN set -eux; \
|
||||
mesa-utils \
|
||||
libassimp-dev \
|
||||
libglvnd-dev \
|
||||
libwayland-dev \
|
||||
libfreetype6-dev; \
|
||||
apt-get -y install gcc-12 g++-12; \
|
||||
apt-get clean; \
|
||||
@@ -124,6 +125,7 @@ RUN set -eux; \
|
||||
-DQT_FEATURE_xcb=ON \
|
||||
-DQT_FEATURE_xcb_xlib=ON \
|
||||
-DQT_FEATURE_xkbcommon_x11=ON \
|
||||
-DQT_FEATURE_wayland_client=ON \
|
||||
-DQT_FEATURE_opengl=ON \
|
||||
-DQT_FEATURE_opengl_desktop=ON \
|
||||
-DQT_FEATURE_opengl_dynamic=OFF \
|
||||
|
||||
@@ -65,10 +65,12 @@ RUN set -eux; \
|
||||
libfontconfig1-dev \
|
||||
libopenblas-dev \
|
||||
libfftw3-dev \
|
||||
libwayland-dev \
|
||||
qt6-base-dev \
|
||||
qt6-charts-dev \
|
||||
qt6-tools-dev \
|
||||
qt6-3d-dev \
|
||||
qt6-wayland-dev \
|
||||
libeigen3-dev \
|
||||
libfreetype6-dev; \
|
||||
apt-get clean; \
|
||||
|
||||
@@ -69,4 +69,4 @@ INSTALL(
|
||||
COMPONENT viewer
|
||||
)
|
||||
|
||||
qt_import_plugins(jfjoch_viewer INCLUDE Qt::QLibInputPlugin Qt::QXcbIntegrationPlugin)
|
||||
qt_import_plugins(jfjoch_viewer INCLUDE Qt::QLibInputPlugin Qt::QXcbIntegrationPlugin Qt::QWaylandIntegrationPlugin)
|
||||
|
||||
Reference in New Issue
Block a user