Make gclib import/build less janky

LagoLunatic · Nov 10, 2023 · 892f504 · 892f504
1 parent 23eed79
commit 892f504
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git 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
+0 −32		gclib/__init__.py
+12 −6		gclib/j3d.py
+0 −33		gclib/j3d_chunks/__init__.py
+0 −26		gclib/jpa_chunks/__init__.py
+11 −5		gclib/jpc.py