godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

[GDNative/NativeScript] fix -rdynamic and removed _init call
This commit is contained in:
Thomas Herzog 2017-08-02 15:24:09 +02:00 committed by GitHub
parent 57d961a7e3 c143f86968
commit 0586524b9c
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/gdnative/SCsub
View File

@ -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

5
modules/nativescript/nativescript.cpp
View File

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