Moved some misc thirdparty files to core.

This commit is contained in:
Relintai 2023-12-16 17:52:29 +01:00
parent 11daeb4746
commit 6dcb635a99
23 changed files with 21 additions and 18 deletions

View File

@ -50,7 +50,7 @@ env_thirdparty.disable_warnings()
# Misc thirdparty code: header paths are hardcoded, we don't need to append
# to the include path (saves a few chars on the compiler invocation for touchy MSVC...)
thirdparty_misc_dir = "#thirdparty/misc/"
thirdparty_misc_dir = "thirdparty/misc/"
thirdparty_misc_sources = [
# C sources
"fastlz.c",

View File

@ -33,7 +33,7 @@
#include "core/io/zip_io.h"
#include "core/config/project_settings.h"
#include "thirdparty/misc/fastlz.h"
#include "core/thirdparty/misc/fastlz.h"
#include <zlib.h>
#include <zstd.h>

View File

@ -37,7 +37,7 @@
#include "core/math/math_funcs.h"
#include "core/string/print_string.h"
#include "thirdparty/misc/hq2x.h"
#include "core/thirdparty/misc/hq2x.h"
#include <stdio.h>

View File

@ -33,8 +33,8 @@
#include "core/containers/local_vector.h"
#include "core/string/print_string.h"
#include "thirdparty/misc/clipper.hpp"
#include "thirdparty/misc/triangulator.h"
#include "core/thirdparty/misc/clipper.hpp"
#include "core/thirdparty/misc/triangulator.h"
#define STB_RECT_PACK_IMPLEMENTATION
#include "thirdparty/stb_rect_pack/stb_rect_pack.h"

View File

@ -35,7 +35,7 @@
#include "core/math/random_pcg.h"
#include "core/typedefs.h"
#include "thirdparty/misc/pcg.h"
#include "core/thirdparty/misc/pcg.h"
#include <float.h>
#include <math.h>

View File

@ -34,7 +34,7 @@
#include "core/math/math_defs.h"
#include "thirdparty/misc/pcg.h"
#include "core/thirdparty/misc/pcg.h"
#if defined(__GNUC__) || (_llvm_has_builtin(__builtin_clz))
#define CLZ32(x) __builtin_clz(x)

View File

@ -33,7 +33,7 @@
#include "core/containers/pair.h"
extern "C" {
#include "thirdparty/misc/smaz.h"
#include "core/thirdparty/misc/smaz.h"
}
struct _PHashTranslationCmp {

View File

@ -37,7 +37,7 @@
#include "scene/resources/shapes_2d/convex_polygon_shape_2d.h"
#include "scene/resources/shapes_2d/shape_2d.h"
#include "thirdparty/misc/triangulator.h"
#include "core/thirdparty/misc/triangulator.h"
void CollisionPolygon2D::_build_polygon() {
parent->shape_owner_clear_shapes(owner_id);

View File

@ -34,8 +34,8 @@
#include "core/core_string_names.h"
#include "core/os/main_loop.h"
#include "scene/resources/theme.h"
#include "thirdparty/misc/clipper.hpp"
#include "thirdparty/misc/triangulator.h"
#include "core/thirdparty/misc/clipper.hpp"
#include "core/thirdparty/misc/triangulator.h"
/**
PrimitiveMesh

View File

@ -292,11 +292,14 @@ def generate_scu_files(verbose, is_release_build, env):
"os", "string", "variant", "io", "crypto"])
else:
process_folder(["core", "bind", "config", "containers", "error", "input", "log", "math", "object",
"os", "string", "variant", "io", "crypto", "crypto/mbedtls/library"], [], 0, "cpp c")
"os", "string", "variant", "io", "crypto", "crypto/mbedtls/library", "thirdparty/misc"], [], 0, "cpp c")
process_folder(["drivers/gles2"])
process_folder(["drivers/unix"])
process_folder(["drivers/png"])
#process_folder(["drivers/gles2"], [], 0, "cpp c")
#process_folder(["drivers/unix"], [], 0, "cpp c")
#process_folder(["drivers/png"], [], 0, "cpp c")
process_folder(["drivers", "alsa", "coreaudio", "dummy", "gl_context", "gles_common", "gles2",
"png", "pulseaudio", "unix", "wasapi", "windows", "xaudio2"], [], 0, "cpp c")
#process_folder(["drivers", "alsa", "coreaudio", "dummy", "gl_context", "gles2", "gles_common", "png", "pulseaudio", "unix",
# "wasapi", "windows", "xaudio2" ], [], 0, "cpp c")
@ -309,10 +312,10 @@ def generate_scu_files(verbose, is_release_build, env):
#"android/export",
#"iphone/export",
#"javascript/export",
#"osx/export",
"osx/export",
#"uwp/export",
#"windows/export",
#"x11/export",
"windows/export",
"x11/export",
]
)