From 49d70f1bbeb3a2c2c409a1af267e215675be4f04 Mon Sep 17 00:00:00 2001 From: bbbradsmith Date: Mon, 3 Feb 2025 23:34:05 -0500 Subject: [PATCH] iconv on all platforms, fix ubuntu build environment instead --- .github/workflows/contrib.yml | 8 ++++++-- contrib/Makefile | 11 +---------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/workflows/contrib.yml b/.github/workflows/contrib.yml index 7cafd99..3a4ae96 100644 --- a/.github/workflows/contrib.yml +++ b/.github/workflows/contrib.yml @@ -27,16 +27,20 @@ jobs: build-contrib-ubuntu: name: Contrib Ubuntu - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest steps: - name: Checkout Files uses: actions/checkout@v4 + - name: Setup libiconv + uses: ConorMacBride/install-package@v1 + with: + apt: libc6-dev - name: Build run: make -C contrib -j build-contrib-macos: name: Contrib macOS - runs-on: macos-14 + runs-on: macos-latest steps: - name: Checkout Files uses: actions/checkout@v4 diff --git a/contrib/Makefile b/contrib/Makefile index 513198b..6533ea0 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -36,16 +36,7 @@ ifeq ($(CXXFLAGS),) CXXFLAGS := $(CXXFLAGS_DEBUG) endif -ifeq ($(OS),Windows_NT) - # MSYS2 iconv - LDFLAGS_EXTRA := -liconv -else ifeq ($(shell uname),Darwin) - # MacOS iconv - LDFLAGS_EXTRA := -liconv -else - LDFLAGS_EXTRA := -endif - +LDFLAGS_EXTRA := -liconv LIBXGM_CPP_SRCS = \ ../xgm/devices/Audio/MedianFilter.cpp \