Skip to content

Commit fb2d0ff

Browse files
committed
Update wxWidgets/ispc
1 parent 825ff1c commit fb2d0ff

13 files changed

Lines changed: 32 additions & 32 deletions

.github/workflows/Ubuntu_Window_Release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ jobs:
4040
- name: install ISPC
4141
uses: ispc/install-ispc-action@main
4242
with:
43-
version: 1.29.1
43+
version: 1.30.0
4444

4545
- name: Download wxWidgets
4646
run:
47-
git clone --depth=1 --shallow-submodules --recurse-submodules -b xlights_2026.01 https://github.com/xLightsSequencer/wxWidgets ..\wxWidgets\
47+
git clone --depth=1 --shallow-submodules --recurse-submodules -b xlights_2026.02 https://github.com/xLightsSequencer/wxWidgets ..\wxWidgets\
4848

4949
- name: Build wxWidgets
5050
working-directory: ..\wxWidgets\
@@ -60,7 +60,7 @@ jobs:
6060
run: ISCC.exe xLights_4_64bit_VS.iss
6161

6262
- uses: ncipollo/release-action@v1
63-
with:
63+
with:gr
6464
allowUpdates: true
6565
artifacts: 'build_scripts\msw\output\*'
6666
token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/docker_manual.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Linux Docker Manual
1+
epname: Linux Docker Manual
22
on:
33
workflow_dispatch:
44

.github/workflows/win_CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
- name: install ISPC
7777
uses: ispc/install-ispc-action@main
7878
with:
79-
version: 1.29.1
79+
version: 1.30.0
8080

8181
- name: Download wxWidgets
8282
run:

.github/workflows/win_nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
- name: install ISPC
4343
uses: ispc/install-ispc-action@main
4444
with:
45-
version: 1.29.1
45+
version: 1.30.0
4646

4747
# - name: install Inno
4848
# run: choco install innosetup

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ SUDO = `which sudo`
2525

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

28-
WXWIDGETS_TAG=xlights_2026.01
29-
ISPC_VERSION=1.28.1
28+
WXWIDGETS_TAG=xlights_2026.02
29+
ISPC_VERSION=1.30.0
3030
ISPC_ARCH=$(shell uname -m)
3131

3232
ifeq '$(ISPC_ARCH)' 'aarch64'

README.windows

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Here are the steps to compile xLights for Windows using the Visual Studio compil
3030

3131
c) Download and build wxWidgets for Windows (currently using a patched version of 3.3.2).
3232

33-
git clone --recurse-submodules -b xlights_2026.01 https://github.com/xLightsSequencer/wxWidgets
33+
git clone --recurse-submodules -b xlights_2026.02 https://github.com/xLightsSequencer/wxWidgets
3434

3535
1) Also if you have built wxWidgets before you should delete the following 2 folders
3636
- <basedir>\wxWidgets\build\msw\vc_mswuddll
@@ -50,7 +50,7 @@ Here are the steps to compile xLights for Windows using the Visual Studio compil
5050
It is used in xLights for the generation of AVX1, AVX2, SEE2 and SSE4 optimized code.
5151

5252
1) Download ISPC from
53-
https://github.com/ispc/ispc/releases/download/v1.28.1/ispc-v1.28.1-windows.zip
53+
https://github.com/ispc/ispc/releases/download/v1.30.0/ispc-v1.30.0-windows.zip
5454
2) Extract the zip file to a folder of your choice.
5555
3) Add the path to the ISPC executable to your PATH environment variable.
5656

build_scripts/msw/clone_&_build_WX_xlights_x64.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ if exist wxWidgets.old echo y | rmdir /s wxWidgets.old
2626
ren wxWidgets wxWidgets.old
2727

2828
:clone
29-
git clone --recurse-submodules -b xlights_2026.01 https://github.com/xLightsSequencer/wxWidgets wxWidgets
29+
git clone --recurse-submodules -b xlights_2026.02 https://github.com/xLightsSequencer/wxWidgets wxWidgets
3030

3131
cd wxWidgets
3232
msbuild.exe /m .\build\msw\wx_vc17.sln /p:Configuration="Debug" /p:Platform="x64"

xLights/effects/ispc/ButterflyFunctions.ispc.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@ struct uint8_t4 { uint8_t v[4]; } __attribute__ ((aligned(4)));
5050
#warning "Alignment not supported on this compiler"
5151
#endif // defined(__cplusplus) && __cplusplus >= 201103L
5252
#ifndef __ISPC_ALIGNED_STRUCT__
53-
#if defined(__clang__) || !defined(_MSC_VER)
54-
// Clang, GCC, ICC
53+
#if defined(__clang__) || !defined(_MSC_VER) || _MSC_VER > 1943
54+
// Clang, GCC, ICC, Visual Studio
5555
#define __ISPC_ALIGNED_STRUCT__(s) struct __ISPC_ALIGN__(s)
5656
#else
57-
// Visual Studio
57+
// Older Visual Studio
5858
#define __ISPC_ALIGNED_STRUCT__(s) __ISPC_ALIGN__(s) struct
59-
#endif // defined(__clang__) || !defined(_MSC_VER)
59+
#endif // defined(__clang__) || !defined(_MSC_VER) || _MSC_VER > 1943
6060
#endif // __ISPC_ALIGNED_STRUCT__
6161

6262
#ifndef __ISPC_STRUCT_ButterflyData__

xLights/effects/ispc/LayerBlendingFunctions.ispc.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@ namespace ispc { /* namespace */
3636
#warning "Alignment not supported on this compiler"
3737
#endif // defined(__cplusplus) && __cplusplus >= 201103L
3838
#ifndef __ISPC_ALIGNED_STRUCT__
39-
#if defined(__clang__) || !defined(_MSC_VER)
40-
// Clang, GCC, ICC
39+
#if defined(__clang__) || !defined(_MSC_VER) || _MSC_VER > 1943
40+
// Clang, GCC, ICC, Visual Studio
4141
#define __ISPC_ALIGNED_STRUCT__(s) struct __ISPC_ALIGN__(s)
4242
#else
43-
// Visual Studio
43+
// Older Visual Studio
4444
#define __ISPC_ALIGNED_STRUCT__(s) __ISPC_ALIGN__(s) struct
45-
#endif // defined(__clang__) || !defined(_MSC_VER)
45+
#endif // defined(__clang__) || !defined(_MSC_VER) || _MSC_VER > 1943
4646
#endif // __ISPC_ALIGNED_STRUCT__
4747

4848
#ifndef __ISPC_STRUCT_LayerBlendingData__

0 commit comments

Comments
 (0)