Skip to content

Commit bd3de2f

Browse files
committed
Updates to re-attempt to support macOS 10.15
1 parent a78a785 commit bd3de2f

6 files changed

Lines changed: 9 additions & 9 deletions

File tree

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
submodules: 'false'
1818
- uses: maxim-lobanov/setup-xcode@v1
1919
with:
20-
xcode-version: latest-stable
20+
xcode-version: '26.4.1'
2121
- name: Install dependencies
2222
run: |
2323
brew update

.github/workflows/Release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
submodules: 'false'
1717
- uses: maxim-lobanov/setup-xcode@v1
1818
with:
19-
xcode-version: latest-stable
19+
xcode-version: '26.4.1'
2020
- name: Install dependencies
2121
run: |
2222
brew update

README.deps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
wxwidgets: xlights_2026.04
1+
wxwidgets: xlights_2026.07
22

33
log4cpp:
44
Currently using 1.1.5 (REL_1.1.5_Dec_01_2025)

env.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
# --- macOS targets ---
3-
export MACOSX_DEPLOYMENT_TARGET=11.0
3+
export MACOSX_DEPLOYMENT_TARGET=10.15
44
export OSX_VERSION_MIN="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}"
5-
export ARM64_TARGETS="-target arm64-apple-macos11.0 -arch arm64"
6-
export X86_64_TARGETS="-target x86_64-apple-macos11.0 -arch x86_64"
5+
export ARM64_TARGETS="-target arm64-apple-macos10.15 -arch arm64"
6+
export X86_64_TARGETS="-target x86_64-apple-macos10.15 -arch x86_64"
77

88
#need ONE of these lines, default is to build for both arm64 and x86_64
99
export XL_TARGETS="${X86_64_TARGETS} ${ARM64_TARGETS}"

submodules/build_wxwidgets.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export CC=clang
2222
export CPP="clang -E"
2323
export CFLAGS="-g"
2424
../configure --disable-debug_flag --enable-debug_info --enable-optimise --prefix=${BASE_DEPS_DIR} --enable-universal_binary=${BINARY_PLATFORMS} \
25-
--with-osx_cocoa --with-macosx-version-min=11.0 --disable-dependency-tracking \
25+
--with-osx_cocoa --with-macosx-version-min=${MACOSX_DEPLOYMENT_TARGET} --disable-dependency-tracking \
2626
--disable-compat30 --enable-mimetype --enable-aui --with-opengl \
2727
--enable-webview --enable-webviewwebkit --disable-mdi --disable-mdidoc --disable-loggui \
2828
--disable-xrc --disable-stc --disable-ribbon --disable-htmlhelp --disable-mediactrl \
@@ -47,7 +47,7 @@ export CPP="clang -E"
4747
export CFLAGS="-g"
4848
../configure --prefix=${BASE_DEPS_DIR} --libdir=${BASE_DEPS_DIR}/libdbg \
4949
--enable-debug --enable-debug_info --disable-optimise --enable-universal_binary=${BINARY_PLATFORMS} \
50-
--with-osx_cocoa --with-macosx-version-min=11.0 --disable-dependency-tracking \
50+
--with-osx_cocoa --with-macosx-version-min=${MACOSX_DEPLOYMENT_TARGET} --disable-dependency-tracking \
5151
--disable-compat30 --enable-mimetype --enable-aui --with-opengl \
5252
--enable-webview --enable-webviewwebkit --disable-mdi --disable-mdidoc --disable-loggui \
5353
--disable-xrc --disable-stc --disable-ribbon --disable-htmlhelp --disable-mediactrl \

submodules/wxWidgets

Submodule wxWidgets updated 162 files

0 commit comments

Comments
 (0)