From f7bcdad47f9a1cefe03400c6f2ac962a63bf362d Mon Sep 17 00:00:00 2001
From: DJ2LS <75909252+DJ2LS@users.noreply.github.com>
Date: Sun, 22 Jan 2023 23:35:52 +0100
Subject: [PATCH] finally working macOS build

---
 gui/package.json |  2 +-
 tnc/codec2.py    | 13 ++++++++-----
 tnc/static.py    |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/gui/package.json b/gui/package.json
index b82ff9f9..d7a80412 100644
--- a/gui/package.json
+++ b/gui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "FreeDATA",
-  "version": "0.6.12-alpha.5",
+  "version": "0.6.12-alpha.6",
   "description": "FreeDATA ",
   "main": "main.js",
   "scripts": {
diff --git a/tnc/codec2.py b/tnc/codec2.py
index f9219c2f..903dd04a 100644
--- a/tnc/codec2.py
+++ b/tnc/codec2.py
@@ -60,17 +60,20 @@ def freedv_get_mode_name_by_value(mode: int) -> str:
 
 
 # Check if we are running in a pyinstaller environment
-if hasattr(sys, "_MEIPASS"):
-    sys.path.append(getattr(sys, "_MEIPASS"))
-else:
-    sys.path.append(os.path.abspath("."))
+#if hasattr(sys, "_MEIPASS"):
+#    sys.path.append(getattr(sys, "_MEIPASS"))
+#else:
+sys.path.append(os.path.abspath("."))
 
 log.info("[C2 ] Searching for libcodec2...")
 if sys.platform == "linux":
     files = glob.glob(r"**/*libcodec2*", recursive=True)
     files.append("libcodec2.so")
 elif sys.platform == "darwin":
-    files = glob.glob(r"**/*libcodec2*.dylib", recursive=True)
+    if hasattr(sys, "_MEIPASS"):
+        files = glob.glob(getattr(sys, "_MEIPASS") + '/**/*libcodec2*', recursive=True)
+    else:
+        files = glob.glob(r"**/*libcodec2*.dylib", recursive=True)
 elif sys.platform in ["win32", "win64"]:
     files = glob.glob(r"**\*libcodec2*.dll", recursive=True)
 else:
diff --git a/tnc/static.py b/tnc/static.py
index 2b3e7f25..af52a46b 100644
--- a/tnc/static.py
+++ b/tnc/static.py
@@ -11,7 +11,7 @@ Not nice, suggestions are appreciated :-)
 import subprocess
 from enum import Enum
 
-VERSION = "0.6.12-alpha.5"
+VERSION = "0.6.12-alpha.6"
 
 ENABLE_EXPLORER = False