Commit: bf9e863d8cd9330221f0dd9709fd3566c46fa8b5
Parent: 3f0f969f6d944a420ea837870e9fac71ae9952d2
Author: Randy Palamar
Date: Mon, 12 May 2025 06:07:09 -0600
ci: update to work with new build script
Diffstat:
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,8 +16,11 @@ jobs:
steps:
- name: Install dependencies
run: |
- sudo apt-get install libxkbcommon-dev xorg-dev libwayland-dev ninja-build
+ sudo apt update
+ sudo apt install libxkbcommon-dev xorg-dev
- uses: actions/checkout@v4
+ with:
+ submodules: 'true'
- name: Build
run: ./build.sh
@@ -40,7 +43,8 @@ jobs:
msystem: ${{matrix.sys}}
update: true
install: git mingw-w64-${{matrix.env}}-${{matrix.cc}}
- pacboy: ninja:p cmake:p
- uses: actions/checkout@v4
+ with:
+ submodules: 'true'
- name: Build
run: ./build.sh
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,8 +24,9 @@ jobs:
msystem: clang64
update: true
install: git mingw-w64-clang-x86_64-clang
- pacboy: ninja:p cmake:p
- uses: actions/checkout@v4
+ with:
+ submodules: 'true'
- name: Build
run: ./build.sh
diff --git a/build.sh b/build.sh
@@ -45,7 +45,8 @@ build_raylib()
src=external/raylib/src
srcs="rcore rglfw rshapes rtext rtextures utils"
- raylib_cmd="${cflags} -I./external/raylib/src -DPLATFORM_DESKTOP_GLFW"
+ raylib_cmd="${cflags} -I./external/raylib/src -Iexternal/raylib/src/external/glfw/include"
+ raylib_cmd="${raylib_cmd} -DPLATFORM_DESKTOP_GLFW"
raylib_cmd="${raylib_cmd} -Wno-unused-but-set-variable -Wno-unused-parameter"
[ ! ${w32} ] && raylib_cmd="${raylib_cmd} -D_GLFW_X11"
@@ -84,7 +85,7 @@ raylib=out/libraylib.a
cflags="${cflags} -Wall -Wextra -Iout"
if [ ! -s "out/lora_sb_0_inc.h" ] || [ "gen_incs.c" -nt "out/lora_sb_0_inc.h" ]; then
- ${cc} ${cflags} -o gen_incs gen_incs.c ${ldflags} ${raylib} && ./gen_incs
+ ${cc} ${cflags} -o gen_incs gen_incs.c ${raylib} ${ldflags} && ./gen_incs
fi
if [ "$debug" ]; then