Skip to content

Commit

Permalink
MSYS2 build action
Browse files Browse the repository at this point in the history
move contrib action to its own file
  • Loading branch information
bbbradsmith committed Feb 4, 2025
1 parent e65462c commit 6fe3a5a
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 21 deletions.
18 changes: 0 additions & 18 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,3 @@ jobs:
with:
name: nsfplay-unstable--${{ env.BUILD_TAG }}
path: artifact/

build-contrib-ubuntu:
name: Contrib Ubuntu
runs-on: ubuntu-24.04
steps:
- name: Checkout Files
uses: actions/checkout@v4
- name: Build
run: make -C contrib -j

build-contrib-macos:
name: Contrib macOS
runs-on: macos-14
steps:
- name: Checkout Files
uses: actions/checkout@v4
- name: Build
run: make -C contrib -j
44 changes: 44 additions & 0 deletions .github/workflows/contrib.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: NSFPlay contrib build test
on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]
workflow_dispatch:
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build-msys2:
name: Contrib MSYS2
runs-on: windows-latest
steps:
- name: Checkout Files
uses: actions/checkout@v4
- name: Setup MSYS2
uses: msys2/setup-msys2@v2
with:
msystem: UCRT64
install: make mingw-w64-ucrt-x86_64-gcc mingw-w64-ucrt-x86_64-libiconv
- name: Build
shell: msys2 {0}
run: make -C contrib -j

build-contrib-ubuntu:
name: Contrib Ubuntu
runs-on: ubuntu-latest
steps:
- name: Checkout Files
uses: actions/checkout@v4
- name: Build
run: make -C contrib -j

build-contrib-macos:
name: Contrib macOS
runs-on: macos-latest
steps:
- name: Checkout Files
uses: actions/checkout@v4
- name: Build
run: make -C contrib -j
10 changes: 7 additions & 3 deletions contrib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,13 @@ ifeq ($(CXXFLAGS),)
CXXFLAGS := $(CXXFLAGS_DEBUG)
endif

UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
LDFLAGS_EXTRA = -liconv
ifeq ($(OS),Windows_NT)
LDFLAGS_EXTRA := -liconv
else ifeq ($(shell uname),Darwin)
LDFLAGS_EXTRA := -liconv
else
# iconv assumed to be part of the standard C library
LDFLAGS_EXTRA :=
endif

LIBXGM_CPP_SRCS = \
Expand Down

0 comments on commit 6fe3a5a

Please sign in to comment.