From: Markham Date: Mon, 15 Nov 2021 14:20:19 +0000 (+0100) Subject: add possibility to build libcs static X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=e87ba8cb02c9a35043b65720e63f30d5e444fb9b;p=bs-cst-neutrino-hd.git add possibility to build libcs static --- diff --git a/make/libcoolstream.mk b/make/libcoolstream.mk index b164340..2321432 100644 --- 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 3a0cb3f..abd0ed6 100755 --- 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 \