Fix Linux build, still WIP anyhow

Signed-off-by: falkTX <falktx@falktx.com>
mod-audio · Oct 7, 2023 · 4ad5274 · 4ad5274
1 parent f4147f7
commit 4ad5274
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/PawPaw b/PawPaw
diff --git a/systray/main.cpp b/systray/main.cpp
@@ -14,11 +14,14 @@ static const WCHAR* user_files_dir = nullptr;
 #include <dlfcn.h>
 #endif
 
-#ifdef __APPLE__
+#if defined(__APPLE__)
 #include <sys/syslimits.h>
-#define MAX_PATH PATH_MAX
+#elif defined(__linux__)
+#include <linux/limits.h>
 #endif
 
+#include <cstring>
+
 QString getUserFilesDir()
 {
    #ifdef _WIN32
@@ -39,7 +42,7 @@ void writeMidiChannelsToProfile(int pedalboard, int snapshot)
     std::wcscat(path, L"\\profile5.json");
     QFile jsonFile(QString::fromWCharArray(path));
    #else
-    char path[MAX_PATH + 256] = {};
+    char path[PATH_MAX + 256] = {};
     std::strcpy(path, getenv("MOD_DATA_DIR"));
     std::strcat(path, "/profile5.json");
     QFile jsonFile(QString::fromUtf8(path));

diff --git a/systray/mod-app.hpp b/systray/mod-app.hpp
@@ -116,7 +116,9 @@ class AppWindow : public QMainWindow
 
         systray = new QSystemTrayIcon(icon, this);
         systray->setContextMenu(sysmenu);
-        // systray->setIcon(QPixmap(":/mod-logo.svg"));
+       #ifndef Q_OS_WIN
+        systray->setIcon(QPixmap(":/mod-logo.svg"));
+       #endif
         connect(systray, &QSystemTrayIcon::messageClicked, this, &AppWindow::messageClicked);
         connect(systray, &QSystemTrayIcon::activated, this, &AppWindow::iconActivated);
 
@@ -153,7 +155,7 @@ class AppWindow : public QMainWindow
     {
         printf("--------------------------------------------------------\n");
 
-       #ifdef Q_OS_WIN
+      #ifdef Q_OS_WIN
         SetEnvironmentVariableW(L"JACK_NO_AUDIO_RESERVATION", L"1");
         SetEnvironmentVariableW(L"JACK_NO_START_SERVER", L"1");
 
@@ -211,16 +213,20 @@ class AppWindow : public QMainWindow
             }
 
             Pa_Terminate();
-
-            if (ui.cb_device->count())
-                ui.b_start->setEnabled(true);
         }
-       #else
+      #else
         setenv("JACK_NO_AUDIO_RESERVATION", "1", 1);
         setenv("JACK_NO_START_SERVER", "1", 1);
 
+       #ifdef Q_OS_MAC
+        // TODO
+       #else
         // TODO
        #endif
+      #endif
+
+        if (ui.cb_device->count())
+            ui.b_start->setEnabled(true);
 
         printf("--------------------------------------------------------\n");
     }