diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-09-04 21:51:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-04 21:51:07 +0200 |
| commit | e979e50b7d83a90c39c206783b15c1ff3a43fb0d (patch) | |
| tree | 45c66640fbf82b4e1226f51cec3da548f8488e51 /modules/gdnative/gdnative.h | |
| parent | f9d9e9099cd04a112598d65ac67a05eb78139e4a (diff) | |
| parent | 54a9c1ee43673803e8992ebdcb9e8fca3c367487 (diff) | |
| download | redot-engine-e979e50b7d83a90c39c206783b15c1ff3a43fb0d.tar.gz | |
Merge pull request #10921 from karroffel/gdnative-MERGE-EVERYTHING
[GDNative] merge of NativeScript and GDNative, new GDNative singletons
Diffstat (limited to 'modules/gdnative/gdnative.h')
| -rw-r--r-- | modules/gdnative/gdnative.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/modules/gdnative/gdnative.h b/modules/gdnative/gdnative.h index dc1c3507ec..4753c7efe5 100644 --- a/modules/gdnative/gdnative.h +++ b/modules/gdnative/gdnative.h @@ -35,7 +35,7 @@ #include "os/thread_safe.h" #include "resource.h" -#include <godot/gdnative.h> +#include "gdnative/gdnative.h" class GDNativeLibrary : public Resource { GDCLASS(GDNativeLibrary, Resource) @@ -77,6 +77,8 @@ class GDNativeLibrary : public Resource { String library_paths[NUM_PLATFORMS]; + bool singleton_gdnative = false; + protected: bool _set(const StringName &p_name, const Variant &p_value); bool _get(const StringName &p_name, Variant &r_ret) const; @@ -92,6 +94,9 @@ public: String get_library_path(StringName p_platform) const; String get_active_library_path() const; + + _FORCE_INLINE_ bool is_singleton_gdnative() const { return singleton_gdnative; } + _FORCE_INLINE_ void set_singleton_gdnative(bool p_singleton) { singleton_gdnative = p_singleton; } }; typedef godot_variant (*native_call_cb)(void *, godot_string *, godot_array *); |