a96f0e98d7
This patch adds ability to include external, user-defined C++ modules to be compiled as part of Godot via `custom_modules` build option which can be passed to `scons`. ``` scons platform=x11 tools=yes custom_modules="../project/modules" ``` Features: - detects all available modules under `custom_modules` directory the same way as it does for built-in modules (not recursive); - works with both relative and absolute paths on the filesystem; - multiple search paths can be specified as a comma-separated list. Module custom documentation and editor icons collection and generation process is adapted to work with absolute paths needed by such modules. Also fixed doctool bug mixing absolute and relative paths respectively. Implementation details: - `env.module_list` is a dictionary now, which holds both module name as key and either a relative or absolute path to a module as a value. - `methods.detect_modules` is run twice: once for built-in modules, and second for external modules, all combined later. - `methods.detect_modules` was not doing what it says on the tin. It is split into `detect_modules` which collects a list of available modules and `write_modules` which generates `register_types` sources for each. - whether a module is built-in or external is distinguished by relative or absolute paths respectively. `custom_modules` scons converter ensures that the path is absolute even if relative path is supplied, including expanding user paths and symbolic links. - treats the parent directory as if it was Godot's base directory, so that there's no need to change include paths in cases where custom modules are included as dependencies in other modules.
44 lines
1.3 KiB
Python
44 lines
1.3 KiB
Python
#!/usr/bin/env python
|
|
|
|
Import("env")
|
|
|
|
import modules_builders
|
|
import os
|
|
|
|
env_modules = env.Clone()
|
|
|
|
Export("env_modules")
|
|
|
|
# Header with MODULE_*_ENABLED defines.
|
|
env.CommandNoCache("modules_enabled.gen.h", Value(env.module_list), modules_builders.generate_modules_enabled)
|
|
|
|
vs_sources = []
|
|
# libmodule_<name>.a for each active module.
|
|
for name, path in env.module_list.items():
|
|
env.modules_sources = []
|
|
|
|
if not os.path.isabs(path):
|
|
SConscript(name + "/SCsub") # Built-in.
|
|
else:
|
|
SConscript(path + "/SCsub") # Custom.
|
|
|
|
# Some modules are not linked automatically but can be enabled optionally
|
|
# on iOS, so we handle those specially.
|
|
if env["platform"] == "iphone" and name in ["arkit", "camera"]:
|
|
continue
|
|
|
|
lib = env_modules.add_library("module_%s" % name, env.modules_sources)
|
|
env.Prepend(LIBS=[lib])
|
|
if env["vsproj"]:
|
|
vs_sources += env.modules_sources
|
|
|
|
# libmodules.a with only register_module_types.
|
|
# Must be last so that all libmodule_<name>.a libraries are on the right side
|
|
# in the linker command.
|
|
env.modules_sources = []
|
|
env_modules.add_source_files(env.modules_sources, "register_module_types.gen.cpp")
|
|
lib = env_modules.add_library("modules", env.modules_sources)
|
|
env.Prepend(LIBS=[lib])
|
|
if env["vsproj"]:
|
|
env.modules_sources += vs_sources
|