diff options
| author | Rémi Verschelde | 2017-09-04 21:51:07 +0200 |
|---|---|---|
| committer | GitHub | 2017-09-04 21:51:07 +0200 |
| commit | e979e50b7d83a90c39c206783b15c1ff3a43fb0d (patch) | |
| tree | 45c66640fbf82b4e1226f51cec3da548f8488e51 /modules/gdnative/SCsub | |
| parent | f9d9e9099cd04a112598d65ac67a05eb78139e4a (diff) | |
| parent | 54a9c1ee43673803e8992ebdcb9e8fca3c367487 (diff) | |
| download | godot-e979e50b7d83a90c39c206783b15c1ff3a43fb0d.tar.gz godot-e979e50b7d83a90c39c206783b15c1ff3a43fb0d.tar.zst godot-e979e50b7d83a90c39c206783b15c1ff3a43fb0d.zip | |
Merge pull request #10921 from karroffel/gdnative-MERGE-EVERYTHING
[GDNative] merge of NativeScript and GDNative, new GDNative singletons
Diffstat (limited to 'modules/gdnative/SCsub')
| -rw-r--r-- | modules/gdnative/SCsub | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/modules/gdnative/SCsub b/modules/gdnative/SCsub index 65970d48c..f386f2b54 100644 --- a/modules/gdnative/SCsub +++ b/modules/gdnative/SCsub @@ -2,12 +2,16 @@ Import('env') -env.add_source_files(env.modules_sources, "*.cpp") -env.add_source_files(env.modules_sources, "godot/*.cpp") +gdn_env = env.Clone() -env.Append(CPPFLAGS=['-DGDAPI_BUILT_IN']) -env.Append(CPPPATH=['#modules/gdnative/']) +gdn_env.add_source_files(env.modules_sources, "*.cpp") +gdn_env.add_source_files(env.modules_sources, "gdnative/*.cpp") +gdn_env.add_source_files(env.modules_sources, "nativescript/*.cpp") + +gdn_env.Append(CPPFLAGS=['-DGDAPI_BUILT_IN']) +gdn_env.Append(CPPPATH=['#modules/gdnative/include/']) if "platform" in env and env["platform"] == "x11": # there has to be a better solution? env.Append(LINKFLAGS=["-rdynamic"]) + env.use_ptrcall = True |