diff --git a/app/meson.build b/app/meson.build
index a509264..7a56baa 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -27,11 +27,18 @@ else
   rc = []
 endif
 
+app_libs = []
+
+if 'static' == get_option('default_library')
+  app_libs = [ sciqlop_amdaplugin, sciqlop_mockplugin]
+endif
+
 sciqlop_app = executable('sciqlop',
                        app_sources,
                        app_moc_files,
                        rc,
                        include_directories : [ app_inc],
+                       link_with: app_libs,
                        dependencies : [sciqlop_gui, sciqlop_core],
                        install : true
                        )
diff --git a/build_cfg/mac/build.sh b/build_cfg/mac/build.sh
index 5c61cc1..b73d2f5 100755
--- a/build_cfg/mac/build.sh
+++ b/build_cfg/mac/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 mkdir build
-meson --prefix=/tmp/SciQLOP.app --bindir=Contents/MacOS build
+meson -Dcpp_args='-DQT_STATICPLUGIN' -Ddefault_library=static --prefix=/tmp/SciQLOP.app --bindir=Contents/MacOS build
 cd build
 ninja
 ninja install
diff --git a/meson.build b/meson.build
index a35d703..29e80d4 100644
--- a/meson.build
+++ b/meson.build
@@ -37,8 +37,8 @@ add_project_arguments('-DSCIQLOP_AMDA_SERVER="hybrid"', language : 'cpp')
 
 subdir('core')
 subdir('gui')
-subdir('app')
 subdir('plugins')
+subdir('app')
 
 cppcheck = find_program('cppcheck', required : false)
 
diff --git a/plugins/amda/meson.build b/plugins/amda/meson.build
index d45f874..0b6d2f7 100644
--- a/plugins/amda/meson.build
+++ b/plugins/amda/meson.build
@@ -22,36 +22,17 @@ amdaplugin_resources_files = [
 
 amdaplugin_inc = include_directories(['include'])
 
-moc_gen = generator(moc,
-                output  : 'moc_@BASENAME@.cpp',
-                arguments : ['@INPUT@',
-                 '-DSCIQLOP_PLUGIN_JSON_FILE_PATH="'+meson.source_root()+'/plugins/amda/resources/amda.json"',
-                 '-I', meson.current_source_dir()+'/include',
-                 '-I', meson.current_source_dir()+'/../../core/include/',
-                 '-o', '@OUTPUT@'])
-
-rcc_gen = generator(rcc,
-                output  : 'qrc_@BASENAME@.cpp',
-                arguments : ['--name=@BASENAME@"',
-                 '--output',
-                 '@OUTPUT@',
-                 '@INPUT@'])
-
-amdaplugin_moc_plugin_files = moc_gen.process(amdaplugin_moc_headers)
-
-amdaplugin_rcc_plugin_files = rcc_gen.process(amdaplugin_resources_files)
-
-#amdaplugin_rcc_plugin_files = qt5.preprocess(
-#                               qresources : amdaplugin_resources_files)
-
-amdaplugin_moc_files = qt5.preprocess(
-                               ui_files : amdaplugin_ui_files)
+amdaplugin_prep_files = qt5.preprocess(moc_headers : amdaplugin_moc_headers,
+                                             moc_extra_arguments: ['-DSCIQLOP_PLUGIN_JSON_FILE_PATH="'+
+                                                                   meson.source_root()+
+                                                                   '/plugins/amda/resources/amda.json"'],
+                                             include_directories: [amdaplugin_inc, core_inc],
+                                             qresources : amdaplugin_resources_files,
+                                             ui_files : amdaplugin_ui_files)
 
 sciqlop_amdaplugin = library('amdaplugin',
                        amdaplugin_sources,
-                       amdaplugin_moc_files,
-                       amdaplugin_rcc_plugin_files,
-                       amdaplugin_moc_plugin_files,
+                       amdaplugin_prep_files,
                        cpp_args : ['-DAMDA_LIB','-DQT_PLUGIN'],
                        include_directories : [amdaplugin_inc],
                        dependencies : [sciqlop_core, sciqlop_gui],