From a8357c74efa7074861c5e33384244249131c24a8 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 6 Nov 2013 14:42:09 +0100 Subject: [PATCH] Fix prepare-silk target on host machines that do not have the mediastreamer library installed. --- Makefile | 2 +- submodules/mssilk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4b0a311bf..bc3591442 100644 --- a/Makefile +++ b/Makefile @@ -200,7 +200,7 @@ $(LIBMSSILK_SRC_DIR)/configure: $(LIBMSSILK_BUILD_DIR)/Makefile: $(LIBMSSILK_SRC_DIR)/configure cd $(LIBMSSILK_BUILD_DIR) && \ - $(LIBMSSILK_SRC_DIR)/configure --host=arm-linux MEDIASTREAMER_CFLAGS=" " MEDIASTREAMER_LIBS=" " + $(LIBMSSILK_SRC_DIR)/configure --without-mediastreamer --host=arm-linux MEDIASTREAMER_CFLAGS=" " MEDIASTREAMER_LIBS=" " #make sure to update this path if SILK sdk is changed $(LIBMSSILK_BUILD_DIR)/sdk/SILK_SDK_SRC_v1.0.8/SILK_SDK_SRC_ARM_v1.0.8/src/SKP_Silk_resampler.c: $(LIBMSSILK_BUILD_DIR)/Makefile diff --git a/submodules/mssilk b/submodules/mssilk index 2958b2904..bc64cb197 160000 --- a/submodules/mssilk +++ b/submodules/mssilk @@ -1 +1 @@ -Subproject commit 2958b2904de6f58372cda7068db3828308563f7d +Subproject commit bc64cb1972a4d4bab9ccd25ed3c24fe9eae9b976