devilhorns pushed a commit to branch master.
http://git.enlightenment.org/apps/express.git/commit/?id=ebc80a3fe6b688de4f0d599a6085e824e5078bd4
commit ebc80a3fe6b688de4f0d599a6085e824e5078bd4
Author: Christopher Michael <devilho...@comcast.net>
Date: Fri Feb 12 12:25:27 2021 -0500
express: Fix express meson build for library dependencies
This should be the final patch to make Express be fully Meson-able....
NB: A Big Thank You to Vincent Torri <vincent.to...@gmail.com> for his work
on
converting Express to use meson !!! :D
---
meson.build | 2 +-
src/lib/meson.build | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 83ce370..25798ee 100644
--- a/meson.build
+++ b/meson.build
@@ -42,7 +42,6 @@ express_cflags_try = [
'-Wl,--no-copy-dt-needed-entries',
'-Wshadow',
'-Wstrict-prototypes',
- '-Werror=missing-prototypes',
'-Werror=pointer-arith',
'-Wno-missing-field-initializers']
@@ -123,6 +122,7 @@ pkgconf.set('pkgincludedir',
'${prefix}/@0@'.format(get_option('includedir')) +
pkgconf.set('VMAJ', v_maj)
pkgconf.set('VERSION', meson.project_version())
pkgconf.set('requirements_libexpress_pc', requirement_express_pc)
+pkgconf.set('requirements_libexpress_libs', requirement_express_libs)
pkg_install_dir = '@0@/pkgconfig'.format(get_option('libdir'))
diff --git a/src/lib/meson.build b/src/lib/meson.build
index 760d797..a25b5ea 100644
--- a/src/lib/meson.build
+++ b/src/lib/meson.build
@@ -27,8 +27,10 @@ sys_windows = win32.contains(host_os)
if sys_windows == true
ws2_32 = cc.find_library('ws2_32')
express_ext_deps = [ ws2_32 ]
+ requirement_express_libs = '-lws2_32'
else
express_ext_deps = [ ]
+ requirement_express_libs = ''
endif
express_lib = library('express', express_lib_src,
--
