diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 836c3b2f67..e09f58e9a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,6 +34,7 @@ jobs: -Dfribidi:tests=false -Dfribidi:docs=false -Dlibass:fontconfig=disabled + -Dwx_version='3.3.0' #- { # name: Windows MinGW, # os: windows-latest, @@ -55,13 +56,13 @@ jobs: name: macOS Debug, os: macos-13, buildtype: debugoptimized, - args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2 + args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2 -Dwx_version='3.3.0' } - { name: macOS Release, os: macos-13, buildtype: release, - args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2 + args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true --force-fallback-for=ffms2 -Dwx_version='3.3.0' } steps: diff --git a/meson.build b/meson.build index b79c9e7fe5..48973a46e9 100644 --- a/meson.build +++ b/meson.build @@ -166,12 +166,22 @@ else wx.dependency('wxscintilla') ] + if get_option('wx_version').version_compare('>=3.3.0') + deps += [ + wx.dependency('wxlexilla'), + ] + endif + if host_machine.system() == 'windows' or host_machine.system() == 'darwin' deps += [ wx.dependency('wxpng'), ] endif + if host_machine.system() == 'darwin' and get_option('wx_version').version_compare('>=3.3.0') + deps += dependency('libpng') + endif + if host_machine.system() == 'windows' deps += [ wx.dependency('wxzlib'), diff --git a/subprojects/wxWidgets.wrap b/subprojects/wxWidgets.wrap index e6947e6a92..493400a9f1 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 = v3.2.2 +revision = v3.3.1 clone-recursive = true