More cleanups.

2025-04-11 17:32:40 +02:00 · 2023-05-25 21:54:24 +02:00 · 2023-05-25 21:54:24 +02:00 · b2f4bb8314
commit b2f4bb8314
parent 6f9dd799d0
51 changed files with 121 additions and 176 deletions
--- a/9
+++ b/9
@ -1,9 +1,14 @@
 #!/usr/bin/env python

+import os
+
 Import("env")
 Import("env_modules")

 env_gdnative = env_modules.Clone()
+
+env_gdnative.Prepend(CPPPATH=[os.path.normpath(os.path.abspath("./include/"))])
+
 env_gdnative.add_source_files(env.modules_sources, "gdnative.cpp")
 env_gdnative.add_source_files(env.modules_sources, "register_types.cpp")
 env_gdnative.add_source_files(env.modules_sources, "android/*.cpp")
@ -12,8 +17,6 @@ env_gdnative.add_source_files(env.modules_sources, "nativescript/*.cpp")
 env_gdnative.add_source_files(env.modules_sources, "gdnative_library_singleton_editor.cpp")
 env_gdnative.add_source_files(env.modules_sources, "gdnative_library_editor_plugin.cpp")

-env_gdnative.Prepend(CPPPATH=["./include/"])
-
 Export("env_gdnative")

 SConscript("net/SCsub")
@ -43,7 +46,7 @@ if get_cmdline_bool("gdnative_wrapper", False):
    )

    gd_wrapper_env = env.Clone()
-    gd_wrapper_env.Prepend(CPPPATH=["#modules/gdnative/include/"])
+    gd_wrapper_env.Prepend(CPPPATH=[os.path.normpath(os.path.abspath("./include/"))])

    if gd_wrapper_env["use_lto"]:
        if not env.msvc:
--- a/gdnative.h
+++ b/gdnative.h
@ -36,7 +36,7 @@
 #include "core/os/thread_safe.h"
 #include "core/object/resource.h"

-#include "include/gdnative/gdnative.h"
+#include "include/gdn/gdnative.h"
 #include "include/gdnative_api_struct.gen.h"

 #include "core/io/config_file.h"
--- a/gdnative/aabb.cpp
+++ b/gdnative/aabb.cpp
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "gdnative/aabb.h"
+#include "gdn/aabb.h"

 #include "core/math/aabb.h"
 #include "core/variant/variant.h"
--- a/gdnative/array.cpp
+++ b/gdnative/array.cpp
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "gdnative/array.h"
+#include "gdn/array.h"

 #include "core/variant/array.h"
 #include "core/os/memory.h"
--- a/gdnative/basis.cpp
+++ b/gdnative/basis.cpp
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "gdnative/basis.h"
+#include "gdn/basis.h"

 #include "core/math/basis.h"
 #include "core/variant/variant.h"
--- a/gdnative/color.cpp
+++ b/gdnative/color.cpp
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "gdnative/color.h"
+#include "gdn/color.h"

 #include "core/math/color.h"
 #include "core/variant/variant.h"
--- a/gdnative/dictionary.cpp
+++ b/gdnative/dictionary.cpp
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "gdnative/dictionary.h"
+#include "gdn/dictionary.h"

 #include "core/variant/variant.h"
 // core/variant.h before to avoid compile errors with MSVC
--- a/gdnative/gdnative.cpp
+++ b/gdnative/gdnative.cpp
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "gdnative/gdnative.h"
+#include "gdn/gdnative.h"

 #include "core/object/class_db.h"
 #include "core/config/engine.h"
--- a/gdnative/node_path.cpp
+++ b/gdnative/node_path.cpp
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "gdnative/node_path.h"
+#include "gdn/node_path.h"

 #include "core/string/node_path.h"
 #include "core/variant/variant.h"
--- a/gdnative/plane.cpp
+++ b/gdnative/plane.cpp
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "gdnative/plane.h"
+#include "gdn/plane.h"

 #include "core/math/plane.h"
 #include "core/variant/variant.h"
--- a/gdnative/pool_arrays.cpp
+++ b/gdnative/pool_arrays.cpp
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "gdnative/pool_arrays.h"
+#include "gdn/pool_arrays.h"

 #include "core/variant/array.h"
 #include "core/containers/pool_vector.h"
--- a/gdnative/quat.cpp
+++ b/gdnative/quat.cpp
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "gdnative/quaternion.h"
+#include "gdn/quaternion.h"

 #include "core/math/quaternion.h"
 #include "core/variant/variant.h"
--- a/gdnative/rect2.cpp
+++ b/gdnative/rect2.cpp
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "gdnative/rect2.h"
+#include "gdn/rect2.h"

 #include "core/math/transform_2d.h"
 #include "core/variant/variant.h"
--- a/gdnative/rid.cpp
+++ b/gdnative/rid.cpp
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "gdnative/rid.h"
+#include "gdn/rid.h"

 #include "core/object/resource.h"
 #include "core/containers/rid.h"
--- a/gdnative/string.cpp
+++ b/gdnative/string.cpp
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "gdnative/string.h"
+#include "gdn/string.h"

 #include "core/string/string_name.h"
 #include "core/string/ustring.h"
--- a/gdnative/string_name.cpp
+++ b/gdnative/string_name.cpp
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "gdnative/string_name.h"
+#include "gdn/string_name.h"

 #include "core/string/string_name.h"
 #include "core/string/ustring.h"
--- a/gdnative/transform.cpp
+++ b/gdnative/transform.cpp
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "gdnative/transform.h"
+#include "gdn/transform.h"

 #include "core/math/transform.h"
 #include "core/variant/variant.h"
--- a/gdnative/transform2d.cpp
+++ b/gdnative/transform2d.cpp
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "gdnative/transform2d.h"
+#include "gdn/transform2d.h"

 #include "core/math/transform_2d.h"
 #include "core/variant/variant.h"
--- a/gdnative/variant.cpp
+++ b/gdnative/variant.cpp
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "gdnative/variant.h"
+#include "gdn/variant.h"

 #include "core/object/reference.h"
 #include "core/variant/variant.h"
--- a/gdnative/vector2.cpp
+++ b/gdnative/vector2.cpp
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "gdnative/vector2.h"
+#include "gdn/vector2.h"

 #include "core/math/vector2.h"
 #include "core/variant/variant.h"
--- a/gdnative/vector3.cpp
+++ b/gdnative/vector3.cpp
@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
 /**************************************************************************/

-#include "gdnative/vector3.h"
+#include "gdn/vector3.h"

 #include "core/variant/variant.h"
 #include "core/containers/vector.h"
--- a/gdnative_api.json
+++ b/gdnative_api.json
@ -5076,7 +5076,7 @@
            },
            {
                "name": "godot_string_operator_index",
-                "return_type": "const wchar_t *",
+                "return_type": "const char32_t *",
                "arguments": [
                    ["godot_string *", "p_self"],
                    ["const godot_int", "p_idx"]
@ -5084,7 +5084,7 @@
            },
            {
                "name": "godot_string_operator_index_const",
-                "return_type": "wchar_t",
+                "return_type": "char32_t",
                "arguments": [
                    ["const godot_string *", "p_self"],
                    ["const godot_int", "p_idx"]
@ -5092,7 +5092,7 @@
            },
            {
                "name": "godot_string_wide_str",
-                "return_type": "const wchar_t *",
+                "return_type": "const char32_t *",
                "arguments": [
                    ["const godot_string *", "p_self"]
                ]
--- a/gdnative_builders.py
+++ b/gdnative_builders.py
@ -42,7 +42,7 @@ def _build_gdnative_api_struct_header(api):
        "#ifndef GODOT_GDNATIVE_API_STRUCT_H",
        "#define GODOT_GDNATIVE_API_STRUCT_H",
        "",
-        "#include <gdnative/gdnative.h>",
+        "#include <gdn/gdnative.h>",
        "#include <android/godot_android.h>",
        "#include <nativescript/godot_nativescript.h>",
        "#include <net/godot_net.h>",
@ -282,7 +282,7 @@ def _build_gdnative_wrapper_code(api):
    out = [
        "/* THIS FILE IS GENERATED DO NOT EDIT */",
        "",
-        "#include <gdnative/gdnative.h>",
+        "#include <gdn/gdnative.h>",
        "#include <nativescript/godot_nativescript.h>",
        "#include <pluginscript/godot_pluginscript.h>",
        "#include <videodecoder/godot_videodecoder.h>",
--- a/include/android/godot_android.h
+++ b/include/android/godot_android.h
@ -31,7 +31,7 @@
 #ifndef GODOT_ANDROID_H
 #define GODOT_ANDROID_H

-#include <gdnative/gdnative.h>
+#include <gdn/gdnative.h>

 #ifdef __ANDROID__
 #include <jni.h>
--- a/include/gdnative/aabb.h
+++ b/include/gdnative/aabb.h
@ -51,9 +51,9 @@ typedef struct {
 }
 #endif

-#include <gdnative/gdnative.h>
-#include <gdnative/plane.h>
-#include <gdnative/vector3.h>
+#include <gdn/gdnative.h>
+#include <gdn/plane.h>
+#include <gdn/vector3.h>

 #ifdef __cplusplus
 extern "C" {
--- a/include/gdnative/array.h
+++ b/include/gdnative/array.h
@ -51,10 +51,10 @@ typedef struct {
 }
 #endif

-#include <gdnative/pool_arrays.h>
-#include <gdnative/variant.h>
+#include <gdn/pool_arrays.h>
+#include <gdn/variant.h>

-#include <gdnative/gdnative.h>
+#include <gdn/gdnative.h>

 #ifdef __cplusplus
 extern "C" {
--- a/include/gdnative/basis.h
+++ b/include/gdnative/basis.h
@ -51,9 +51,9 @@ typedef struct {
 }
 #endif

-#include <gdnative/gdnative.h>
-#include <gdnative/quaternion.h>
-#include <gdnative/vector3.h>
+#include <gdn/gdnative.h>
+#include <gdn/quaternion.h>
+#include <gdn/vector3.h>

 #ifdef __cplusplus
 extern "C" {
--- a/include/gdnative/color.h
+++ b/include/gdnative/color.h
@ -51,8 +51,8 @@ typedef struct {
 }
 #endif

-#include <gdnative/gdnative.h>
-#include <gdnative/string.h>
+#include <gdn/gdnative.h>
+#include <gdn/string.h>

 #ifdef __cplusplus
 extern "C" {
--- a/include/gdnative/dictionary.h
+++ b/include/gdnative/dictionary.h
@ -51,9 +51,9 @@ typedef struct {
 }
 #endif

-#include <gdnative/array.h>
-#include <gdnative/gdnative.h>
-#include <gdnative/variant.h>
+#include <gdn/array.h>
+#include <gdn/gdnative.h>
+#include <gdn/variant.h>

 #ifdef __cplusplus
 extern "C" {
--- a/include/gdnative/gdnative.h
+++ b/include/gdnative/gdnative.h
@ -142,76 +142,76 @@ typedef void godot_object;

 /////// String

-#include <gdnative/string.h>
+#include <gdn/string.h>

 /////// String name

-#include <gdnative/string_name.h>
+#include <gdn/string_name.h>

 ////// Vector2

-#include <gdnative/vector2.h>
+#include <gdn/vector2.h>

 ////// Rect2

-#include <gdnative/rect2.h>
+#include <gdn/rect2.h>

 ////// Vector3

-#include <gdnative/vector3.h>
+#include <gdn/vector3.h>

 ////// Transform2D

-#include <gdnative/transform2d.h>
+#include <gdn/transform2d.h>

 /////// Plane

-#include <gdnative/plane.h>
+#include <gdn/plane.h>

 /////// Quaternion

-#include <gdnative/quaternion.h>
+#include <gdn/quaternion.h>

 /////// AABB

-#include <gdnative/aabb.h>
+#include <gdn/aabb.h>

 /////// Basis

-#include <gdnative/basis.h>
+#include <gdn/basis.h>

 /////// Transform

-#include <gdnative/transform.h>
+#include <gdn/transform.h>

 /////// Color

-#include <gdnative/color.h>
+#include <gdn/color.h>

 /////// NodePath

-#include <gdnative/node_path.h>
+#include <gdn/node_path.h>

 /////// RID

-#include <gdnative/rid.h>
+#include <gdn/rid.h>

 /////// Dictionary

-#include <gdnative/dictionary.h>
+#include <gdn/dictionary.h>

 /////// Array

-#include <gdnative/array.h>
+#include <gdn/array.h>

 // single API file for Pool*Array
-#include <gdnative/pool_arrays.h>
+#include <gdn/pool_arrays.h>

 void GDAPI godot_object_destroy(godot_object *p_o);

 ////// Variant

-#include <gdnative/variant.h>
+#include <gdn/variant.h>

 ////// Singleton API

--- a/include/gdnative/node_path.h
+++ b/include/gdnative/node_path.h
@ -51,8 +51,8 @@ typedef struct {
 }
 #endif

-#include <gdnative/gdnative.h>
-#include <gdnative/string.h>
+#include <gdn/gdnative.h>
+#include <gdn/string.h>

 #ifdef __cplusplus
 extern "C" {
--- a/include/gdnative/plane.h
+++ b/include/gdnative/plane.h
@ -51,8 +51,8 @@ typedef struct {
 }
 #endif

-#include <gdnative/gdnative.h>
-#include <gdnative/vector3.h>
+#include <gdn/gdnative.h>
+#include <gdn/vector3.h>

 #ifdef __cplusplus
 extern "C" {
--- a/include/gdnative/pool_arrays.h
+++ b/include/gdnative/pool_arrays.h
@ -151,12 +151,12 @@ typedef struct {
 }
 #endif

-#include <gdnative/array.h>
-#include <gdnative/color.h>
-#include <gdnative/vector2.h>
-#include <gdnative/vector3.h>
+#include <gdn/array.h>
+#include <gdn/color.h>
+#include <gdn/vector2.h>
+#include <gdn/vector3.h>

-#include <gdnative/gdnative.h>
+#include <gdn/gdnative.h>

 #ifdef __cplusplus
 extern "C" {
--- a/include/gdnative/quaternion.h
+++ b/include/gdnative/quaternion.h
@ -51,8 +51,8 @@ typedef struct {
 }
 #endif

-#include <gdnative/gdnative.h>
-#include <gdnative/vector3.h>
+#include <gdn/gdnative.h>
+#include <gdn/vector3.h>

 #ifdef __cplusplus
 extern "C" {
--- a/include/gdnative/rect2.h
+++ b/include/gdnative/rect2.h
@ -49,8 +49,8 @@ typedef struct godot_rect2 {
 }
 #endif

-#include <gdnative/gdnative.h>
-#include <gdnative/vector2.h>
+#include <gdn/gdnative.h>
+#include <gdn/vector2.h>

 #ifdef __cplusplus
 extern "C" {
--- a/include/gdnative/rid.h
+++ b/include/gdnative/rid.h
@ -51,7 +51,7 @@ typedef struct {
 }
 #endif

-#include <gdnative/gdnative.h>
+#include <gdn/gdnative.h>

 #ifdef __cplusplus
 extern "C" {
--- a/include/gdnative/string.h
+++ b/include/gdnative/string.h
@ -64,9 +64,9 @@ typedef struct {
 }
 #endif

-#include <gdnative/array.h>
-#include <gdnative/gdnative.h>
-#include <gdnative/variant.h>
+#include <gdn/array.h>
+#include <gdn/gdnative.h>
+#include <gdn/variant.h>

 #ifdef __cplusplus
 extern "C" {
--- a/include/gdnative/string_name.h
+++ b/include/gdnative/string_name.h
@ -52,7 +52,7 @@ typedef struct {
 }
 #endif

-#include <gdnative/gdnative.h>
+#include <gdn/gdnative.h>

 #ifdef __cplusplus
 extern "C" {
--- a/include/gdnative/transform.h
+++ b/include/gdnative/transform.h
@ -51,10 +51,10 @@ typedef struct {
 }
 #endif

-#include <gdnative/basis.h>
-#include <gdnative/gdnative.h>
-#include <gdnative/variant.h>
-#include <gdnative/vector3.h>
+#include <gdn/basis.h>
+#include <gdn/gdnative.h>
+#include <gdn/variant.h>
+#include <gdn/vector3.h>

 #ifdef __cplusplus
 extern "C" {
--- a/include/gdnative/transform2d.h
+++ b/include/gdnative/transform2d.h
@ -51,9 +51,9 @@ typedef struct {
 }
 #endif

-#include <gdnative/gdnative.h>
-#include <gdnative/variant.h>
-#include <gdnative/vector2.h>
+#include <gdn/gdnative.h>
+#include <gdn/variant.h>
+#include <gdn/vector2.h>

 #ifdef __cplusplus
 extern "C" {
--- a/include/gdnative/variant.h
+++ b/include/gdnative/variant.h
@ -144,25 +144,25 @@ typedef enum godot_variant_operator {
 }
 #endif

-#include <gdnative/aabb.h>
-#include <gdnative/array.h>
-#include <gdnative/basis.h>
-#include <gdnative/color.h>
-#include <gdnative/dictionary.h>
-#include <gdnative/node_path.h>
-#include <gdnative/plane.h>
-#include <gdnative/pool_arrays.h>
-#include <gdnative/quaternion.h>
-#include <gdnative/rect2.h>
-#include <gdnative/rid.h>
-#include <gdnative/string.h>
-#include <gdnative/transform.h>
-#include <gdnative/transform2d.h>
-#include <gdnative/variant.h>
-#include <gdnative/vector2.h>
-#include <gdnative/vector3.h>
+#include <gdn/aabb.h>
+#include <gdn/array.h>
+#include <gdn/basis.h>
+#include <gdn/color.h>
+#include <gdn/dictionary.h>
+#include <gdn/node_path.h>
+#include <gdn/plane.h>
+#include <gdn/pool_arrays.h>
+#include <gdn/quaternion.h>
+#include <gdn/rect2.h>
+#include <gdn/rid.h>
+#include <gdn/string.h>
+#include <gdn/transform.h>
+#include <gdn/transform2d.h>
+#include <gdn/variant.h>
+#include <gdn/vector2.h>
+#include <gdn/vector3.h>

-#include <gdnative/gdnative.h>
+#include <gdn/gdnative.h>

 #ifdef __cplusplus
 extern "C" {
--- a/include/gdnative/vector2.h
+++ b/include/gdnative/vector2.h
@ -51,7 +51,7 @@ typedef struct {
 }
 #endif

-#include <gdnative/gdnative.h>
+#include <gdn/gdnative.h>

 #ifdef __cplusplus
 extern "C" {
--- a/include/gdnative/vector3.h
+++ b/include/gdnative/vector3.h
@ -51,8 +51,8 @@ typedef struct {
 }
 #endif

-#include <gdnative/basis.h>
-#include <gdnative/gdnative.h>
+#include <gdn/basis.h>
+#include <gdn/gdnative.h>

 #ifdef __cplusplus
 extern "C" {
--- a/include/nativescript/godot_nativescript.h
+++ b/include/nativescript/godot_nativescript.h
@ -31,7 +31,7 @@
 #ifndef GODOT_NATIVESCRIPT_H
 #define GODOT_NATIVESCRIPT_H

-#include <gdnative/gdnative.h>
+#include <gdn/gdnative.h>

 #ifdef __cplusplus
 extern "C" {
--- a/include/net/godot_net.h
+++ b/include/net/godot_net.h
@ -31,7 +31,7 @@
 #ifndef GODOT_NET_H
 #define GODOT_NET_H

-#include <gdnative/gdnative.h>
+#include <gdn/gdnative.h>

 #ifdef __cplusplus
 extern "C" {
--- a/include/pluginscript/godot_pluginscript.h
+++ b/include/pluginscript/godot_pluginscript.h
@ -31,7 +31,7 @@
 #ifndef GODOT_PLUGINSCRIPT_H
 #define GODOT_PLUGINSCRIPT_H

-#include <gdnative/gdnative.h>
+#include <gdn/gdnative.h>
 #include <nativescript/godot_nativescript.h>

 #ifdef __cplusplus
--- a/include/videodecoder/godot_videodecoder.h
+++ b/include/videodecoder/godot_videodecoder.h
@ -31,7 +31,7 @@
 #ifndef GODOT_VIDEODECODER_H
 #define GODOT_VIDEODECODER_H

-#include <gdnative/gdnative.h>
+#include <gdn/gdnative.h>

 #ifdef __cplusplus
 extern "C" {
--- a/net/multiplayer_peer_gdnative.h
+++ b/net/multiplayer_peer_gdnative.h
@ -33,8 +33,8 @@

 #include "core/io/networked_multiplayer_peer.h"

-#include "../include/gdnative/gdnative.h"
-#include "../include/net/godot_net.h"
+#include "gdn/gdnative.h"
+#include "net/godot_net.h"

 class MultiplayerPeerGDNative : public NetworkedMultiplayerPeer {
 	GDCLASS(MultiplayerPeerGDNative, NetworkedMultiplayerPeer);
--- a/net/packet_peer_gdnative.h
+++ b/net/packet_peer_gdnative.h
@ -33,8 +33,8 @@

 #include "core/io/packet_peer.h"

-#include "../include/gdnative/gdnative.h"
-#include "../include/net/godot_net.h"
+#include "gdn/gdnative.h"
+#include "net/godot_net.h"

 class PacketPeerGDNative : public PacketPeer {
 	GDCLASS(PacketPeerGDNative, PacketPeer);
--- a/net/webrtc_gdnative.cpp
+++ b/net/webrtc_gdnative.cpp
@ -1,60 +0,0 @@
-/**************************************************************************/
-/*  webrtc_gdnative.cpp                                                   */
-/**************************************************************************/
-/*                         This file is part of:                          */
-/*                             GODOT ENGINE                               */
-/*                        https://godotengine.org                         */
-/**************************************************************************/
-/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
-/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
-/*                                                                        */
-/* Permission is hereby granted, free of charge, to any person obtaining  */
-/* a copy of this software and associated documentation files (the        */
-/* "Software"), to deal in the Software without restriction, including    */
-/* without limitation the rights to use, copy, modify, merge, publish,    */
-/* distribute, sublicense, and/or sell copies of the Software, and to     */
-/* permit persons to whom the Software is furnished to do so, subject to  */
-/* the following conditions:                                              */
-/*                                                                        */
-/* The above copyright notice and this permission notice shall be         */
-/* included in all copies or substantial portions of the Software.        */
-/*                                                                        */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
-/**************************************************************************/
-
-#include "../gdnative.h"
-#include "../include/net/godot_net.h"
-
-#ifdef WEBRTC_GDNATIVE_ENABLED
-#include "webrtc/webrtc_data_channel_gdnative.h"
-#include "webrtc/webrtc_peer_connection_gdnative.h"
-#endif
-
-extern "C" {
-
-void GDAPI godot_net_bind_webrtc_peer_connection(godot_object *p_obj, const godot_net_webrtc_peer_connection *p_impl) {
-#ifdef WEBRTC_GDNATIVE_ENABLED
-	((WebRTCPeerConnectionGDNative *)p_obj)->set_native_webrtc_peer_connection(p_impl);
-#endif
-}
-
-void GDAPI godot_net_bind_webrtc_data_channel(godot_object *p_obj, const godot_net_webrtc_data_channel *p_impl) {
-#ifdef WEBRTC_GDNATIVE_ENABLED
-	((WebRTCDataChannelGDNative *)p_obj)->set_native_webrtc_data_channel(p_impl);
-#endif
-}
-
-godot_error GDAPI godot_net_set_webrtc_library(const godot_net_webrtc_library *p_lib) {
-#ifdef WEBRTC_GDNATIVE_ENABLED
-	return (godot_error)WebRTCPeerConnectionGDNative::set_default_library(p_lib);
-#else
-	return (godot_error)ERR_UNAVAILABLE;
-#endif
-}
-}
--- a/videodecoder/SCsub
+++ b/videodecoder/SCsub
@ -1,9 +1,11 @@
 #!/usr/bin/env python

+import os
+
 Import("env")
 Import("env_modules")

 env_vsdecoder_gdnative = env_modules.Clone()

-env_vsdecoder_gdnative.Prepend(CPPPATH=["#modules/gdnative/include/"])
+env_vsdecoder_gdnative.Prepend(CPPPATH=[os.path.normpath(os.path.abspath("../include/"))])
 env_vsdecoder_gdnative.add_source_files(env.modules_sources, "*.cpp")