Merged the include and src folders.

2024-11-20 10:57:23 +01:00 · 2023-10-23 17:24:00 +02:00 · 2023-10-23 17:24:00 +02:00 · c45e0ce2af
commit c45e0ce2af
parent 81c0193475
64 changed files with 6 additions and 8 deletions
--- a/4
+++ b/4
@ -490,11 +490,11 @@ if env["generate_bindings"]:
    NoCache(bindings)
 # Includes
-env.Append(CPPPATH=[[env.Dir(d) for d in [".", env["headers_dir"], "include", "include/gen", "include/core"]]])
+env.Append(CPPPATH=[[env.Dir(d) for d in [".", env["headers_dir"], "gen", "core"]]])
 # Sources to compile
 sources = []
-add_sources(sources, "src/core", "cpp")
+add_sources(sources, "core", "cpp")
 sources.extend(f for f in bindings if str(f).endswith(".cpp"))
 arch_suffix = env["bits"]
--- a/binding_generator.py
+++ b/binding_generator.py
@ -47,8 +47,8 @@ def get_file_list(api_filepath, output_dir, headers=False, sources=False):
    files = []
    with open(api_filepath) as api_file:
        classes = json.load(api_file)
-    include_gen_folder = Path(output_dir) / "include" / "gen"
+    include_gen_folder = Path(output_dir) / "gen"
-    source_gen_folder = Path(output_dir) / "src" / "gen"
+    source_gen_folder = Path(output_dir) / "gen"
    for _class in classes:
        header_filename = include_gen_folder / (class_name_to_file_name(strip_name(_class["name"])) + ".h")
        source_filename = source_gen_folder / (class_name_to_file_name(strip_name(_class["name"])) + ".cpp")
@ -90,8 +90,8 @@ def generate_bindings(api_filepath, use_template_get_node, output_dir="."):
        classes = json.load(api_file)
    icalls = set()
-    include_gen_folder = Path(output_dir) / "include" / "gen"
+    include_gen_folder = Path(output_dir) / "gen"
-    source_gen_folder = Path(output_dir) / "src" / "gen"
+    source_gen_folder = Path(output_dir) / "gen"
    include_gen_folder.mkdir(parents=True, exist_ok=True)
    source_gen_folder.mkdir(parents=True, exist_ok=True)
--- a/src/core/aabb.cpp
+++ b/src/core/aabb.cpp
--- a/include/core/aabb.h
+++ b/include/core/aabb.h
--- a/src/core/array.cpp
+++ b/src/core/array.cpp
--- a/include/core/array.h
+++ b/include/core/array.h
--- a/src/core/basis.cpp
+++ b/src/core/basis.cpp
--- a/include/core/basis.h
+++ b/include/core/basis.h
--- a/src/core/color.cpp
+++ b/src/core/color.cpp
--- a/include/core/color.h
+++ b/include/core/color.h
--- a/include/core/core_types.h
+++ b/include/core/core_types.h
--- a/include/core/defs.h
+++ b/include/core/defs.h
--- a/src/core/dictionary.cpp
+++ b/src/core/dictionary.cpp
--- a/include/core/dictionary.h
+++ b/include/core/dictionary.h
--- a/include/core/math_funcs.h
+++ b/include/core/math_funcs.h
--- a/src/core/node_path.cpp
+++ b/src/core/node_path.cpp
--- a/include/core/node_path.h
+++ b/include/core/node_path.h
--- a/include/core/pandemonium.h
+++ b/include/core/pandemonium.h
--- a/src/core/pandemonium_global.cpp
+++ b/src/core/pandemonium_global.cpp
--- a/include/core/pandemonium_global.h
+++ b/include/core/pandemonium_global.h
--- a/src/core/pandemonium_profiling.cpp
+++ b/src/core/pandemonium_profiling.cpp
--- a/include/core/pandemonium_profiling.h
+++ b/include/core/pandemonium_profiling.h
--- a/src/core/plane.cpp
+++ b/src/core/plane.cpp
--- a/include/core/plane.h
+++ b/include/core/plane.h
--- a/src/core/pool_arrays.cpp
+++ b/src/core/pool_arrays.cpp
--- a/include/core/pool_arrays.h
+++ b/include/core/pool_arrays.h
--- a/src/core/projection.cpp
+++ b/src/core/projection.cpp
--- a/include/core/projection.h
+++ b/include/core/projection.h
--- a/src/core/quaternion.cpp
+++ b/src/core/quaternion.cpp
--- a/include/core/quaternion.h
+++ b/include/core/quaternion.h
--- a/src/core/rect2.cpp
+++ b/src/core/rect2.cpp
--- a/include/core/rect2.h
+++ b/include/core/rect2.h
--- a/src/core/rect2i.cpp
+++ b/src/core/rect2i.cpp
--- a/include/core/rect2i.h
+++ b/include/core/rect2i.h
--- a/include/core/ref.h
+++ b/include/core/ref.h
--- a/src/core/rid.cpp
+++ b/src/core/rid.cpp
--- a/include/core/rid.h
+++ b/include/core/rid.h
--- a/src/core/string_name.cpp
+++ b/src/core/string_name.cpp
--- a/include/core/string_name.h
+++ b/include/core/string_name.h
--- a/src/core/tag_db.cpp
+++ b/src/core/tag_db.cpp
--- a/include/core/tag_db.h
+++ b/include/core/tag_db.h
--- a/src/core/transform.cpp
+++ b/src/core/transform.cpp
--- a/include/core/transform.h
+++ b/include/core/transform.h
--- a/src/core/transform_2d.cpp
+++ b/src/core/transform_2d.cpp
--- a/include/core/transform_2d.h
+++ b/include/core/transform_2d.h
--- a/src/core/ustring.cpp
+++ b/src/core/ustring.cpp
--- a/include/core/ustring.h
+++ b/include/core/ustring.h
--- a/src/core/variant.cpp
+++ b/src/core/variant.cpp
--- a/include/core/variant.h
+++ b/include/core/variant.h
--- a/src/core/vector2.cpp
+++ b/src/core/vector2.cpp
--- a/include/core/vector2.h
+++ b/include/core/vector2.h
--- a/src/core/vector2i.cpp
+++ b/src/core/vector2i.cpp
--- a/include/core/vector2i.h
+++ b/include/core/vector2i.h
--- a/src/core/vector3.cpp
+++ b/src/core/vector3.cpp
--- a/include/core/vector3.h
+++ b/include/core/vector3.h
--- a/src/core/vector3i.cpp
+++ b/src/core/vector3i.cpp
--- a/include/core/vector3i.h
+++ b/include/core/vector3i.h
--- a/src/core/vector4.cpp
+++ b/src/core/vector4.cpp
--- a/include/core/vector4.h
+++ b/include/core/vector4.h
--- a/src/core/vector4i.cpp
+++ b/src/core/vector4i.cpp
--- a/include/core/vector4i.h
+++ b/include/core/vector4i.h
--- a/include/core/wrapped.h
+++ b/include/core/wrapped.h
--- a/include/gen/.gitignore
+++ b/include/gen/.gitignore
--- a/src/gen/.gitignore
+++ b/src/gen/.gitignore
@ -1,2 +0,0 @@
 *
 !.gitignore