From d78e0c995f32b8f4c0c0ba9c38638c3e7fe0ad6d Mon Sep 17 00:00:00 2001 From: Markham Date: Wed, 12 May 2021 21:51:13 +0200 Subject: [PATCH] small fix libcoolstream.mk --- make/libcoolstream.mk | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/make/libcoolstream.mk b/make/libcoolstream.mk index 60c71a1..f5afdc1 100644 --- a/make/libcoolstream.mk +++ b/make/libcoolstream.mk @@ -4,14 +4,20 @@ LIBCS_DEBUG = off LIBCS_BASE = $(SOURCE_DIR)/library-coolstream EXTRA_INCLUDE_PATH = -I$(TARGETPREFIX)/include EXTRA_LIBRARY_PATH = -L$(TARGETPREFIX)/lib + +ifeq ($(BOXSERIES), hd1) LOCAL_CXXFLAGS = LOCAL_LDFLAGS = +else if ($(BOXSERIES), hd2) +LOCAL_CXXFLAGS = -Wno-error +LOCAL_LDFLAGS = +endif #PLATFORM = apollo #PLATFORM = kronos #PLATFORM = nevis -#ifeq ($(BOXMODEL), nevis) +#ifeq ($(PLATFORM), nevis) # BOXSERIES = hd1 #else # BOXSERIES = hd2 @@ -30,7 +36,7 @@ LIBCS_BUILDARGS = \ libcoolstream: - @rm -fr $(BUILD_TMP)/$(LIBCS_BUILD_DIR) + @rm -fr $(LIBCS_BUILD_DIR) @echo "***** PLATFORM => $(PLATFORM)" @echo "***** BOXSERIES => $(BOXSERIES)" set -e; cd $(LIBCS_DIR); \ @@ -38,6 +44,8 @@ libcoolstream: BUILD_DIR=$(LIBCS_BUILD_DIR) \ EXTRA_INCLUDE_PATH="$(EXTRA_INCLUDE_PATH)" \ EXTRA_LIBRARY_PATH="$(EXTRA_LIBRARY_PATH)" \ + LOCAL_CXXFLAGS="$(LOCAL_CXXFLAGS)" \ + LOCAL_LDFLAGS="$(LOCAL_LDFLAGS)" \ $(LIBCS_BUILDARGS) @echo "INSTALL libcoolstream-mt.* => $(LIBCS_INSTALL_DIR)" # @cp -frd $(BUILD_TMP)/$(LIBCS_BUILD_DIR)/libcoolstream-mt.* $(LIBCS_INSTALL_DIR) -- 2.39.5