Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to zlib-ng 2.2.1-r2 and rework to use cmake build on all platforms #11

Merged
merged 5 commits into from
Aug 10, 2024
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
21 changes: 16 additions & 5 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,27 @@
name: Build
on: [push]
on:
pull_request:
push:
branches: [main]
tags: [v*]
jobs:
build:
strategy:
matrix:
os: [windows-2022, macos-11, ubuntu-22.04]
os: [windows-2022, macos-12, ubuntu-22.04]
addrsize: ["64"]
include:
- os: windows-2022
addrsize: "32"
runs-on: ${{ matrix.os }}
steps:
- name: Setup Homebrew Packages
if: ${{ runner.os == 'macOS' }}
shell: bash
run: brew install ninja
- name: Setup Apt Packages
if: ${{ runner.os == 'Linux' }}
shell: bash
run: |
sudo apt-get update
sudo apt-get -y install ninja-build
- uses: secondlife/action-autobuild@v4
with:
addrsize: ${{ matrix.addrsize }}
Expand Down
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@

# https://www.atlassian.com/git/tutorials/saving-changes/gitignore

stage

*.tar.*
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "libpng"]
path = libpng
url = https://github.com/pnggroup/libpng.git
9 changes: 0 additions & 9 deletions BuildParams

This file was deleted.

Loading