From 892f504a6314e302dc363d2cc2aa1d58760ef82b Mon Sep 17 00:00:00 2001
From: LagoLunatic <LagoLunatic@users.noreply.github.com>
Date: Fri, 10 Nov 2023 01:24:27 -0500
Subject: [PATCH] Make gclib import/build less janky

---
 gcft.spec | 19 ++-----------------
 gclib     |  2 +-
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/gcft.spec b/gcft.spec
index 39b48cb..28da144 100644
--- a/gcft.spec
+++ b/gcft.spec
@@ -22,21 +22,6 @@ def build_datas_recursive(paths):
   
   return datas
 
-import sys
-def get_hidden_imports():
-  import_modules = []
-  
-  sys.path.insert(0, "./gclib")
-  import gclib
-  for module_name in gclib.__all__:
-    import_modules.append(f"gclib.{module_name}")
-  for module_name in gclib.j3d_chunks.__all__:
-    import_modules.append(f"gclib.j3d_chunks.{module_name}")
-  for module_name in gclib.jpa_chunks.__all__:
-    import_modules.append(f"gclib.jpa_chunks.{module_name}")
-  
-  return import_modules
-
 import platform
 import glob
 def get_binaries():
@@ -54,13 +39,13 @@ def get_binaries():
 
 
 a = Analysis(['gcft.py'],
-             pathex=[],
+             pathex=["./gclib", "./gclib/gclib"],
              binaries=get_binaries(),
              datas=build_datas_recursive([
                'assets/**/*.*',
                'version.txt',
              ]),
-             hiddenimports=get_hidden_imports(),
+             hiddenimports=[],
              hookspath=[],
              runtime_hooks=[],
              excludes=[],
diff --git a/gclib b/gclib
index 39c7244..b1ef66b 160000
--- a/gclib
+++ b/gclib
@@ -1 +1 @@
-Subproject commit 39c7244c266d5bfb72340116b031b0e257438e46
+Subproject commit b1ef66b558b6889dc06fc11de0a6a7e392660e6f