Skip to content

Commit f441757

Browse files
committed
webOS: enable wayland by default for GLES 3 binary, keep GLES 2 without wayland
1 parent 68768fc commit f441757

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

.github/workflows/webOS.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,23 +68,27 @@ jobs:
6868
RARCH_VERSION=$(grep -Po '(?<=#define PACKAGE_VERSION ")[^"]+' version.all)
6969
echo "RARCH_VERSION=$RARCH_VERSION" >> "$GITHUB_ENV"
7070
71-
- name: Compile RA (GLES3 variant)
71+
- name: Compile RA (GLES3 and Wayland variant)
7272
shell: bash
7373
run: |
7474
. /tmp/arm-webos-linux-gnueabi_sdk-buildroot/environment-setup
75+
if [ -z "$SDK_PATH" ]; then
76+
export SDK_PATH=/tmp/arm-webos-linux-gnueabi_sdk-buildroot
77+
fi
7578
make -f Makefile.webos clean
7679
make -f Makefile.webos ipk PACKAGE_NAME=${PACKAGE_NAME} ADD_SDL2_LIB=1 \
80+
HAVE_XKBCOMMON=1 HAVE_USERLAND=1 HAVE_EGL=1 HAVE_WAYLAND=1 \
7781
HAVE_OPENGLES3=1 HAVE_OPENGLES3_1=1 HAVE_OPENGLES3_2=1 -j"$(getconf _NPROCESSORS_ONLN)"
7882
mv webos/com.retroarch.webos_${RARCH_VERSION}_arm.ipk \
79-
webos/com.retroarch.webos.gles3_${RARCH_VERSION}_arm.ipk
83+
webos/com.retroarch.webos.gles3w_${RARCH_VERSION}_arm.ipk
8084
env:
8185
DEBUG: ${{ github.event_name == 'release' && '0' || '1' }}
8286

83-
- name: Upload GLES3 artifact
87+
- name: Upload GLES3 and Wayland artifact
8488
uses: actions/upload-artifact@v4
8589
with:
86-
name: com.retroarch.webos.gles3_${{ env.RARCH_VERSION }}_${{ github.sha }}_arm.ipk
87-
path: webos/com.retroarch.webos.gles3_${{ env.RARCH_VERSION }}_arm.ipk
90+
name: com.retroarch.webos.gles3w_${{ env.RARCH_VERSION }}_${{ github.sha }}_arm.ipk
91+
path: webos/com.retroarch.webos.gles3w_${{ env.RARCH_VERSION }}_arm.ipk
8892

8993
- name: Compile RA (default)
9094
shell: bash
@@ -121,5 +125,5 @@ jobs:
121125
omitPrereleaseDuringUpdate: true
122126
artifacts: |
123127
webos/com.retroarch.webos_${{ env.RARCH_VERSION }}_arm.ipk
124-
webos/com.retroarch.webos.gles3_${{ env.RARCH_VERSION }}_arm.ipk
128+
webos/com.retroarch.webos.gles3w_${{ env.RARCH_VERSION }}_arm.ipk
125129
webos/${{ env.PACKAGE_NAME }}.manifest.json

0 commit comments

Comments
 (0)