From ed9b0e82d6345801b957b0389a28cd1482b08f6f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Fri, 24 Sep 2021 22:46:15 +0400
Subject: [PATCH 1/2] Use opus built with cmake on Windows

---
 external/opus/CMakeLists.txt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/external/opus/CMakeLists.txt b/external/opus/CMakeLists.txt
index 5fd2606..763f4fc 100644
--- a/external/opus/CMakeLists.txt
+++ b/external/opus/CMakeLists.txt
@@ -21,12 +21,7 @@ else()
         INTERFACE
             ${libs_loc}/opus/include
         )
-        if (build_win64)
-            set(opus_config_folder x64)
-        else()
-            set(opus_config_folder Win32)
-        endif()
-        set(opus_lib_loc ${libs_loc}/opus/win32/VS2015/${opus_config_folder})
+        set(opus_lib_loc ${libs_loc}/opus/out)
         set_target_properties(external_opus PROPERTIES
             IMPORTED_LOCATION "${opus_lib_loc}/Release/opus.lib"
             IMPORTED_LOCATION_DEBUG "${opus_lib_loc}/Debug/opus.lib"

From 1dacc0ac4fe2a5cb0237e7c89fe5dd8906e1593f Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 22 Sep 2021 22:32:45 +0400
Subject: [PATCH 2/2] QGenericEnginePlugin is available everywhere

So link it everywhere
---
 external/qt/CMakeLists.txt                          | 3 +--
 external/qt/qt_static_plugins/qt_static_plugins.cpp | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/external/qt/CMakeLists.txt b/external/qt/CMakeLists.txt
index 93d475b..935c144 100644
--- a/external/qt/CMakeLists.txt
+++ b/external/qt/CMakeLists.txt
@@ -131,6 +131,7 @@ else()
     endif()
 
     set(common_qt_libs
+        plugins/bearer/${qt_lib_prefix}qgenericbearer
         plugins/imageformats/${qt_lib_prefix}qwebp
         plugins/imageformats/${qt_lib_prefix}qgif
         plugins/imageformats/${qt_lib_prefix}qjpeg
@@ -175,7 +176,6 @@ else()
             lib/${qt_lib_prefix}qtfreetype
             lib/${qt_lib_prefix}qtpcre2
             plugins/platforms/${qt_lib_prefix}qcocoa
-            plugins/bearer/${qt_lib_prefix}qgenericbearer
         )
         foreach (lib ${qt_libs})
             list(APPEND qt_libs_list "${qt_loc}/${lib}${qt_lib_suffix}")
@@ -228,7 +228,6 @@ else()
             lib/${qt_lib_prefix}Qt5EdidSupport
             lib/${qt_lib_prefix}Qt5XkbCommonSupport
             ${qt_libs_dbus_support}
-            plugins/bearer/${qt_lib_prefix}qgenericbearer
             ${qt_libs_dbus_bearers}
             ${qt_libs_waylandclient}
             lib/${qt_lib_prefix}Qt5ServiceSupport
diff --git a/external/qt/qt_static_plugins/qt_static_plugins.cpp b/external/qt/qt_static_plugins/qt_static_plugins.cpp
index 4ed1a8f..9bbb617 100644
--- a/external/qt/qt_static_plugins/qt_static_plugins.cpp
+++ b/external/qt/qt_static_plugins/qt_static_plugins.cpp
@@ -8,6 +8,7 @@ https://github.com/desktop-app/legal/blob/master/LEGAL
 #include <QtCore/QtPlugin>
 
 #ifndef DESKTOP_APP_USE_PACKAGED
+Q_IMPORT_PLUGIN(QGenericEnginePlugin)
 Q_IMPORT_PLUGIN(QWebpPlugin)
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
@@ -19,12 +20,10 @@ Q_IMPORT_PLUGIN(QGifPlugin)
 Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)
 #elif defined Q_OS_MAC // Q_OS_WIN
 Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)
-Q_IMPORT_PLUGIN(QGenericEnginePlugin)
 #elif defined Q_OS_UNIX // Q_OS_WIN | Q_OS_MAC
 Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
 Q_IMPORT_PLUGIN(QXcbEglIntegrationPlugin)
 Q_IMPORT_PLUGIN(QXcbGlxIntegrationPlugin)
-Q_IMPORT_PLUGIN(QGenericEnginePlugin)
 Q_IMPORT_PLUGIN(QComposePlatformInputContextPlugin)
 Q_IMPORT_PLUGIN(QSvgIconPlugin)
 #ifndef DESKTOP_APP_DISABLE_DBUS_INTEGRATION