diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7001be7 --- /dev/null +++ b/.gitignore @@ -0,0 +1,8 @@ +.import +*.d +*.o +*.meta +*.obj +*.pyc +*.bc +*.os \ No newline at end of file diff --git a/SCsub b/SCsub index 72ad1ea..79d7e2e 100644 --- a/SCsub +++ b/SCsub @@ -9,9 +9,8 @@ env_webp = env_modules.Clone() thirdparty_obj = [] -if env["builtin_libwebp"]: - thirdparty_dir = "#thirdparty/libwebp/" - thirdparty_sources = [ +thirdparty_dir = "./thirdparty/libwebp/" +thirdparty_sources = [ "sharpyuv/sharpyuv.c", "sharpyuv/sharpyuv_csp.c", "sharpyuv/sharpyuv_dsp.c", @@ -133,15 +132,16 @@ if env["builtin_libwebp"]: "src/utils/rescaler_utils.c", "src/utils/thread_utils.c", "src/utils/utils.c", - ] - thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] +] - env_webp.Prepend(CPPPATH=[thirdparty_dir, thirdparty_dir + "src/"]) +thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] - env_thirdparty = env_webp.Clone() - env_thirdparty.disable_warnings() - env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources) - env.modules_sources += thirdparty_obj +env_webp.Prepend(CPPPATH=[thirdparty_dir, thirdparty_dir + "src/"]) + +env_thirdparty = env_webp.Clone() +env_thirdparty.disable_warnings() +env_thirdparty.add_source_files(thirdparty_obj, thirdparty_sources) +env.modules_sources += thirdparty_obj # Godot source files diff --git a/image_loader_webp.cpp b/image_loader_webp.cpp index b410e68..29317f4 100644 --- a/image_loader_webp.cpp +++ b/image_loader_webp.cpp @@ -32,8 +32,8 @@ #include "core/io/marshalls.h" #include "core/os/os.h" -#include "core/print_string.h" -#include "core/project_settings.h" +#include "core/string/print_string.h" +#include "core/config/project_settings.h" #include #include