add possibility to build libcs static

diff --git a/make/libcoolstream.mk b/make/libcoolstream.mk
index b164340d2f9ed718fc24799d062174c4dc244f3b..23214321a67009fefc8623a026d276eaa119660a 100644 (file)
--- a/make/libcoolstream.mk
+++ b/make/libcoolstream.mk
@@ -1,5 +1,8 @@
-
+ifeq ($(DEBUG), yes)
+LIBCS_DEBUG            = on
+else
 LIBCS_DEBUG            = off
+endif
 
 LIBCS_BASE             = $(SOURCE_DIR)/library-coolstream
 #LIBCS_BASE            = $(HOME)/libcoolstream
@@ -38,6 +41,7 @@ LIBCS_BUILDARGS               = \
 
 libcoolstream:
        @rm -fr $(LIBCS_BUILD_DIR)
+       @echo "***** DEBUG  => $(LIBCS_DEBUG)"
        @echo "***** PLATFORM  => $(PLATFORM)"
        @echo "***** BOXSERIES => $(BOXSERIES)"
        set -e; cd $(LIBCS_DIR);                                        \

diff --git a/make/neutrino.mk b/make/neutrino.mk
index 3a0cb3fd1932925e54482870937fb2e77e0c057a..abd0ed6008fe23864be2e6d48ce42855b3fcdfa3 100755 (executable)
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -18,8 +18,9 @@ N_CFLAGS += -Wno-psabi
 ifeq ($(PLATFORM), $(filter $(PLATFORM), apollo kronos))
 #N_CFLAGS += -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard
 N_CFLAGS += -DFB_HW_ACCELERATION
-else
-#N_CFLAGS += -DUSE_NEVIS_GXA
+endif
+ifeq ($(PLATFORM), $(filter $(PLATFORM), nevis))
+N_CFLAGS += -DUSE_NEVIS_GXA
 N_CFLAGS +=
 endif
 
@@ -94,7 +95,16 @@ ifeq ($(PLATFORM), $(filter $(PLATFORM), apollo kronos))
 endif
 
 N_CONFIGURE_LIBSTB_HAL =
-ifneq ($(BOXTYPE), coolstream)
+ifeq ($(BOXTYPE), coolstream)
+  ifeq ($(HAS_LIBCOOLSTREAM),yes)
+    NEUTRINO_DEPS += libcoolstream
+    ifeq ($(DEBUG),yes)
+      N_CONFIG_OPTS += \
+       --enable-libcoolstream-static \
+       --with-libcoolstream-static-dir=$(BUILD_TMP)/libcoolstream
+    endif
+  endif
+else
        NEUTRINO_DEPS += cortex-strings libstb-hal
        N_CONFIGURE_LIBSTB_HAL += \
                --with-stb-hal-includes=$(LH_OBJDIR)/include \