diff options
| author | Lyuma <xn.lyuma@gmail.com> | 2023-04-06 14:31:20 -0700 |
|---|---|---|
| committer | Lyuma <xn.lyuma@gmail.com> | 2023-04-06 14:31:20 -0700 |
| commit | b3a83b7c4eb633f74bfa1c21a859af15057b6731 (patch) | |
| tree | b18fb05bb6500694876cdc87b5ac89f731376f39 | |
| parent | 92b7a9603aa2395be6bf361067096538ba393c45 (diff) | |
| download | redot-engine-b3a83b7c4eb633f74bfa1c21a859af15057b6731.tar.gz | |
Fix Node class in MSVC debugger for dev_build
| -rw-r--r-- | thirdparty/README.md | 2 | ||||
| -rw-r--r-- | thirdparty/libwebp/godot-node-debug-fix.patch | 16 | ||||
| -rw-r--r-- | thirdparty/libwebp/src/enc/quant_enc.c | 5 |
3 files changed, 23 insertions, 0 deletions
diff --git a/thirdparty/README.md b/thirdparty/README.md index 3b23d16cf0..daff93e329 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -361,6 +361,8 @@ Files extracted from upstream source: - `src/` and `sharpyuv/` except from: `.am`, `.rc` and `.in` files - `AUTHORS`, `COPYING`, `PATENTS` +Patch `godot-node-debug-fix.patch` workarounds shadowing of godot's Node class in the MSVC debugger. + ## mbedtls diff --git a/thirdparty/libwebp/godot-node-debug-fix.patch b/thirdparty/libwebp/godot-node-debug-fix.patch new file mode 100644 index 0000000000..848664dccf --- /dev/null +++ b/thirdparty/libwebp/godot-node-debug-fix.patch @@ -0,0 +1,16 @@ +diff --git a/thirdparty/libwebp/src/enc/quant_enc.c b/thirdparty/libwebp/src/enc/quant_enc.c +index 6d8202d277..8f9a3c8668 100644 +--- a/src/enc/quant_enc.c ++++ b/src/enc/quant_enc.c +@@ -556,6 +556,11 @@ static void AddScore(VP8ModeScore* WEBP_RESTRICT const dst, + //------------------------------------------------------------------------------ + // Performs trellis-optimized quantization. + ++// -- GODOT start -- ++// Prevents Visual Studio debugger from using this Node struct in place of the Godot Node class. ++#define Node Node_libwebp_quant ++// -- GODOT end -- ++ + // Trellis node + typedef struct { + int8_t prev; // best previous node diff --git a/thirdparty/libwebp/src/enc/quant_enc.c b/thirdparty/libwebp/src/enc/quant_enc.c index 6d8202d277..8f9a3c8668 100644 --- a/thirdparty/libwebp/src/enc/quant_enc.c +++ b/thirdparty/libwebp/src/enc/quant_enc.c @@ -556,6 +556,11 @@ static void AddScore(VP8ModeScore* WEBP_RESTRICT const dst, //------------------------------------------------------------------------------ // Performs trellis-optimized quantization. +// -- GODOT start -- +// Prevents Visual Studio debugger from using this Node struct in place of the Godot Node class. +#define Node Node_libwebp_quant +// -- GODOT end -- + // Trellis node typedef struct { int8_t prev; // best previous node |