diff options
| author | SoniEx2 <endermoneymod@gmail.com> | 2021-05-27 20:39:07 -0300 |
|---|---|---|
| committer | SoniEx2 <endermoneymod@gmail.com> | 2021-05-27 20:39:07 -0300 |
| commit | 5571d277b93b62c73568b78c652c85b2e8e95183 (patch) | |
| tree | 0d97d65058e31ccdeab4006384442a8e378d5f06 /meson.build | |
| parent | f58165fd33919951e2ca594c6f19a785420fc4f9 (diff) | |
| parent | 7f8b0a19cff46f7d27451fb9942eea5018f0c5b5 (diff) | |
Merge upstream changes
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 9d2ae05b..9b33574b 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('hexchat', 'c', - version: '2.14.2', + version: '2.14.3', meson_version: '>= 0.40.0', default_options: [ 'c_std=gnu89', @@ -49,6 +49,10 @@ config_h.set('GLIB_VERSION_MIN_REQUIRED', 'GLIB_VERSION_2_34') config_h.set('HAVE_MEMRCHR', cc.has_function('memrchr')) config_h.set('HAVE_STRINGS_H', cc.has_header('strings.h')) +config_h.set_quoted('HEXCHATLIBDIR', + join_paths(get_option('prefix'), get_option('libdir'), 'hexchat/plugins') +) + if libssl_dep.found() config_h.set('HAVE_X509_GET_SIGNATURE_NID', cc.has_function('X509_get_signature_nid', dependencies: libssl_dep) @@ -87,8 +91,6 @@ endif global_cflags = [] test_cflags = [ - '-pipe', - '-fPIE', '-funsigned-char', '-Wno-conversion', '-Wno-pointer-sign', @@ -132,9 +134,11 @@ test_ldflags = [ '-Wl,-z,relro', '-Wl,-z,now', # mingw - '-Wl,--dynamicbase', '-Wl,--nxcompat', ] +if not (host_machine.system() == 'windows' and get_option('debug')) + test_ldflags += '-Wl,--dynamicbase' +endif foreach ldflag : test_ldflags if meson.version().version_compare('>= 0.46.0') has_arg = cc.has_link_argument(ldflag) |