summaryrefslogtreecommitdiff
path: root/modules/gdnative/godot/variant.h
diff options
context:
space:
mode:
authorRuslan Mustakov <r.mustakov@gmail.com>2017-08-18 21:17:35 +0700
committerRuslan Mustakov <r.mustakov@gmail.com>2017-08-30 18:14:19 +0700
commit5ccdeccb6ed6b8480a86b0db36f192526cba1274 (patch)
treeeafb890997ee985210b66272957aa22ad00df125 /modules/gdnative/godot/variant.h
parent8b9026c05e9982a7bc0c7f52776ad74276b90252 (diff)
Make GDNative work on Android
The changes include work done to ensure that GDNative apps and Nim integration specifically can run on Android. The changes have been tested on our WIP game, which uses godot-nim and depends on several third-party .so libs, and Platformer demo to ensure nothing got broken. - .so libraries are exported to lib/ folder in .apk, instead of assets/, because that's where Android expects them to be and it resolves the library name into "lib/<ABI>/<name>", where <ABI> is the ABI matching the current device. So we establish the convention that Android .so files in the project must be located in the folder corresponding to the ABI they were compiled for. - Godot callbacks (event handlers) are now called from the same thread from which Main::iteration is called. It is also what Godot now considers to be the main thread, because Main::setup is also called from there. This makes threading on Android more consistent with other platforms, making the code that depends on Thread::get_main_id more portable (GDNative has such code). - Sizes of GDNative API types have been fixed to work on 32-bit platforms.
Diffstat (limited to 'modules/gdnative/godot/variant.h')
-rw-r--r--modules/gdnative/godot/variant.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdnative/godot/variant.h b/modules/gdnative/godot/variant.h
index fda24db8d4..849ba8bda6 100644
--- a/modules/gdnative/godot/variant.h
+++ b/modules/gdnative/godot/variant.h
@@ -36,7 +36,7 @@ extern "C" {
#include <stdint.h>
-#define GODOT_VARIANT_SIZE 24
+#define GODOT_VARIANT_SIZE (16 + sizeof(void *))
#ifndef GODOT_CORE_API_GODOT_VARIANT_TYPE_DEFINED
#define GODOT_CORE_API_GODOT_VARIANT_TYPE_DEFINED