diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-02-27 11:08:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-27 11:08:17 +0100 |
| commit | 75c7e66c5ed66e3832b2c94a8b809ab97b85922a (patch) | |
| tree | dd8168e92eb129ad6b99451ab302de2cac16c0b6 /modules/mono/SCsub | |
| parent | 4972269c86c8aa4e5e948aada01c33e66de87415 (diff) | |
| parent | a45697d8dfb3b8e6fb7817060d52b22802a7d45f (diff) | |
Merge pull request #15641 from neikeq/mono-is-picky-regarding-corlib-so-we-must-make-sure-to-ship-the-right-version-otherwise-something-bad-may-happen
Mono: Buildsystem improvements
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 e65682484e..a1dfcf6377 100644 --- a/modules/mono/SCsub +++ b/modules/mono/SCsub @@ -209,10 +209,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}) |