Merge pull request #10042 from karroffel/gdnative-header-include-paths

[GDNative/NativeScript] fix -rdynamic and removed _init call

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

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;
 }