Archive/TRX
0
0
Fork 0
mirror of https://github.com/LostArtefacts/TRX.git synced 2025-04-28 20:58:07 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

build: fix GH jobs

Browse source
This commit is contained in:
Marcin Kurczewski 2023-09-21 17:38:17 +02:00
parent a38bd83dbd
commit 0da996864c
No known key found for this signature in database
GPG key ID: CC65E6FD28CAE42A
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/build_docker.yml vendored
View file

@ -22,7 +22,7 @@ jobs:
- name: Build Docker image (Windows) - name: Build Docker image (Windows)
run: | run: |
docker build -t "rrdash/tomb1main:latest" . -f docker/game/win/Dockerfile docker build -t "rrdash/tomb1main:latest" . -f docker/game-win/Dockerfile
docker push "rrdash/tomb1main:latest" docker push "rrdash/tomb1main:latest"
publish_docker_image_linux: publish_docker_image_linux:
@ -43,5 +43,5 @@ jobs:
- name: Build Docker image (Linux) - name: Build Docker image (Linux)
run: | run: |
docker build -t "rrdash/tomb1main-linux:latest" . -f docker/game/linux/Dockerfile docker build -t "rrdash/tomb1main-linux:latest" . -f docker/game-linux/Dockerfile
docker push "rrdash/tomb1main-linux:latest" docker push "rrdash/tomb1main-linux:latest"

2
.github/workflows/release.yml vendored
View file

@ -36,7 +36,7 @@ jobs:
publish_release: publish_release:
name: Create a GitHub release name: Create a GitHub release
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: [build_game_win, build_installer] needs: [build_game_win, build_game_linux, build_installer]
steps: steps:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v3 uses: actions/checkout@v3

4
docker/game-linux/Dockerfile
View file

@ -20,7 +20,7 @@ RUN apt-get update \
# libav # libav
FROM base as libav FROM base AS libav
RUN apt-get install -y \ RUN apt-get install -y \
nasm \ nasm \
gcc \ gcc \
@ -68,7 +68,7 @@ RUN cd FFmpeg \
# SDL # SDL
FROM base as sdl FROM base AS sdl
RUN git clone https://github.com/libsdl-org/SDL -b SDL2 RUN git clone https://github.com/libsdl-org/SDL -b SDL2
RUN apt-get install -y \ RUN apt-get install -y \
libgl1-mesa-dev \ libgl1-mesa-dev \

8
docker/game-linux/entrypoint.sh
View file

@ -11,8 +11,8 @@ fi
cd /app/build/linux; meson compile cd /app/build/linux; meson compile
if [ "$TARGET" = release ]; then if [ "$TARGET" = release ]; then
for file in Tomb1Main; do exe_file=Tomb1Main
upx -t "$file" || ( strip "$file" && upx "$file" ) if ! upx -t "$exe_file"; then
done strip "$exe_file" && upx "$exe_file"
fi
fi fi

2
src/game/inject.c
View file

@ -1490,7 +1490,7 @@ static void Inject_AddRoomFace(INJECTION *injection)
// Increment the relevant number of faces and work out the // Increment the relevant number of faces and work out the
// starting point in the mesh for the injection. // starting point in the mesh for the injection.
int inject_pos; int inject_pos = 0;
int num_data = r->data[data_index]; // Quads int num_data = r->data[data_index]; // Quads
if (face_type == FT_TEXTURED_QUAD) { if (face_type == FT_TEXTURED_QUAD) {
r->data[data_index]++; r->data[data_index]++;

2
src/game/overlay.c
View file

@ -339,7 +339,7 @@ static void Overlay_DrawPickup3D(DISPLAY_PICKUP_INFO *pu)
int32_t src_x = padding_x + (pu->grid_x + 1.0f) * pickup_width; int32_t src_x = padding_x + (pu->grid_x + 1.0f) * pickup_width;
int32_t src_y = 0; int32_t src_y = 0;
float ease; float ease = 1.0f;
switch (pu->phase) { switch (pu->phase) {
case DPP_EASE_IN: case DPP_EASE_IN:
ease = Overlay_Ease(pu->duration, MAX_PICKUP_DURATION_EASE_IN); ease = Overlay_Ease(pu->duration, MAX_PICKUP_DURATION_EASE_IN);