From: Markham <markham001@gmx.de>
Date: Fri, 3 Dec 2021 12:38:26 +0000 (+0100)
Subject: libcoolstream.mk: possibility tu use own libcool
X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=3c9938dc3796fe92ebea16d2f05eed7b58d67988;p=bs-cst-neutrino-hd.git

libcoolstream.mk: possibility tu use own libcool
---

diff --git a/make/libcoolstream.mk b/make/libcoolstream.mk
index 2321432..bfdd158 100644
--- a/make/libcoolstream.mk
+++ b/make/libcoolstream.mk
@@ -4,7 +4,13 @@ else
 LIBCS_DEBUG		= off
 endif
 
+ifeq ($(USE_OWN_LIBCOOL), yes)
+LIBCS_BASE		= $(BASE_DIR)/../library-coolstream
+else
 LIBCS_BASE		= $(SOURCE_DIR)/library-coolstream
+endif
+
+
 #LIBCS_BASE		= $(HOME)/libcoolstream
 EXTRA_INCLUDE_PATH	= -I$(TARGETPREFIX)/include
 EXTRA_LIBRARY_PATH	= -L$(TARGETPREFIX)/lib
@@ -52,8 +58,8 @@ libcoolstream:
 			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)
+	@echo "INSTALL libcoolstream.* => $(LIBCS_INSTALL_DIR)"
+	@cp -frd $(LIBCS_BUILD_DIR)/libcoolstream.* $(LIBCS_INSTALL_DIR)
 
 ifeq ($(PLATFORM), nevis)
 libnxp:
diff --git a/make/neutrino.mk b/make/neutrino.mk
index aabc12b..e7ac2b3 100755
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -96,12 +96,12 @@ endif
 
 N_CONFIGURE_LIBSTB_HAL =
 ifeq ($(BOXTYPE), coolstream)
-  ifeq ($(HAS_LIBCOOLSTREAM),yes)
+  ifeq ($(HAS_LIBCOOLSTREAM), yes)
     NEUTRINO_DEPS += libcoolstream
-    ifeq ($(DEBUG),yes)
+    ifeq ($(DEBUG), yes)
       N_CONFIG_OPTS += \
-	--enable-libcoolstream-static \
-	--with-libcoolstream-static-dir=$(BUILD_TMP)/libcoolstream
+      --enable-libcoolstream-static \
+      --with-libcoolstream-static-dir=$(BUILD_TMP)/libcoolstream
     endif
   endif
 else