From 37b1c3d074f58290fa01a5f16206a47eeef20ae6 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Wed, 6 Jun 2018 16:25:49 +0100 Subject: [PATCH] meson: Correctly set Libs: in xorg-server.pc for Windows c.f. configure.ac:1663 v2: Also drop -lfb from XORG_DRIVER_LIBS, since it's linked statically into the Xorg server since c1703cdf. --- meson.build | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meson.build b/meson.build index 9201428a8..997b07616 100644 --- a/meson.build +++ b/meson.build @@ -860,6 +860,13 @@ if build_xorg sdkconfig.set('symbol_visibility', '-fvisibility=hidden') sdkconfig.set('XORG_DRIVER_LIBS', '') + # On Windows, modules built with the SDK will need to link with server and + # module implibs to resolve symbols + if (host_machine.system() == 'cygwin' or + host_machine.system() == 'windows') + sdkconfig.set('XORG_DRIVER_LIBS', '-lXorg.exe -L\${moduledir} -lshadow -no-undefined') + endif + configure_file( input: 'xorg-server.pc.in', output: 'xorg-server.pc',