From 9e62920823c3fa62cbfd12a46b0cb9cd444e1b92 Mon Sep 17 00:00:00 2001 From: wittinobi Date: Wed, 26 Feb 2014 19:47:33 +0100 Subject: [PATCH] add libiconv --- make/neutrino.mk | 4 ++-- make/plugins.mk | 2 +- skel-root/etc/filesystems | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/make/neutrino.mk b/make/neutrino.mk index 0692adf..45b355c 100755 --- a/make/neutrino.mk +++ b/make/neutrino.mk @@ -15,7 +15,7 @@ APOLLO_CFLAGS += -I$(NEUTRINO_OBJDIR)/src/gui # the original build script links against openssl. # NEUTRINO_LDFLAGS = -L$(TARGETPREFIX)/lib -lcurl -lssl -lcrypto -ldl # the original build script links against openssl, but it is not needed at all. -NEUTRINO_LDFLAGS = -L$(TARGETPREFIX)/lib -lcurl -ldl +NEUTRINO_LDFLAGS = -L$(TARGETPREFIX)/lib -lcurl -liconv -ldl NEUTRINO_LDFLAGS += -Wl,-rpath-link,$(TARGETLIB) # finally we can build outside of the source directory @@ -72,5 +72,5 @@ $(D)/neutrino-hd-libs: else \ true; \ fi - $(MAKE) $(D)/libmad $(D)/libid3tag $(D)/libungif $(D)/openssl $(D)/libcurl $(D)/freetype $(D)/libjpeg $(D)/libboost $(D)/dvbsi $(D)/libflac $(D)/ffmpeg $(D)/libvorbis $(D)/openthreads $(D)/luaposix + $(MAKE) $(D)/libmad $(D)/libid3tag $(D)/libungif $(D)/openssl $(D)/libcurl $(D)/freetype $(D)/libjpeg $(D)/libiconv $(D)/libboost $(D)/dvbsi $(D)/libflac $(D)/ffmpeg $(D)/libvorbis $(D)/openthreads $(D)/luaposix touch $@ diff --git a/make/plugins.mk b/make/plugins.mk index 8ba4373..f4b1b3e 100644 --- a/make/plugins.mk +++ b/make/plugins.mk @@ -23,7 +23,7 @@ $(D)/cooliTSclimax: mkdir -p $(BIN) && \ cp -a $(SOURCE)/cooliTSclimax $(BUILD_TMP)/ && \ pushd $(BUILD_TMP)/cooliTSclimax && \ - $(TARGET)-g++ $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -lz -lfreetype -lbluray -lavformat -lavcodec -lavutil -lm -o $(BUILD_TMP)/cooliTSclimax/cooliTSclimax cooliTSclimax.cpp + $(TARGET)-g++ $(TARGET_CFLAGS) -L$(TARGETPREFIX)/lib -lz -lfreetype -lbluray -lavformat -lavcodec -liconv -lavutil -lm -o $(BUILD_TMP)/cooliTSclimax/cooliTSclimax cooliTSclimax.cpp cp -f $(BUILD_TMP)/cooliTSclimax/cooliTSclimax $(TARGETPREFIX)/bin/ rm -rf $(BUILD_TMP)/cooliTSclimax touch $@ diff --git a/skel-root/etc/filesystems b/skel-root/etc/filesystems index 3493036..d0dcda9 100755 --- a/skel-root/etc/filesystems +++ b/skel-root/etc/filesystems @@ -3,3 +3,4 @@ ext2 vfat xfs ntfs +udf -- 2.39.5