Browse Source

- neutrino.mk: remove USE_LIBSTB-HAL variable

master
vanhofen 6 years ago
parent
commit
7f7ea4267e
  1. 5
      make/environment-build.mk
  2. 6
      make/neutrino.mk

5
make/environment-build.mk

@ -260,11 +260,6 @@ TERM_YELLOW = \033[40;0;33m
TERM_YELLOW_BOLD= \033[40;1;33m
TERM_NORMAL = \033[0m
USE_LIBSTB-HAL = no
ifneq ($(BOXTYPE), coolstream)
USE_LIBSTB-HAL = yes
endif
PATH := $(HOST_DIR)/bin:$(CROSS_DIR)/bin:$(HELPERS_DIR):$(PATH)
PKG_CONFIG = $(HOST_DIR)/bin/$(TARGET)-pkg-config

6
make/neutrino.mk

@ -28,7 +28,7 @@ ifeq ($(BOXTYPE)-$(HAS_LIBCS), coolstream-yes)
N_DEPS += $(D)/libcoolstream
endif
ifeq ($(USE_LIBSTB-HAL), yes)
ifneq ($(BOXTYPE), coolstream)
N_DEPS += $(D)/libstb-hal
endif
@ -75,7 +75,7 @@ endif
# -----------------------------------------------------------------------------
N_CONFIGURE_DEBUG =
ifeq ($(HAS_LIBCS), yes)
ifeq ($(BOXTYPE)-$(HAS_LIBCS), coolstream-yes)
ifeq ($(DEBUG), yes)
N_CONFIGURE_DEBUG += \
--enable-libcoolstream-static \
@ -86,7 +86,7 @@ endif
# -----------------------------------------------------------------------------
N_CONFIGURE_LIBSTB-HAL =
ifeq ($(USE_LIBSTB-HAL), yes)
ifneq ($(BOXTYPE), coolstream)
N_CONFIGURE_LIBSTB-HAL += \
--with-stb-hal-includes=$(SOURCE_DIR)/$(NI-LIBSTB-HAL)/include \
--with-stb-hal-build=$(LH_OBJ_DIR)

Loading…
Cancel
Save