diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2018-05-30 15:59:42 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2018-05-30 22:10:11 +0200 |
commit | 59c2c21b152aad4a9b925aab98ecdb85fee6867d (patch) | |
tree | a47c39980d3e259db6bcd60dbaac43d6b158451b /modules/recast/SCsub | |
parent | 65fc525ed8d5b801279b73bc864b4d6290f5da3e (diff) |
Move NavigationMeshEditorPlugin to Recast module as should be
Modules can register their own editor plugins (like GridMap does),
so no need to put module-specific classes in the `editor/` folder.
Also cleans up the previous SCons env pollution from the Recast
module, integrating its code into libmodules as other modules.
Diffstat (limited to 'modules/recast/SCsub')
-rw-r--r-- | modules/recast/SCsub | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/modules/recast/SCsub b/modules/recast/SCsub index 530df9a37c..f56be72b24 100644 --- a/modules/recast/SCsub +++ b/modules/recast/SCsub @@ -1,8 +1,9 @@ #!/usr/bin/env python Import('env') +Import('env_modules') -# Not building in a separate env as core needs it +env_recast = env_modules.Clone() # Thirdparty source files if env['builtin_recast']: @@ -22,13 +23,10 @@ if env['builtin_recast']: ] thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] - env.Append(CPPPATH=[thirdparty_dir, thirdparty_dir + "/Include"]) - - lib = env.add_library("recast_builtin", thirdparty_sources) - env.Append(LIBS=[lib]) + env_recast.add_source_files(env.modules_sources, thirdparty_sources) + env_recast.Append(CPPPATH=[thirdparty_dir + "/Include"]) # Godot source files -env.add_source_files(env.modules_sources, "*.cpp") -env.Append(CCFLAGS=['-DRECAST_ENABLED']) +env_recast.add_source_files(env.modules_sources, "*.cpp") Export('env') |