Skip to content

bump wxWidgets to 3.3.1 #399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0tkl wants to merge 4 commits into
base: master
Choose a base branch
from
+14 −3
Open

bump wxWidgets to 3.3.1 #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
502295d
bump wxWidgets to 3.3.0
0tkl Jun 6, 2025
f0bff18
link to wxlexilla on wxW 3.3 ...
0tkl Jun 6, 2025
ee1cb9d
Update ci.yml
0tkl Jun 6, 2025
e66345b
bump wxWidgets to 3.3.1
0tkl Aug 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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:
Expand Down
10 changes: 10 additions & 0 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down
2 changes: 1 addition & 1 deletion subprojects/wxWidgets.wrap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading