From ba8bfaafa7df4807626583bca6ed149068b91ba0 Mon Sep 17 00:00:00 2001 From: Marco Date: Tue, 14 Mar 2017 10:38:50 -0700 Subject: [PATCH] vpx_codec.h: include vpx/*.h -> ./*.h This matches the other includes and also fixes a compile issue in chromium. Change-Id: I45e00a1454f7ed948aa3b96b04cc5946b1d02985 --- tools.mk | 3 +++ vpx/vpx_codec.h | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools.mk b/tools.mk index b3c8cb0..23adcee 100644 --- a/tools.mk +++ b/tools.mk @@ -28,6 +28,9 @@ TOOLS = $(addprefix tools/,$(call enabled,TOOLS)) ALL_SRCS = $(foreach ex,$(TOOLS),$($(notdir $(ex:.c=)).SRCS)) CFLAGS += -I../include +ifneq ($(CONFIG_CODEC_SRCS), yes) + CFLAGS += -I../include/vpx +endif # Expand all tools sources into a variable containing all sources # for that tools (not just them main one specified in TOOLS) diff --git a/vpx/vpx_codec.h b/vpx/vpx_codec.h index 39bc54b..e91cd9e 100644 --- a/vpx/vpx_codec.h +++ b/vpx/vpx_codec.h @@ -42,8 +42,8 @@ extern "C" { #endif -#include "vpx/vpx_image.h" -#include "vpx/vpx_integer.h" +#include "./vpx_image.h" +#include "./vpx_integer.h" /*!\brief Decorator indicating a function is deprecated */ #ifndef DEPRECATED -- 2.7.4