Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 33 additions & 3 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,18 @@ jobs:
7z x ${{ steps.sqlite.outputs.filepath }}
mv sqlite-amalgamation-3510300 sqlite3

- name: Download lzma (xz)
id: lzma
uses: mercury233/action-cache-download-file@v1.2.0
with:
url: https://github.com/tukaani-project/xz/releases/download/v5.8.3/xz-5.8.3.tar.gz
sha256: 3d3a1b973af218114f4f889bbaa2f4c037deaae0c8e815eec381c3d546b974a0

- name: Extract lzma
run: |
tar xf ${{ steps.lzma.outputs.filepath }}
mv xz-5.8.3 lzma

- name: Create miniaudio external directory
run: |
mkdir -p miniaudio/external
Expand Down Expand Up @@ -246,6 +258,7 @@ jobs:
png/
zlib/
sqlite3/
lzma/
miniaudio/
!miniaudio/external/opus/dnn/

Expand Down Expand Up @@ -421,6 +434,7 @@ jobs:
include:
- name: ubuntu-22
os: ubuntu-22.04
apt-outdated: true
- name: ubuntu-24
os: ubuntu-24.04
- name: ubuntu-static-link
Expand Down Expand Up @@ -459,7 +473,7 @@ jobs:
- name: Install dependencies (dynamic link)
if: matrix.static-link != true
run: |
sudo apt-get install -y libevent-dev libfreetype6-dev libsqlite3-dev libopusfile-dev libvorbis-dev libjpeg-dev libpng-dev zlib1g-dev
sudo apt-get install -y libevent-dev libfreetype6-dev libsqlite3-dev libopusfile-dev libvorbis-dev libjpeg-dev libpng-dev zlib1g-dev liblzma-dev

- name: Install NASM
if: matrix.static-link == true
Expand Down Expand Up @@ -524,6 +538,20 @@ jobs:
./configure
cd ../../..

- name: Download lzma (xz)
if: matrix.apt-outdated == true
id: lzma
uses: mercury233/action-cache-download-file@v1.2.0
with:
url: https://github.com/tukaani-project/xz/releases/download/v5.8.3/xz-5.8.3.tar.gz
sha256: 3d3a1b973af218114f4f889bbaa2f4c037deaae0c8e815eec381c3d546b974a0

- name: Extract lzma
if: matrix.apt-outdated == true
run: |
tar xf ${{ steps.lzma.outputs.filepath }}
mv xz-5.8.3 lzma

- name: Copy premake files
run: |
cp -pr premake/* .
Expand All @@ -532,7 +560,7 @@ jobs:
- name: Use premake to generate make files (apt packages)
if: matrix.static-link != true
run: |
./premake5 gmake
./premake5 gmake ${{ matrix.apt-outdated == true && '--build-lzma' || '' }}

- name: Use premake to generate make files (static link)
if: matrix.static-link == true
Expand All @@ -544,6 +572,7 @@ jobs:
--build-zlib \
--build-freetype \
--build-sqlite \
--build-lzma \
--build-opus-vorbis

- name: Make
Expand Down Expand Up @@ -607,7 +636,7 @@ jobs:
if: matrix.static-link != true
run: |
brew install opus opusfile libvorbis zlib
# brew install sqlite libx11 freetype libevent libjpeg-turbo libpng
# brew install sqlite libx11 freetype libevent libjpeg-turbo libpng xz

- name: Install NASM
if: matrix.static-link == true
Expand Down Expand Up @@ -687,6 +716,7 @@ jobs:
--build-zlib \
--build-freetype \
--build-sqlite \
--build-lzma \
--build-opus-vorbis

- name: Make
Expand Down
127 changes: 0 additions & 127 deletions gframe/lzma/Alloc.c

This file was deleted.

38 changes: 0 additions & 38 deletions gframe/lzma/Alloc.h

This file was deleted.

6 changes: 0 additions & 6 deletions gframe/lzma/CMakeLists.txt

This file was deleted.

Loading