1 files changed, 61 insertions, 50 deletions

diff --git a/modules/gdnative/gdnative.h b/modules/gdnative/gdnative.h
index e44cc55a79..052ce1fef1 100644
--- a/modules/gdnative/gdnative.h
+++ b/modules/gdnative/gdnative.h
@@ -38,74 +38,71 @@
 #include "gdnative/gdnative.h"
 #include "gdnative_api_struct.gen.h"
 
-class GDNativeLibrary : public Resource {
-	GDCLASS(GDNativeLibrary, Resource)
-
-	enum Platform {
-		X11_32BIT,
-		X11_64BIT,
-		WINDOWS_32BIT,
-		WINDOWS_64BIT,
-		// NOTE(karroffel): I heard OSX 32 bit is dead, so 64 only
-		OSX,
-
-		// Android .so files must be located in directories corresponding to Android ABI names:
-		// https://developer.android.com/ndk/guides/abis.html
-		// Android runtime will select the matching library depending on the device.
-		// The value here must simply point to the .so name, for example:
-		// "res://libmy_gdnative.so" or "libmy_gdnative.so",
-		// while in the project the actual paths can be "lib/android/armeabi-v7a/libmy_gdnative.so",
-		// "lib/android/arm64-v8a/libmy_gdnative.so".
-		ANDROID,
-
-		IOS_32BIT,
-		IOS_64BIT,
-
-		// TODO(karroffel): figure out how to deal with web stuff at all...
-		WASM,
-
-		// TODO(karroffel): does UWP have different libs??
-		// UWP,
+#include "io/config_file.h"
 
-		NUM_PLATFORMS
+class GDNativeLibraryResourceLoader;
+class GDNative;
 
-	};
+class GDNativeLibrary : public Resource {
+	GDCLASS(GDNativeLibrary, Resource)
 
-	static String platform_names[NUM_PLATFORMS + 1];
-	static String platform_lib_ext[NUM_PLATFORMS + 1];
+	static Map<String, Vector<Ref<GDNative> > > *loaded_libraries;
 
-	static Platform current_platform;
+	friend class GDNativeLibraryResourceLoader;
+	friend class GDNative;
 
-	String library_paths[NUM_PLATFORMS];
+	Ref<ConfigFile> config_file;
 
-	bool singleton_gdnative;
+	String current_library_path;
+	Vector<String> current_dependencies;
 
-protected:
-	bool _set(const StringName &p_name, const Variant &p_value);
-	bool _get(const StringName &p_name, Variant &r_ret) const;
-	void _get_property_list(List<PropertyInfo> *p_list) const;
+	bool singleton;
+	bool load_once;
+	String symbol_prefix;
 
 public:
 	GDNativeLibrary();
 	~GDNativeLibrary();
 
-	static void _bind_methods();
+	_FORCE_INLINE_ Ref<ConfigFile> get_config_file() { return config_file; }
 
-	void set_library_path(StringName p_platform, String p_path);
-	String get_library_path(StringName p_platform) const;
+	// things that change per-platform
+	// so there are no setters for this
+	_FORCE_INLINE_ String get_current_library_path() const {
+		return current_library_path;
+	}
+	_FORCE_INLINE_ Vector<String> get_current_dependencies() const {
+		return current_dependencies;
+	}
+
+	// things that are a property of the library itself, not platform specific
+	_FORCE_INLINE_ bool should_load_once() const {
+		return load_once;
+	}
+	_FORCE_INLINE_ bool is_singleton() const {
+		return singleton;
+	}
+	_FORCE_INLINE_ String get_symbol_prefix() const {
+		return symbol_prefix;
+	}
 
-	String get_active_library_path() const;
+	_FORCE_INLINE_ void set_load_once(bool p_load_once) {
+		load_once = p_load_once;
+	}
+	_FORCE_INLINE_ void set_singleton(bool p_singleton) {
+		singleton = p_singleton;
+	}
+	_FORCE_INLINE_ void set_symbol_prefix(String p_symbol_prefix) {
+		symbol_prefix = p_symbol_prefix;
+	}
 
-	_FORCE_INLINE_ bool is_singleton_gdnative() const { return singleton_gdnative; }
-	_FORCE_INLINE_ void set_singleton_gdnative(bool p_singleton) { singleton_gdnative = p_singleton; }
+	static void _bind_methods();
 };
 
-typedef godot_variant (*native_call_cb)(void *, godot_array *);
-
 struct GDNativeCallRegistry {
 	static GDNativeCallRegistry *singleton;
 
-	inline GDNativeCallRegistry *get_singleton() {
+	inline static GDNativeCallRegistry *get_singleton() {
 		return singleton;
 	}
 
@@ -124,10 +121,9 @@ class GDNative : public Reference {
 
 	Ref<GDNativeLibrary> library;
 
-	// TODO(karroffel): different platforms? WASM????
 	void *native_handle;
 
-	void _compile_dummy_for_api();
+	bool initialized;
 
 public:
 	GDNative();
@@ -148,4 +144,19 @@ public:
 	Error get_symbol(StringName p_procedure_name, void *&r_handle);
 };
 
+class GDNativeLibraryResourceLoader : public ResourceFormatLoader {
+public:
+	virtual RES load(const String &p_path, const String &p_original_path, Error *r_error);
+	virtual void get_recognized_extensions(List<String> *p_extensions) const;
+	virtual bool handles_type(const String &p_type) const;
+	virtual String get_resource_type(const String &p_path) const;
+};
+
+class GDNativeLibraryResourceSaver : public ResourceFormatSaver {
+public:
+	virtual Error save(const String &p_path, const RES &p_resource, uint32_t p_flags);
+	virtual bool recognize(const RES &p_resource) const;
+	virtual void get_recognized_extensions(const RES &p_resource, List<String> *p_extensions) const;
+};
+
 #endif // GDNATIVE_H