Merge pull request #3 from rtiangha/wayland-pr

citra_qt: Add Wayland QT libraries into Linux AppImage

.ci/linux.sh

@@ -3,6 +3,9 @@
 if [ "$TARGET" = "appimage" ]; then
     # Compile the AppImage we distribute with Clang.
     export EXTRA_CMAKE_FLAGS=(-DCITRA_USE_PRECOMPILED_HEADERS=OFF -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_LINKER=/etc/bin/ld.lld)
+    # Bundle required QT wayland libraries
+    export EXTRA_QT_PLUGINS="waylandcompositor"
+    export EXTRA_PLATFORM_PLUGINS="libqwayland-egl.so;libqwayland-generic.so"
 else
     # For the linux-fresh verification target, verify compilation without PCH as well.
     export EXTRA_CMAKE_FLAGS=(-DCITRA_USE_PRECOMPILED_HEADERS=OFF)

src/citra_qt/CMakeLists.txt

@@ -293,36 +293,6 @@ elseif (WIN32)
         set_target_properties(citra-qt PROPERTIES LINK_FLAGS_RELEASE "-mwindows")
     endif()
 
-elseif(UNIX)
-    find_package(X11 REQUIRED)
-    find_package(EGL REQUIRED)
-
-    option(ENABLE_WAYLAND "Enable Wayland support" ON)
-
-    if (ENABLE_WAYLAND)
-
-        find_package(Wayland REQUIRED Client)
-
-        target_compile_definitions(citra PRIVATE WAYLAND_ENABLED)
-
-        target_sources(citra PRIVATE
-            externals/duckstation/gl/context_egl_wayland.cpp
-        )
-    endif()
-
-    target_sources(citra PRIVATE
-        externals/duckstation/gl/context.cpp
-        externals/duckstation/gl/context_egl.cpp
-        externals/duckstation/gl/context_egl_x11.cpp
-        externals/duckstation/gl/context_glx.cpp
-        externals/duckstation/gl/x11_window.cpp
-
-        ../../externals/glad/src/glad_egl.c
-        ../../externals/glad/src/glad_glx.c
-    )
-    target_link_libraries(citra PRIVATE "${X11_LIBRARIES}" "${EGL_LIBRARIES}")
-    target_include_directories(citra PRIVATE "${X11_INCLUDE_DIR}")
-    add_compile_definitions(QAPPLICATION_CLASS=QApplication)
 endif()
 
 if(ENABLE_SDL2)