Skip to content

Commit

Permalink
Update wxWidgets
Browse files Browse the repository at this point in the history
  • Loading branch information
dkulp committed Dec 3, 2024
1 parent c495f1c commit 602444a
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/Ubuntu_Window_Release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:

- name: Download wxWidgets
run:
git clone --depth=1 --shallow-submodules --recurse-submodules -b xlights_2024.06 https://github.com/xLightsSequencer/wxWidgets C:/wxWidgets/
git clone --depth=1 --shallow-submodules --recurse-submodules -b xlights_2024.20 https://github.com/xLightsSequencer/wxWidgets C:/wxWidgets/

- name: Build wxWidgets
working-directory: C:/wxWidgets/
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ SUDO = `which sudo`

SUBDIRS = xLights xSchedule xCapture xFade xScanner xSchedule/xSMSDaemon xSchedule/RemoteFalcon

WXWIDGETS_TAG=xlights_2024.06
WXWIDGETS_TAG=xlights_2024.20

.NOTPARALLEL:

Expand Down
2 changes: 1 addition & 1 deletion README.windows
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Here are the steps to compile xLights for Windows using the Visual Studio compil
**** Skip "c)" if Using the "clone_&_build_WX_master_x64.cmd" script ****
c) Download and build wxWidgets for Windows (currently using a patched version of 3.2.0).

git clone --recurse-submodules -b xlights_2024.06 https://github.com/xLightsSequencer/wxWidgets
git clone --recurse-submodules -b xlights_2024.20 https://github.com/xLightsSequencer/wxWidgets

1) Also if you have built wxWidgets before you should delete the following 2 folders
- <basedir>\wxWidgets\build\msw\vc_mswuddll
Expand Down
2 changes: 1 addition & 1 deletion build_scripts/msw/clone_&_build_WX_xlights_x64.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if exist wxWidgets.old echo y | rmdir /s wxWidgets.old
ren wxWidgets wxWidgets.old

:clone
git clone --recurse-submodules -b xlights_2024.06 https://github.com/xLightsSequencer/wxWidgets wxWidgets
git clone --recurse-submodules -b xlights_2024.20 https://github.com/xLightsSequencer/wxWidgets wxWidgets

cd wxWidgets
msbuild.exe /m .\build\msw\wx_vc17.sln /p:Configuration="Debug" /p:Platform="x64"
Expand Down
2 changes: 1 addition & 1 deletion ci_scripts/ci_pre_xcodebuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ls -lart
#instead, grab the release tgz
rm -rf xLights-macOS-dependencies
export TAG=$(cat ${CI_PRIMARY_REPOSITORY_PATH}/macOS/README.macOS | grep recurse-submodules | cut -d "_" -f 2 | cut -d " " -f 1)
curl -L https://github.com/xLightsSequencer/xLights-macOS-dependencies/releases/download/xlights_${TAG}/xLights-macOS-dependencies-${TAG}.tgz --output - | tar -xz
curl -L https://github.com/xLightsSequencer/xLights-macOS-dependencies/releases/download/xlights_${TAG}/xLights-macOS-dependencies.tar.zst --output - | tar -xz
echo ""
echo "Post update"
ls -lart
Expand Down
2 changes: 1 addition & 1 deletion macOS
Submodule macOS updated 1 files
+4 −1 README.macOS

0 comments on commit 602444a

Please sign in to comment.