diff options
| author | Christian Persch <chpe@src.gnome.org> | 2022-07-28 23:19:49 +0200 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2022-07-28 23:19:49 +0200 |
| commit | 17f4ad7909c819f0fe574d723de119dc10ec397f (patch) | |
| tree | 6b89128fd215cae6b9e77903535a75e9533f5bd4 /src | |
| parent | e0999b42fb4954d3935f1705bea54b99a45734e5 (diff) | |
| download | gnome-terminal-17f4ad7909c819f0fe574d723de119dc10ec397f.tar.gz | |
build: Move version defines from config.h to meson cpp_args
The nautilus extension will need to build with gtk4 while the rest is
still gtk3, so these defines must not be set while compiling the
nautilus extension.
Diffstat (limited to 'src')
| -rw-r--r-- | src/meson.build | 6 | ||||
| -rw-r--r-- | src/terminal-nautilus.cc | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/meson.build b/src/meson.build index 0a142c55..99f47f82 100644 --- a/src/meson.build +++ b/src/meson.build @@ -204,7 +204,7 @@ server_incs = [ src_inc, ] -server_cxxflags = [ +server_cxxflags = version_cxxflags + [ '-DTERMINAL_COMPILATION', '-DVTE_DISABLE_DEPRECATION_WARNINGS', '-DTERM_LOCALEDIR="@0@"'.format(gt_prefix / gt_localedir), @@ -288,7 +288,7 @@ client_incs = [ src_inc, ] -client_cxxflags = [ +client_cxxflags = version_cxxflags + [ '-DTERMINAL_COMPILATION', '-DTERMINAL_CLIENT', '-DTERM_DATADIR="@0@"'.format(gt_prefix / gt_datadir), @@ -357,7 +357,7 @@ if get_option('nautilus_extension') src_inc, ] - nautilus_cxxflags = [ + nautilus_cxxflags = glib_version_cxxflags + [ '-DTERM_LOCALEDIR="@0@"'.format(gt_prefix / gt_localedir), ] diff --git a/src/terminal-nautilus.cc b/src/terminal-nautilus.cc index 71ab3136..4b4bbd8d 100644 --- a/src/terminal-nautilus.cc +++ b/src/terminal-nautilus.cc @@ -18,8 +18,6 @@ */ #include "config.h" -#undef GDK_VERSION_MIN_REQUIRED -#undef GDK_VERSION_MAX_ALLOWED #include <glib.h> #include <glib/gi18n-lib.h> |