Deref Godot: thirdparty/

This commit is contained in:
Dubhghlas McLaughlin
2024-10-09 13:27:05 -05:00
parent aec07ce42c
commit ea37447607
9 changed files with 23 additions and 23 deletions

View File

@@ -13,7 +13,7 @@ extern "C"
#include <stdint.h> #include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
// -- Godot start -- // -- Redot start --
#if 0 #if 0
#ifdef _WIN32 #ifdef _WIN32
#include "enet/win32.h" #include "enet/win32.h"
@@ -22,7 +22,7 @@ extern "C"
#endif #endif
#endif #endif
#include "enet/godot.h" #include "enet/godot.h"
// -- Godot end -- // -- Redot end --
#include "enet/types.h" #include "enet/types.h"
#include "enet/protocol.h" #include "enet/protocol.h"
@@ -93,7 +93,7 @@ typedef enum _ENetSocketShutdown
* but not for enet_host_create. Once a server responds to a broadcast, the * but not for enet_host_create. Once a server responds to a broadcast, the
* address is updated from ENET_HOST_BROADCAST to the server's actual IP address. * address is updated from ENET_HOST_BROADCAST to the server's actual IP address.
*/ */
// -- Godot start -- // -- Redot start --
#if 0 #if 0
typedef struct _ENetAddress typedef struct _ENetAddress
{ {
@@ -101,7 +101,7 @@ typedef struct _ENetAddress
enet_uint16 port; enet_uint16 port;
} ENetAddress; } ENetAddress;
#endif #endif
// -- Godot end -- // -- Redot end --
/** /**
* Packet flag bit constants. * Packet flag bit constants.
@@ -618,9 +618,9 @@ ENET_API size_t enet_range_coder_decompress (void *, const enet_uint8 *, size_t,
extern size_t enet_protocol_command_size (enet_uint8); extern size_t enet_protocol_command_size (enet_uint8);
// -- Godot start -- // -- Redot start --
#include "enet/godot_ext.h" #include "enet/godot_ext.h"
// -- Godot end -- // -- Redot end --
#ifdef __cplusplus #ifdef __cplusplus
} }

View File

@@ -32,7 +32,7 @@
/** /**
@file godot.h @file godot.h
@brief ENet Godot header @brief ENet Redot header
*/ */
#ifndef __ENET_GODOT_H__ #ifndef __ENET_GODOT_H__

View File

@@ -32,7 +32,7 @@
/** /**
@file godot.cpp @file godot.cpp
@brief ENet Godot specific functions @brief ENet Redot specific functions
*/ */
#include "core/io/dtls_server.h" #include "core/io/dtls_server.h"

View File

@@ -9,7 +9,7 @@ index 4a207041b3..5232f8a869 100644
+#include <stdint.h> +#include <stdint.h>
#include <stdlib.h> #include <stdlib.h>
+// -- Godot start -- +// -- Redot start --
+#if 0 +#if 0
#ifdef _WIN32 #ifdef _WIN32
#include "enet/win32.h" #include "enet/win32.h"
@@ -18,7 +18,7 @@ index 4a207041b3..5232f8a869 100644
#endif #endif
+#endif +#endif
+#include "enet/godot.h" +#include "enet/godot.h"
+// -- Godot end -- +// -- Redot end --
#include "enet/types.h" #include "enet/types.h"
#include "enet/protocol.h" #include "enet/protocol.h"
@@ -26,7 +26,7 @@ index 4a207041b3..5232f8a869 100644
* but not for enet_host_create. Once a server responds to a broadcast, the * but not for enet_host_create. Once a server responds to a broadcast, the
* address is updated from ENET_HOST_BROADCAST to the server's actual IP address. * address is updated from ENET_HOST_BROADCAST to the server's actual IP address.
*/ */
+// -- Godot start -- +// -- Redot start --
+#if 0 +#if 0
typedef struct _ENetAddress typedef struct _ENetAddress
{ {
@@ -34,7 +34,7 @@ index 4a207041b3..5232f8a869 100644
enet_uint16 port; enet_uint16 port;
} ENetAddress; } ENetAddress;
+#endif +#endif
+// -- Godot end -- +// -- Redot end --
/** /**
* Packet flag bit constants. * Packet flag bit constants.
@@ -42,9 +42,9 @@ index 4a207041b3..5232f8a869 100644
extern size_t enet_protocol_command_size (enet_uint8); extern size_t enet_protocol_command_size (enet_uint8);
+// -- Godot start -- +// -- Redot start --
+#include "enet/godot_ext.h" +#include "enet/godot_ext.h"
+// -- Godot end -- +// -- Redot end --
+ +
#ifdef __cplusplus #ifdef __cplusplus
} }

View File

@@ -6,10 +6,10 @@ index 6d8202d277..8f9a3c8668 100644
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Performs trellis-optimized quantization. // Performs trellis-optimized quantization.
+// -- GODOT start -- +// -- REDOT start --
+// Prevents Visual Studio debugger from using this Node struct in place of the Godot Node class. +// Prevents Visual Studio debugger from using this Node struct in place of the Redot Node class.
+#define Node Node_libwebp_quant +#define Node Node_libwebp_quant
+// -- GODOT end -- +// -- REDOT end --
+ +
// Trellis node // Trellis node
typedef struct { typedef struct {

View File

@@ -556,10 +556,10 @@ static void AddScore(VP8ModeScore* WEBP_RESTRICT const dst,
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// Performs trellis-optimized quantization. // Performs trellis-optimized quantization.
// -- GODOT start -- // -- REDOT start --
// Prevents Visual Studio debugger from using this Node struct in place of the Godot Node class. // Prevents Visual Studio debugger from using this Node struct in place of the Redot Node class.
#define Node Node_libwebp_quant #define Node Node_libwebp_quant
// -- GODOT end -- // -- REDOT end --
// Trellis node // Trellis node
typedef struct { typedef struct {

View File

@@ -1,7 +1,7 @@
#ifndef MINIUPNPCSTRINGS_H_INCLUDED #ifndef MINIUPNPCSTRINGS_H_INCLUDED
#define MINIUPNPCSTRINGS_H_INCLUDED #define MINIUPNPCSTRINGS_H_INCLUDED
#define OS_STRING "Godot Engine/1.0" #define OS_STRING "Redot Engine/1.0"
#define MINIUPNPC_VERSION_STRING "2.2.8" #define MINIUPNPC_VERSION_STRING "2.2.8"
#if 0 #if 0

View File

@@ -26,7 +26,7 @@ ship it.
/* /*
* Please note that this version has been modified for various reasons: * Please note that this version has been modified for various reasons:
* 1. Using the Godot core typedefs * 1. Using the Redot core typedefs
* 2. At some point or another the code relied on the byte order of a uint32_t, this has been fixed * 2. At some point or another the code relied on the byte order of a uint32_t, this has been fixed
* 3. Output has been reordered to struct { uint8_t r, g, b, a; } precisely in accordance with the function names * 3. Output has been reordered to struct { uint8_t r, g, b, a; } precisely in accordance with the function names
* 4. Removing unused 'dither' parameter * 4. Removing unused 'dither' parameter

View File

@@ -1,7 +1,7 @@
#ifndef CONFIG_H #ifndef CONFIG_H
#define CONFIG_H #define CONFIG_H
/* This configuration file is custom written for Godot. /* This configuration file is custom written for Redot.
* When updating the library, generate it with CMake upstream and compare * When updating the library, generate it with CMake upstream and compare
* the contents to see if new options should be backported here. * the contents to see if new options should be backported here.
*/ */