Fix #8019 - tidy up resource usage

[roobuilder] / meson.build

diff --git a/meson.build b/meson.build
index c5d929a..ecee951 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -6,6 +6,7 @@ project('roobuilder', 'vala', 'c',
     'c_std=gnu11'       # for C subprojects
   ]
 )
+gnome = import('gnome')
 
 valac = meson.get_compiler('vala')
 
@@ -27,9 +28,9 @@ deps = [
    dependency('libxml-2.0'),
    valac.find_library('posix'),
    dependency('gtksourceview-5'),
-   dependency('libgda-5.0'),
    dependency('jsonrpc-glib-1.0'),
    dependency('gio-unix-2.0'),
+   dependency('libadwaita-1'),
 
 ]
  
@@ -70,11 +71,18 @@ install_data(
        install_dir:  get_option('datadir') + '/icons/hicolor/48x48/apps/'
 )
 
-gnome = import('gnome')
+
 gnome.post_install(gtk_update_icon_cache : true)
 
 
 
+roobuilder_resources = gnome.compile_resources(
+       'roobuilder-resources', 'resources/gresources.xml',
+       source_dir: [ 'resources/glade-icons', 'resources/html', 'resources/data', 'resources/Editors' ],
+       c_name: 'roobuilder_resources' 
+)
+
+
 install_data(
        'roobuilder.desktop',
        install_dir : get_option('datadir') + '/applications/'
@@ -92,7 +100,6 @@ roobuilder_src = files([
    'src/Builder4/EditProject.vala',
    'src/Builder4/FakeServer.vala',
    'src/Builder4/GtkView.vala',
-   'src/Builder4/MainWindow.vala',
    'src/Builder4/PopoverAddObject.vala',
    'src/Builder4/PopoverProperty.vala',
    'src/Builder4/StandardErrorDialog.vala',
@@ -137,7 +144,6 @@ roobuilder_src = files([
    'src/Application.vala',
    'src/Palete/Javascript.vala',
    'src/Project/Meson.vala',
-   'src/Palete/RooDatabase.vala',
    'src/Palete/LanguageClient.vala',
    'src/Palete/LanguageClientVala.vala',
    'src/Palete/LanguageClientJavascript.vala',
@@ -147,12 +153,13 @@ roobuilder_src = files([
    'src/JsRender/NodeWriter.vala',
    'src/JsRender/NodeToValaExtended.vala',
    'src/JsRender/NodeToValaWrapped.vala',
+   'src/Builder4/MainWindow.vala',
 ])
 
+
 roobuilder = executable('roobuilder',
    dependencies: deps,
-   sources: [ roobuilder_src ],
+   sources: [ roobuilder_src , roobuilder_resources ],
    install: true
 )
 
-