From 46707da341f53f4da3dd3abe66060ee4fad6f752 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Fri, 2 Jun 2023 10:02:17 +0200
Subject: [PATCH] Use the pandemonium_headers folder.

---
 SConstruct                                 | 12 ++++++------
 generation/generate_gdnative_api_struct.py |  4 ++--
 pythonscript/godot/SConscript              |  4 ++--
 pythonscript/godot/_hazmat/SConscript      |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/SConstruct b/SConstruct
index 69859bd..ba23efd 100644
--- a/SConstruct
+++ b/SConstruct
@@ -56,7 +56,7 @@ vars.Add(
     default="3.2.2",
     converter=godot_binary_converter,
 )
-vars.Add("godot_headers", "Path to Godot GDnative headers", "")
+vars.Add("pandemonium_headers", "Path to Godot GDnative headers", "")
 vars.Add("debugger", "Run test with a debugger", "")
 vars.Add(BoolVariable("debug", "Compile with debug symbols", False))
 vars.Add(BoolVariable("headless", "Run tests in headless mode", False))
@@ -135,14 +135,14 @@ Help(vars.GenerateHelpText(env))
 # ImportVirtualenv(env)
 
 
-if env["godot_headers"]:
-    env["godot_headers"] = Dir(env["godot_headers"])
+if env["pandemonium_headers"]:
+    env["pandemonium_headers"] = Dir(env["pandemonium_headers"])
 else:
-    env["godot_headers"] = Dir("godot_headers")
-env.AppendUnique(CPPPATH=["$godot_headers"])
+    env["pandemonium_headers"] = Dir("pandemonium_headers")
+env.AppendUnique(CPPPATH=["$pandemonium_headers"])
 # TODO: not sure why, but CPPPATH scan result for cython modules change between
 # first and subsequent runs of scons (module is considered to no longer depend
-# on godot_headers on subsequent run, so the build redone)
+# on pandemonium_headers on subsequent run, so the build redone)
 SetOption("implicit_cache", 1)
 
 
diff --git a/generation/generate_gdnative_api_struct.py b/generation/generate_gdnative_api_struct.py
index a22e18a..106f2dc 100644
--- a/generation/generate_gdnative_api_struct.py
+++ b/generation/generate_gdnative_api_struct.py
@@ -308,8 +308,8 @@ if __name__ == "__main__":
         "--input",
         "-i",
         required=True,
-        metavar="GODOT_HEADERS_PATH",
-        help="Path to Godot GDNative headers",
+        metavar="PANDEMONIUM_HEADERS_PATH",
+        help="Path to GDNative headers",
     )
     parser.add_argument(
         "--output",
diff --git a/pythonscript/godot/SConscript b/pythonscript/godot/SConscript
index 8db5f21..3414843 100644
--- a/pythonscript/godot/SConscript
+++ b/pythonscript/godot/SConscript
@@ -38,7 +38,7 @@ env.Depends(
 
 godot_builtins_srcs = env.Command(
     target=("builtins.pyx", "builtins.pxd"),
-    source=("#/generation/generate_builtins.py", "${godot_headers}/gdnative_api.json"),
+    source=("#/generation/generate_builtins.py", "${pandemonium_headers}/gdnative_api.json"),
     action="python ${SOURCES[0]} --input ${SOURCES[1]} --output ${TARGET}",
 )
 env.Depends(
@@ -84,7 +84,7 @@ else:
 
 godot_bindings_srcs = bindings_env.Command(
     target=("bindings.pyx", "bindings.pxd", "bindings.pyi"),
-    source=("#/generation/generate_bindings.py", "${godot_headers}/api.json"),
+    source=("#/generation/generate_bindings.py", "${pandemonium_headers}/api.json"),
     action=("python ${SOURCES[0]} ${opts} --input ${SOURCES[1]} --output ${TARGET} "),
     opts="--sample" if sample else "",
 )
diff --git a/pythonscript/godot/_hazmat/SConscript b/pythonscript/godot/_hazmat/SConscript
index 5e6efac..56b5887 100644
--- a/pythonscript/godot/_hazmat/SConscript
+++ b/pythonscript/godot/_hazmat/SConscript
@@ -20,7 +20,7 @@ env.Install("$DIST_SITE_PACKAGES/godot/_hazmat", pxds)
 
 gdnative_api_struct_pxd = env.Command(
     target="gdnative_api_struct.pxd",
-    source=["#/generation/generate_gdnative_api_struct.py", env["godot_headers"]],
+    source=["#/generation/generate_gdnative_api_struct.py", env["pandemonium_headers"]],
     action="python ${SOURCES[0]} --input ${SOURCES[1]} --output ${TARGET}",
 )