From c143f86968c512649651c823a688b410c6b52c52 Mon Sep 17 00:00:00 2001 From: Karroffel Date: Wed, 2 Aug 2017 14:21:12 +0200 Subject: [PATCH] [GDNative/NativeScript] fix -rdynamic and removed _init call The _init call was buggy anyway and in the end shouldn't be a thing that's called via ClassDB, it should be something that's language specific, so we leave this out for the bindings. In the commit 66a7763 the SCsub file for GDNative was changed to use a cloned environment, that bricked -rdynamic which needs to be passed down to the linker, which didn't happen with the new env. --- modules/gdnative/SCsub | 14 ++++++-------- modules/nativescript/nativescript.cpp | 5 ----- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/modules/gdnative/SCsub b/modules/gdnative/SCsub index 014c988bd72..65970d48c13 100644 --- a/modules/gdnative/SCsub +++ b/modules/gdnative/SCsub @@ -1,15 +1,13 @@ #!/usr/bin/env python Import('env') -Import('env_modules') -mod_env = env_modules.Clone() -mod_env.add_source_files(env.modules_sources, "*.cpp") -mod_env.add_source_files(env.modules_sources, "godot/*.cpp") +env.add_source_files(env.modules_sources, "*.cpp") +env.add_source_files(env.modules_sources, "godot/*.cpp") -mod_env.Append(CPPFLAGS=['-DGDAPI_BUILT_IN']) -mod_env.Append(CPPPATH=['#modules/gdnative/']) +env.Append(CPPFLAGS=['-DGDAPI_BUILT_IN']) +env.Append(CPPPATH=['#modules/gdnative/']) if "platform" in env and env["platform"] == "x11": # there has to be a better solution? - mod_env.Append(LINKFLAGS=["-rdynamic"]) -mod_env.use_ptrcall = True + env.Append(LINKFLAGS=["-rdynamic"]) +env.use_ptrcall = True diff --git a/modules/nativescript/nativescript.cpp b/modules/nativescript/nativescript.cpp index e7445e6da9d..ad746c95464 100644 --- a/modules/nativescript/nativescript.cpp +++ b/modules/nativescript/nativescript.cpp @@ -213,11 +213,6 @@ ScriptInstance *NativeScript::instance_create(Object *p_this) { owners_lock->unlock(); #endif - // try to call _init - // we don't care if it doesn't exist, so we ignore errors. - Variant::CallError err; - call("_init", NULL, 0, err); - return nsi; }