Relintai/pandemonium_engine_minimal
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine_minimal.git synced 2024-11-17 22:17:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved mikktspace.

Browse Source
This commit is contained in:
Relintai 2023-12-16 18:28:07 +01:00
parent bac8d3d2d3
commit 94c7f0a442
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scene/resources/SCsub
View File

@ -6,7 +6,7 @@ Import("env")
thirdparty_obj = [] thirdparty_obj = []
thirdparty_sources = "#thirdparty/misc/mikktspace.c" thirdparty_sources = "mesh/thirdparty/mikktspace.c"
env_thirdparty = env.Clone() env_thirdparty = env.Clone()
env_thirdparty.disable_warnings() env_thirdparty.disable_warnings()

2
scene/resources/mesh/surface_tool.h
View File

@ -32,7 +32,7 @@
#include "scene/resources/mesh/mesh.h" #include "scene/resources/mesh/mesh.h"
#include "thirdparty/misc/mikktspace.h" #include "thirdparty/mikktspace.h"
class SurfaceTool : public Reference { class SurfaceTool : public Reference {
GDCLASS(SurfaceTool, Reference); GDCLASS(SurfaceTool, Reference);

0
thirdparty/misc/mikktspace.c → scene/resources/mesh/thirdparty/mikktspace.c vendored
View File

0
thirdparty/misc/mikktspace.h → scene/resources/mesh/thirdparty/mikktspace.h vendored
View File

13
scu_builders.py
View File

@ -289,7 +289,8 @@ def generate_scu_files(verbose, is_release_build, env):
if has_mbedtyls_module: if has_mbedtyls_module:
process_folder(["core", "bind", "config", "containers", "error", "input", "log", "math", "object", 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: else:
process_folder(["core", "bind", "config", "containers", "error", "input", "log", "math", "object", process_folder(["core", "bind", "config", "containers", "error", "input", "log", "math", "object",
"os", "string", "variant", "io", "crypto", "crypto/mbedtls/library", "thirdparty/misc", "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", 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/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/gzip", "freetype/src/lzw", "freetype/src/otvalid", "freetype/src/pcf",
, "freetype/src/pfr", "freetype/src/psaux", "freetype/src/pshinter" "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/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/type1", "freetype/src/type42", "freetype/src/winfonts"], [], 0, "cpp c")
process_folder(["modules/enet", "enet" ], [], 0, "cpp c") process_folder(["modules/enet", "enet" ], [], 0, "cpp c")
#process_folder(["modules/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/main"])
#process_folder(["scene/resources", "default_theme", "font", "material", "mesh", "shapes_2d"]) #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"])
#process_folder(["servers/rendering"]) #process_folder(["servers/rendering"])