File pcsx2-PR3686.patch of Package pcsx2-git

Overview Repositories Revisions Requests Users Attributes Meta

File pcsx2-PR3686.patch of Package pcsx2-git (Revision ee3900504ef2415540c7c89bd25f932f)

Currently displaying revision ee3900504ef2415540c7c89bd25f932f , Show latest

From 371a0a079d6fbb08f89472f820e67f728007252d Mon Sep 17 00:00:00 2001
From: Guo Yunhe <i@guoyunhe.me>
Date: Fri, 11 Sep 2020 11:45:51 +0300
Subject: [PATCH 1/2] Support wxWidgets 3.2

---
 cmake/SearchForStuff.cmake | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
index e9f5d6ec18..099d8dd695 100644
--- a/cmake/SearchForStuff.cmake
+++ b/cmake/SearchForStuff.cmake
@@ -35,7 +35,7 @@ else()
     set(wxWidgets_CONFIG_OPTIONS --unicode=yes)
 endif()
 
-list(APPEND wxWidgets_CONFIG_OPTIONS --version=3.0)
+list(APPEND wxWidgets_CONFIG_OPTIONS --version=3.2)
 
 if(GTK3_API AND NOT APPLE)
     list(APPEND wxWidgets_CONFIG_OPTIONS --toolkit=gtk3)
@@ -69,6 +69,9 @@ else()
     if(EXISTS "/usr/bin/wx-config-3.0")
         set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config-3.0")
     endif()
+    if(EXISTS "/usr/bin/wx-config")
+        set(wxWidgets_CONFIG_EXECUTABLE "/usr/bin/wx-config")
+    endif()
 endif()
 
 find_package(wxWidgets COMPONENTS base core adv)

From c22c51c2689849d592a82f9a3a53c3faa2b59577 Mon Sep 17 00:00:00 2001
From: Guo Yunhe <i@guoyunhe.me>
Date: Fri, 11 Sep 2020 12:08:29 +0300
Subject: [PATCH 2/2] Support Qt

---
 cmake/SearchForStuff.cmake | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
index 099d8dd695..7da62e588f 100644
--- a/cmake/SearchForStuff.cmake
+++ b/cmake/SearchForStuff.cmake
@@ -35,9 +35,14 @@ else()
     set(wxWidgets_CONFIG_OPTIONS --unicode=yes)
 endif()
 
-list(APPEND wxWidgets_CONFIG_OPTIONS --version=3.2)
+# Use system wxWidgets version when packaging for Linux
+if(NOT PACKAGE_MODE)
+    list(APPEND wxWidgets_CONFIG_OPTIONS --version=3.0)
+endif()
 
-if(GTK3_API AND NOT APPLE)
+if(QT_API AND NOT APPLE)
+    list(APPEND wxWidgets_CONFIG_OPTIONS --toolkit=qt)
+elseif(GTK3_API AND NOT APPLE)
     list(APPEND wxWidgets_CONFIG_OPTIONS --toolkit=gtk3)
 elseif(NOT APPLE)
     list(APPEND wxWidgets_CONFIG_OPTIONS --toolkit=gtk2)

Places

File pcsx2-PR3686.patch of Package pcsx2-git (Revision ee3900504ef2415540c7c89bd25f932f)

Places