meson: Symlink to valacodegen.dll in bindir

This is so that valac builds on Windows can find valacodegen.dll when we
are doing shared builds.

diff --git a/codegen/meson.build b/codegen/meson.build
index 59142caf0902d698c339cd8a56c31cf856e8186f..223832a67be261e8f6bdd152fec873c27bca5a5d 100644 (file)
--- a/codegen/meson.build
+++ b/codegen/meson.build
@@ -43,6 +43,11 @@ valacodegen_lib = library(
        vala_vapi: 'valacodegen.vapi',
 )
 
+if cc.get_argument_syntax() == 'msvc' and \
+   get_option('default_library') == 'shared'
+       meson.add_install_script('cmd', '/c', 'cd /d @0@ & (if exist @2@.dll del @2@.dll) & mklink @2@.dll @1@\@2@.dll'.format(join_paths(get_option('prefix'), get_option('bindir')).replace('/','\\'), pkglibdir.replace('/', '\\'), 'valacodegen'))
+endif
+
 valacodegen_dep = declare_dependency(
        link_with: [valacodegen_lib],
        dependencies: [valacore_dep, valaccode_dep],

diff --git a/compiler/meson.build b/compiler/meson.build
index a07330f6991ca33c43084b37bc23ba3a3ae042f7..4350ba75337240b4d55086f7c1be968e75a83a90 100644 (file)
--- a/compiler/meson.build
+++ b/compiler/meson.build
@@ -5,6 +5,8 @@ valac_sources = files(
 valac_name = 'valac@0@'.format(vala_version_suffix)
 
 extra_compiler_include_dirs = []
+extra_compiler_linker_args = []
+extra_compiler_libs = []
 
 if cc.get_argument_syntax() == 'msvc'
        extra_compiler_include_dirs += include_directories('../msvc')