From f04ecec2acd165e6dd5692fed21d0667bbf3ac52 Mon Sep 17 00:00:00 2001
From: Russell Sim <russell.sim@gmail.com>
Date: Sat, 13 Jun 2020 15:05:22 +0200
Subject: Proton directory discovery

Use search paths to find proton wine and the app directory, so that we can
support steam installations in multiple locations and 3rd party proton
installations.
---
 proto-wine/ftnoir_protocol_wine.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'proto-wine/ftnoir_protocol_wine.h')

diff --git a/proto-wine/ftnoir_protocol_wine.h b/proto-wine/ftnoir_protocol_wine.h
index 0e48e5b5..fc537b60 100644
--- a/proto-wine/ftnoir_protocol_wine.h
+++ b/proto-wine/ftnoir_protocol_wine.h
@@ -12,6 +12,7 @@ using namespace options;
 #include <QString>
 #include <QProcess>
 #include <QMutex>
+#include <QtCore/QVariant>
 
 #include <QDebug>
 
@@ -24,8 +25,8 @@ struct settings : opts
                 esync{b, "esync", true};
 
     value<int>     proton_appid{b, "proton-appid", 0};
-    value<QString> proton_version{b, "proton-version", {} },
-                   wineprefix{b, "wineprefix", "~/.wine"};
+    value<QVariant> proton_path{b, "proton-version", {} };
+    value<QString> wineprefix{b, "wineprefix", "~/.wine"};
     value<int>     protocol{b, "protocol", 2};
 };
 
-- 
cgit v1.2.3


From e00575681938da48c3dc41a798a7211ae6ca4b87 Mon Sep 17 00:00:00 2001
From: Russell Sim <russell.sim@gmail.com>
Date: Sun, 14 Jun 2020 06:54:54 +0200
Subject: Remove prefx and sort includes

---
 proto-wine/ftnoir_protocol_wine.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'proto-wine/ftnoir_protocol_wine.h')

diff --git a/proto-wine/ftnoir_protocol_wine.h b/proto-wine/ftnoir_protocol_wine.h
index fc537b60..f7346be9 100644
--- a/proto-wine/ftnoir_protocol_wine.h
+++ b/proto-wine/ftnoir_protocol_wine.h
@@ -9,10 +9,10 @@
 #include "options/options.hpp"
 using namespace options;
 
-#include <QString>
-#include <QProcess>
 #include <QMutex>
-#include <QtCore/QVariant>
+#include <QProcess>
+#include <QString>
+#include <QVariant>
 
 #include <QDebug>
 
-- 
cgit v1.2.3