clanker hai 1 mes
pai
achega
d06761781e
Modificáronse 1 ficheiros con 8 adicións e 20 borrados
  1. 8 20
      src/meson.build

+ 8 - 20
src/meson.build

@@ -17,18 +17,6 @@ mcp_sources = [
   'prompts/manager.vala',
 ]
 
-# Vala compiler arguments
-mcp_vala_args = [
-  '--target-glib=2.70',
-  '--pkg', 'glib-2.0',
-  '--pkg', 'gobject-2.0',
-  '--pkg', 'gio-2.0',
-  '--pkg', 'gio-unix-2.0',
-  '--pkg', 'json-glib-1.0',
-  '--pkg', 'jsonrpc-glib-1.0',
-  '--pkg', 'gee-0.8',
-  '--pkg', 'posix'
-]
 
 # Build library
 mcp_lib = shared_library(
@@ -45,9 +33,9 @@ mcp_lib = shared_library(
     posix_dep,
     math_dep
   ],
-  vala_args: mcp_vala_args,
+  vala_gir: 'Mcp-1.0.gir',
   install: true,
-  install_dir: [true, true, true]
+  install_dir: [true, true, true, true]
 )
 
 # PC file
@@ -61,9 +49,9 @@ pkg_mod.generate(
   subdirs: 'mcp-vala'
 )
 
-#g_ir_compiler = find_program('g-ir-compiler')
-#custom_target('mcp-vala typelib', command: [g_ir_compiler, '--shared-library=libmcp-vala.so', '--output', '@OUTPUT@', meson.current_build_dir() / 'usm-1.0.gir'],
-#              output: 'Mcp-1.0.typelib',
-#              depends: mcp_lib,
-#              install: true,
-#              install_dir: get_option('libdir') / 'girepository-1.0')
+g_ir_compiler = find_program('g-ir-compiler')
+custom_target('mcp-vala typelib', command: [g_ir_compiler, '--shared-library=libmcp-vala.so', '--output', '@OUTPUT@', meson.current_build_dir() / 'Mcp-1.0.gir'],
+              output: 'Mcp-1.0.typelib',
+              depends: mcp_lib,
+              install: true,
+              install_dir: get_option('libdir') / 'girepository-1.0')