iconv on all platforms, fix ubuntu build environment instead

bbbradsmith · Feb 4, 2025 · 49d70f1 · 49d70f1
1 parent a4e5906
commit 49d70f1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git 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
@@ -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 \