From 880048377de06c7e34cbfadd68bad2eb3ca17b3d Mon Sep 17 00:00:00 2001
From: Karroffel
Date: Wed, 2 Aug 2017 02:46:45 +0200
Subject: [GDNative] better header include paths

The old include paths caused some problems on some compilers, for
example including "string.h" was ambiguous.
---
 modules/gdnative/SCsub | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'modules/gdnative/SCsub')

diff --git a/modules/gdnative/SCsub b/modules/gdnative/SCsub
index ac13319a1..014c988bd 100644
--- a/modules/gdnative/SCsub
+++ b/modules/gdnative/SCsub
@@ -1,14 +1,15 @@
 #!/usr/bin/env python
 
 Import('env')
+Import('env_modules')
 
-env.add_source_files(env.modules_sources, "*.cpp")
-env.add_source_files(env.modules_sources, "godot/*.cpp")
+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.Append(CPPFLAGS=['-DGDAPI_BUILT_IN'])
+mod_env.Append(CPPFLAGS=['-DGDAPI_BUILT_IN'])
+mod_env.Append(CPPPATH=['#modules/gdnative/'])
 
 if "platform" in env and env["platform"] == "x11": # there has to be a better solution?
-    env.Append(LINKFLAGS=["-rdynamic"])
-env.use_ptrcall = True
-
-Export('env')
+    mod_env.Append(LINKFLAGS=["-rdynamic"])
+mod_env.use_ptrcall = True
-- 
cgit v1.2.3-70-g09d2