Skip to content

Commit 3b4ad7e

Browse files
committed
Use 3.2.8.1 for it must have fp.h problem fixed
1 parent cd8796a commit 3b4ad7e

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

.github/scripts/build-macos-wxwidgets.sh

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,28 @@
2222

2323
set -e
2424

25-
export MAKEFLAGS=-j$(getconf _NPROCESSORS_ONLN)
25+
MAKEFLAGS=-j$(getconf _NPROCESSORS_ONLN)
26+
export MAKEFLAGS
2627

2728
if [ -z "$WXWIDGETS_VERSION" ]; then
28-
WXWIDGETS_VERSION=3.1.5
29+
# Value is set in .github/workflows/main.yaml for MacOS only, this here is the fallback value
30+
WXWIDGETS_VERSION=3.2.8.1
2931
fi
3032

31-
vsn=$WXWIDGETS_VERSION
32-
curl --fail -LO https://github.com/wxWidgets/wxWidgets/releases/download/v$vsn/wxWidgets-$vsn.tar.bz2
33-
tar -xf wxWidgets-$vsn.tar.bz2
34-
mv wxWidgets-$vsn/ wxWidgets
33+
WX_SELECTED_VERSION=${WXWIDGETS_VERSION}
34+
WX_DOWNLOAD_URL=https://github.com/wxWidgets/wxWidgets/releases/download/v${WX_SELECTED_VERSION}/wxWidgets-${WX_SELECTED_VERSION}.tar.bz2
35+
echo "Downloading WxWidgets from ${WX_DOWNLOAD_URL}"
36+
curl --fail -LO "${WX_DOWNLOAD_URL}"
37+
tar -xf "wxWidgets-${WX_SELECTED_VERSION}.tar.bz2"
38+
mv "wxWidgets-${WX_SELECTED_VERSION}/" wxWidgets
3539

3640
cd wxWidgets
3741
./configure \
3842
--disable-shared \
39-
--prefix=$PWD/release \
43+
--prefix="${PWD}/release" \
4044
--with-cocoa \
41-
--with-macosx-version-min=10.15
45+
--with-macosx-version-min=10.15 \
46+
--with-libtiff=builtin
4247
# --disable-sys-libs
4348

4449
make

.github/workflows/main.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ jobs:
194194
needs: pack
195195
if: needs.pack.outputs.build-c-code == 'true'
196196
env:
197-
WXWIDGETS_VERSION: 3.2.6
197+
WXWIDGETS_VERSION: 3.2.8.1
198198
MACOS_VERSION: 15
199199
steps:
200200
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # ratchet:actions/[email protected]

0 commit comments

Comments
 (0)