Skip to content
Snippets Groups Projects
Commit 35b43d38 authored by Bruce Cowan's avatar Bruce Cowan :airplane:
Browse files

Revert "Better configuration file handling"

This reverts commit f32b90ec.
parent f32b90ec
No related branches found
No related tags found
No related merge requests found
...@@ -16,14 +16,16 @@ gtk_dep = dependency('gtk4', version: '>= 4.0') ...@@ -16,14 +16,16 @@ gtk_dep = dependency('gtk4', version: '>= 4.0')
conf = configuration_data() conf = configuration_data()
conf.set_quoted('VERSION','@VCS_TAG@') conf.set_quoted('VERSION','@VCS_TAG@')
vcs_tag(
input: configure_file( config_h = declare_dependency(
output: 'config.h.in', sources: vcs_tag(
configuration: conf input: configure_file(
), output: 'config.h.in',
output: 'config.h', configuration: conf
),
output: 'config.h',
)
) )
configuration_inc = include_directories('.')
cflags = [] cflags = []
cflags += ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46', cflags += ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_46',
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later * SPDX-License-Identifier: GPL-3.0-or-later
*/ */
#include <config.h> #include "config.h"
#include "rugby-app-window.h" #include "rugby-app-window.h"
#include "rugby-pref-window.h" #include "rugby-pref-window.h"
......
...@@ -12,7 +12,6 @@ sources = [ ...@@ -12,7 +12,6 @@ sources = [
executable('rugby', executable('rugby',
sources, resources, compiled_schemas, sources, resources, compiled_schemas,
dependencies: [gio_dep, gtk_dep], dependencies: [config_h, gio_dep, gtk_dep],
include_directories: configuration_inc,
install_dir: get_option('bindir'), install_dir: get_option('bindir'),
install: true) install: true)
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later * SPDX-License-Identifier: GPL-3.0-or-later
*/ */
#include <config.h> #include "config.h"
#include "rugby-app-window.h" #include "rugby-app-window.h"
#include "rugby-list-store.h" #include "rugby-list-store.h"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later * SPDX-License-Identifier: GPL-3.0-or-later
*/ */
#include <config.h> #include "config.h"
#include "rugby-possibility-widget.h" #include "rugby-possibility-widget.h"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* SPDX-License-Identifier: GPL-3.0-or-later * SPDX-License-Identifier: GPL-3.0-or-later
*/ */
#include <config.h> #include "config.h"
#include "rugby-possibility.h" #include "rugby-possibility.h"
struct _RugbyPossibility struct _RugbyPossibility
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment