From 805b01720d36c2a1f352a1c59a2922585edd26d4 Mon Sep 17 00:00:00 2001 From: Myaamori Date: Sun, 22 Nov 2020 18:21:23 +0000 Subject: [PATCH] meson: fix wx subproject on Linux --- meson.build | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 2a2667a77..8effd1e33 100644 --- a/meson.build +++ b/meson.build @@ -144,17 +144,21 @@ else wx = cmake.subproject('wxWidgets', cmake_options: ['-DwxBUILD_INSTALL=OFF', '-DwxBUILD_PRECOMP=OFF', # otherwise breaks project generation w/ meson '-DwxBUILD_SHARED=@0@'.format(build_shared), + '-DwxUSE_WEBVIEW=OFF', # breaks build on linux '-DwxBUILD_MONOLITHIC=ON']) # otherwise breaks project generation w/ meson deps += [ wx.dependency('wxmono'), - wx.dependency('wxzlib'), - wx.dependency('wxpng'), - wx.dependency('wxexpat'), wx.dependency('wxregex'), wx.dependency('wxscintilla') ] if host_machine.system() == 'windows' + deps += [ + wx.dependency('wxzlib'), + wx.dependency('wxpng'), + wx.dependency('wxexpat') + ] + if cc.has_header('rpc.h') deps += cc.find_library('rpcrt4', required: true) else