From 94c7f0a442fa95a9da574548f82e390c8d0711cf Mon Sep 17 00:00:00 2001 From: Relintai Date: Sat, 16 Dec 2023 18:28:07 +0100 Subject: [PATCH] Moved mikktspace. --- scene/resources/SCsub | 2 +- scene/resources/mesh/surface_tool.h | 2 +- .../resources/mesh/thirdparty}/mikktspace.c | 0 .../resources/mesh/thirdparty}/mikktspace.h | 0 scu_builders.py | 13 +++++++------ 5 files changed, 9 insertions(+), 8 deletions(-) rename {thirdparty/misc => scene/resources/mesh/thirdparty}/mikktspace.c (100%) rename {thirdparty/misc => scene/resources/mesh/thirdparty}/mikktspace.h (100%) diff --git a/scene/resources/SCsub b/scene/resources/SCsub index 45e45c1..6861773 100644 --- a/scene/resources/SCsub +++ b/scene/resources/SCsub @@ -6,7 +6,7 @@ Import("env") thirdparty_obj = [] -thirdparty_sources = "#thirdparty/misc/mikktspace.c" +thirdparty_sources = "mesh/thirdparty/mikktspace.c" env_thirdparty = env.Clone() env_thirdparty.disable_warnings() diff --git a/scene/resources/mesh/surface_tool.h b/scene/resources/mesh/surface_tool.h index 5e3e18b..2088d3c 100644 --- a/scene/resources/mesh/surface_tool.h +++ b/scene/resources/mesh/surface_tool.h @@ -32,7 +32,7 @@ #include "scene/resources/mesh/mesh.h" -#include "thirdparty/misc/mikktspace.h" +#include "thirdparty/mikktspace.h" class SurfaceTool : public Reference { GDCLASS(SurfaceTool, Reference); diff --git a/thirdparty/misc/mikktspace.c b/scene/resources/mesh/thirdparty/mikktspace.c similarity index 100% rename from thirdparty/misc/mikktspace.c rename to scene/resources/mesh/thirdparty/mikktspace.c diff --git a/thirdparty/misc/mikktspace.h b/scene/resources/mesh/thirdparty/mikktspace.h similarity index 100% rename from thirdparty/misc/mikktspace.h rename to scene/resources/mesh/thirdparty/mikktspace.h diff --git a/scu_builders.py b/scu_builders.py index fa4bdf8..ad0c4d5 100644 --- a/scu_builders.py +++ b/scu_builders.py @@ -289,7 +289,8 @@ def generate_scu_files(verbose, is_release_build, env): if has_mbedtyls_module: process_folder(["core", "bind", "config", "containers", "error", "input", "log", "math", "object", - "os", "string", "variant", "io", "crypto"]) + "os", "string", "variant", "io", "crypto", "thirdparty/misc", + "thirdparty/zstd", "thirdparty/zlib", "thirdparty/minizip"]) else: process_folder(["core", "bind", "config", "containers", "error", "input", "log", "math", "object", "os", "string", "variant", "io", "crypto", "crypto/mbedtls/library", "thirdparty/misc", @@ -332,10 +333,10 @@ def generate_scu_files(verbose, is_release_build, env): process_folder(["modules/freetype", "brotli/common", "brotli/dec", "freetype/src/autofit", "freetype/src/base", "freetype/src/bdf", "freetype/src/bzip2", "freetype/src/cache", "freetype/src/cff", "freetype/src/cid", "freetype/src/gxvalid" - , "freetype/src/gzip", "freetype/src/lzw", "freetype/src/otvalid", "freetype/src/pcf" - , "freetype/src/pfr", "freetype/src/psaux", "freetype/src/pshinter" - , "freetype/src/psnames", "freetype/src/raster", "freetype/src/sdf", "freetype/src/svg", "freetype/src/smooth", "freetype/src/truetype" - , "freetype/src/type1", "freetype/src/type42", "freetype/src/winfonts"], [], 0, "cpp c") + "freetype/src/gzip", "freetype/src/lzw", "freetype/src/otvalid", "freetype/src/pcf", + "freetype/src/pfr", "freetype/src/psaux", "freetype/src/pshinter", + "freetype/src/psnames", "freetype/src/raster", "freetype/src/sdf", "freetype/src/svg", "freetype/src/smooth", "freetype/src/truetype", + "freetype/src/type1", "freetype/src/type42", "freetype/src/winfonts"], [], 0, "cpp c") process_folder(["modules/enet", "enet" ], [], 0, "cpp c") #process_folder(["modules/enet" ], [], 0, "cpp c") @@ -355,7 +356,7 @@ def generate_scu_files(verbose, is_release_build, env): #process_folder(["scene/main"]) #process_folder(["scene/resources", "default_theme", "font", "material", "mesh", "shapes_2d"]) - process_folder(["scene", "audio", "debugger", "2d", "animation", "gui", "gui/resources", "main", "resources", "resources/default_theme", "resources/font", "resources/material", "resources/mesh", "resources/shapes_2d" ]) + process_folder(["scene", "audio", "debugger", "2d", "animation", "gui", "gui/resources", "main", "resources", "resources/default_theme", "resources/font", "resources/material", "resources/mesh", "resources/mesh/thirdparty", "resources/shapes_2d" ]) #process_folder(["servers"]) #process_folder(["servers/rendering"])