1 files changed, 40 insertions, 16 deletions

diff --git a/meson.build b/meson.build
index 3b21a93..002c8b1 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('gsr-ui', ['c', 'cpp'], version : '1.0.0', default_options : ['warning_level=2', 'cpp_std=c++17'], subproject_dir : 'depends')
+project('gsr-ui', ['c', 'cpp'], version : '1.6.7', default_options : ['warning_level=2', 'cpp_std=c++17'], subproject_dir : 'depends')
 
 if get_option('buildtype') == 'debug'
     add_project_arguments('-g3', language : ['c', 'cpp'])
@@ -23,24 +23,37 @@ src = [
     'src/gui/Utils.cpp',
     'src/gui/DropdownButton.cpp',
     'src/gui/Label.cpp',
+    'src/gui/Image.cpp',
     'src/gui/LineSeparator.cpp',
     'src/gui/CustomRendererWidget.cpp',
     'src/gui/FileChooser.cpp',
     'src/gui/SettingsPage.cpp',
+    'src/gui/ScreenshotSettingsPage.cpp',
     'src/gui/GlobalSettingsPage.cpp',
     'src/gui/GsrPage.cpp',
     'src/gui/Subsection.cpp',
+    'src/GlobalHotkeys/GlobalHotkeysX11.cpp',
+    'src/GlobalHotkeys/GlobalHotkeysLinux.cpp',
+    'src/GlobalHotkeys/GlobalHotkeysJoystick.cpp',
+    'src/CursorTracker/CursorTrackerX11.cpp',
+    'src/CursorTracker/CursorTrackerWayland.cpp',
     'src/Utils.cpp',
     'src/WindowUtils.cpp',
+    'src/RegionSelector.cpp',
+    'src/WindowSelector.cpp',
     'src/Config.cpp',
     'src/GsrInfo.cpp',
     'src/Process.cpp',
     'src/Overlay.cpp',
-    'src/GlobalHotkeysX11.cpp',
-    'src/GlobalHotkeysLinux.cpp',
+    'src/AudioPlayer.cpp',
+    'src/Hotplug.cpp',
+    'src/Rpc.cpp',
     'src/main.cpp',
 ]
 
+subdir('protocol')
+src += protocol_src
+
 mglpp_proj = subproject('mglpp')
 mglpp_dep = mglpp_proj.get_variable('mglpp_dep')
 
@@ -48,36 +61,47 @@ prefix = get_option('prefix')
 datadir = get_option('datadir')
 gsr_ui_resources_path = join_paths(prefix, datadir, 'gsr-ui')
 
+add_project_arguments('-DGSR_UI_VERSION="' + meson.project_version() + '"', language: ['c', 'cpp'])
+add_project_arguments('-DGSR_FLATPAK_VERSION="5.7.3"', language: ['c', 'cpp'])
+
 executable(
     meson.project_name(),
     src,
     install : true,
     dependencies : [
         mglpp_dep,
+        dependency('threads'),
         dependency('xcomposite'),
         dependency('xfixes'),
+        dependency('xext'),
         dependency('xi'),
+        dependency('xcursor'),
+        dependency('xrandr'),
+        dependency('libpulse-simple'),
+        dependency('libdrm'),
+        dependency('wayland-client'),
     ],
     cpp_args : '-DGSR_UI_RESOURCES_PATH="' + gsr_ui_resources_path + '"',
 )
 
 executable(
-    'gsr-window-name',
-    ['tools/gsr-window-name/main.c'],
-    install : true,
-    dependencies : [dependency('x11')],
+    'gsr-global-hotkeys',
+    [
+        'tools/gsr-global-hotkeys/hotplug.c',
+        'tools/gsr-global-hotkeys/keyboard_event.c',
+        'tools/gsr-global-hotkeys/keys.c',
+        'tools/gsr-global-hotkeys/main.c'
+    ],
+    c_args : '-fstack-protector-all',
+    install : true
 )
 
 executable(
-    'gsr-global-hotkeys',
-    ['tools/gsr-global-hotkeys/main.c'],
-    install : true,
-    dependencies : [
-        dependency('libevdev'),
-        dependency('libudev'),
-        dependency('libinput'),
-        dependency('xkbcommon')
+    'gsr-ui-cli',
+    [
+        'tools/gsr-ui-cli/main.c'
     ],
+    install : true
 )
 
 install_subdir('images', install_dir : gsr_ui_resources_path)
@@ -89,4 +113,4 @@ endif
 
 if get_option('capabilities') == true
     meson.add_install_script('meson_post_install.sh')
-endif
\ No newline at end of file
+endif