From 03de8929d4546f06ac4f3d606954e6286c431054 Mon Sep 17 00:00:00 2001 From: Myaamori Date: Wed, 28 Oct 2020 04:13:08 +0000 Subject: [PATCH] meson: pin wx version and fix dependencies --- meson.build | 3 ++- subprojects/wxWidgets.wrap | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 7abdfa449..695cbfd81 100644 --- a/meson.build +++ b/meson.build @@ -103,10 +103,11 @@ else # this will only be hit with msvc '-DwxBUILD_SHARED=@0@'.format(buildShared), '-DwxBUILD_MONOLITHIC=ON']) # otherwise breaks project generation w/ meson deps += [ - wx.dependency('mono'), + wx.dependency('wxmono'), wx.dependency('wxzlib'), wx.dependency('wxpng'), wx.dependency('wxexpat'), + wx.dependency('wxregex'), wx.dependency('wxscintilla') ] diff --git a/subprojects/wxWidgets.wrap b/subprojects/wxWidgets.wrap index a77194055..949a03927 100644 --- a/subprojects/wxWidgets.wrap +++ b/subprojects/wxWidgets.wrap @@ -1,5 +1,5 @@ [wrap-git] directory = wxWidgets url = https://github.com/wxWidgets/wxWidgets.git -revision = master -clone-recursive = true \ No newline at end of file +revision = v3.1.4 +clone-recursive = true