Skip to content

Commit

Permalink
macOS needs iconv for everything
Browse files Browse the repository at this point in the history
  • Loading branch information
bbbradsmith committed Feb 4, 2025
1 parent 125fffe commit a4e5906
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions contrib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,14 @@ endif

ifeq ($(OS),Windows_NT)
# MSYS2 iconv
LIBS_ICONV := -liconv
LDFLAGS_EXTRA := -liconv
else ifeq ($(shell uname),Darwin)
# MacOS iconv
LIBS_ICONV := -liconv
LDFLAGS_EXTRA := -liconv
else
LIBS_ICONV :=
LDFLAGS_EXTRA :=
endif

LDFLAGS_EXTRA :=

LIBXGM_CPP_SRCS = \
../xgm/devices/Audio/MedianFilter.cpp \
Expand Down Expand Up @@ -187,7 +186,7 @@ release_debug:
demo: nsf2wav$(EXE_EXT)

nsfmeta$(EXE_EXT): $(OBJDIR)/nsfmeta.o $(LIB_STATIC)
$(CXX) -o $@ $^ $(LDFLAGS_EXTRA) $(LIBS_ICONV)
$(CXX) -o $@ $^ $(LDFLAGS_EXTRA)

nsf2wav$(EXE_EXT): $(OBJDIR)/nsf2wav.o $(LIB_STATIC)
$(CXX) -o $@ $^ $(LDFLAGS_EXTRA)
Expand Down

0 comments on commit a4e5906

Please sign in to comment.