diff options
| author | Ignacio Etcheverry <ignalfonsore@gmail.com> | 2018-01-12 22:44:22 +0100 |
|---|---|---|
| committer | Ignacio Etcheverry <ignalfonsore@gmail.com> | 2018-01-12 22:44:22 +0100 |
| commit | a45697d8dfb3b8e6fb7817060d52b22802a7d45f (patch) | |
| tree | cf90dd3fa545837964593f32fd685efcd7d7b4d8 /modules/mono/SCsub | |
| parent | d486cae7016c77af114d8019abf37c57e8bba386 (diff) | |
Mono: Buildsystem improvements
- Bundle with mscorlib.dll to avoid compatibilities issues
- Add build option 'mono_assemblies_output_dir' to specify the output directory where the assemblies will be copied to. '#bin' by default.
Diffstat (limited to 'modules/mono/SCsub')
| -rw-r--r-- | modules/mono/SCsub | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/modules/mono/SCsub b/modules/mono/SCsub index 320bbe7090..63fae194f4 100644 --- a/modules/mono/SCsub +++ b/modules/mono/SCsub @@ -202,10 +202,16 @@ def mono_build_solution(source, target, env): copyfile(os.path.join(src_dir, asm_file), os.path.join(dst_dir, asm_file)) +output_dir = Dir('#bin').abspath +assemblies_output_dir = Dir(env['mono_assemblies_output_dir']).abspath -mono_sln_builder = Builder(action = mono_build_solution) +mono_sln_builder = Builder(action=mono_build_solution) env_mono.Append(BUILDERS={'MonoBuildSolution': mono_sln_builder}) env_mono.MonoBuildSolution( - os.path.join(Dir('#bin').abspath, 'GodotSharpTools.dll'), + os.path.join(assemblies_output_dir, 'GodotSharpTools.dll'), 'editor/GodotSharpTools/GodotSharpTools.sln' ) + +if os.path.normpath(output_dir) != os.path.normpath(assemblies_output_dir): + rel_assemblies_output_dir = os.path.relpath(assemblies_output_dir, output_dir) + env_mono.Append(CPPDEFINES={'GD_MONO_EDITOR_ASSEMBLIES_DIR': rel_assemblies_output_dir}) |