feat: modules moved and engine moved to submodule
This commit is contained in:
parent
dfb5e645cd
commit
c33d2130cc
5136 changed files with 225275 additions and 64485 deletions
|
|
@ -65,7 +65,7 @@ if env["module_webp_enabled"]:
|
|||
|
||||
thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]
|
||||
|
||||
env_svg.Prepend(CPPPATH=[thirdparty_dir + "inc"])
|
||||
env_svg.Prepend(CPPEXTPATH=[thirdparty_dir + "inc"])
|
||||
|
||||
# Enable ThorVG static object linking.
|
||||
env_svg.Append(CPPDEFINES=["TVG_STATIC"])
|
||||
|
|
@ -75,7 +75,7 @@ env_svg.Append(CPPDEFINES=["THORVG_FILE_IO_SUPPORT"])
|
|||
env_thirdparty = env_svg.Clone()
|
||||
env_thirdparty.disable_warnings()
|
||||
env_thirdparty.Prepend(
|
||||
CPPPATH=[
|
||||
CPPEXTPATH=[
|
||||
thirdparty_dir + "src/common",
|
||||
thirdparty_dir + "src/loaders/svg",
|
||||
thirdparty_dir + "src/renderer",
|
||||
|
|
@ -86,11 +86,11 @@ env_thirdparty.Prepend(
|
|||
]
|
||||
)
|
||||
if env["builtin_libpng"]:
|
||||
env_thirdparty.Prepend(CPPPATH=["#thirdparty/libpng"])
|
||||
env_thirdparty.Prepend(CPPEXTPATH=["#thirdparty/libpng"])
|
||||
if env["module_webp_enabled"]:
|
||||
env_thirdparty.Prepend(CPPPATH=[thirdparty_dir + "src/loaders/external_webp"])
|
||||
env_thirdparty.Prepend(CPPEXTPATH=[thirdparty_dir + "src/loaders/external_webp"])
|
||||
if env["builtin_libwebp"]:
|
||||
env_thirdparty.Prepend(CPPPATH=["#thirdparty/libwebp/src"])
|
||||
env_thirdparty.Prepend(CPPEXTPATH=["#thirdparty/libwebp/src"])
|
||||
|
||||
env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources)
|
||||
env.modules_sources += thirdparty_obj
|
||||
|
|
|
|||
|
|
@ -161,7 +161,7 @@ Error ImageLoaderSVG::load_image(Ref<Image> p_image, Ref<FileAccess> p_fileacces
|
|||
p_fileaccess->get_buffer(buffer.ptrw(), buffer.size());
|
||||
|
||||
String svg;
|
||||
Error err = svg.parse_utf8((const char *)buffer.ptr(), buffer.size());
|
||||
Error err = svg.append_utf8((const char *)buffer.ptr(), buffer.size());
|
||||
if (err != OK) {
|
||||
return err;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,8 +28,7 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/**************************************************************************/
|
||||
|
||||
#ifndef IMAGE_LOADER_SVG_H
|
||||
#define IMAGE_LOADER_SVG_H
|
||||
#pragma once
|
||||
|
||||
#include "core/io/image_loader.h"
|
||||
|
||||
|
|
@ -53,5 +52,3 @@ public:
|
|||
|
||||
ImageLoaderSVG();
|
||||
};
|
||||
|
||||
#endif // IMAGE_LOADER_SVG_H
|
||||
|
|
|
|||
|
|
@ -28,12 +28,9 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/**************************************************************************/
|
||||
|
||||
#ifndef SVG_REGISTER_TYPES_H
|
||||
#define SVG_REGISTER_TYPES_H
|
||||
#pragma once
|
||||
|
||||
#include "modules/register_module_types.h"
|
||||
|
||||
void initialize_svg_module(ModuleInitializationLevel p_level);
|
||||
void uninitialize_svg_module(ModuleInitializationLevel p_level);
|
||||
|
||||
#endif // SVG_REGISTER_TYPES_H
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue