diff options
| author | Thomas Herzog <thomas.herzog@mail.com> | 2017-08-02 15:24:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-02 15:24:09 +0200 |
| commit | 0586524b9ce67bdcab5cef88397c44bb7b9e46fb (patch) | |
| tree | c888896379949e1bee4379fa84ab18d1089d95c1 | |
| parent | 57d961a7e3a3bedfcd3921eeaac7fb43515a6f23 (diff) | |
| parent | c143f86968c512649651c823a688b410c6b52c52 (diff) | |
Merge pull request #10042 from karroffel/gdnative-header-include-paths
[GDNative/NativeScript] fix -rdynamic and removed _init call
| -rw-r--r-- | modules/gdnative/SCsub | 14 | ||||
| -rw-r--r-- | modules/nativescript/nativescript.cpp | 5 |
2 files changed, 6 insertions, 13 deletions
diff --git a/modules/gdnative/SCsub b/modules/gdnative/SCsub index 014c988bd7..65970d48c1 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 e7445e6da9..ad746c9546 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; } |