generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add the common processing include directories to the include path

Browse Source 
This avoids using relative paths for including these files.
This commit is contained in:
Martin Storsjö 2014-02-19 14:39:43 +02:00
parent 79838d4aad
commit 099595696b
18 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -83,6 +83,10 @@ ENCODER_INCLUDES = \
-Icodec/encoder/core/inc \ -Icodec/encoder/core/inc \
-Icodec/encoder/plus/inc -Icodec/encoder/plus/inc
PROCESSING_INCLUDES = \
-Icodec/processing/interface \
-Icodec/processing/src/common
GTEST_INCLUDES = \ GTEST_INCLUDES = \
-Igtest \ -Igtest \
-Igtest/include -Igtest/include

8
codec/processing/build/win32/WelsVP_2008.vcproj
View File

@ -52,7 +52,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../../common/" AdditionalIncludeDirectories="../../../common/;../../interface;../../src/common"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WELSVP_EXPORTS;X86_ASM" PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;WELSVP_EXPORTS;X86_ASM"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -137,7 +137,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="../../../common/" AdditionalIncludeDirectories="../../../common/;../../interface;../../src/common"
PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;WELSVP_EXPORTS;X86_ASM" PreprocessorDefinitions="WIN64;_DEBUG;_WINDOWS;_USRDLL;WELSVP_EXPORTS;X86_ASM"
MinimalRebuild="true" MinimalRebuild="true"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -224,7 +224,7 @@
Optimization="3" Optimization="3"
EnableIntrinsicFunctions="false" EnableIntrinsicFunctions="false"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="../../../common/" AdditionalIncludeDirectories="../../../common/;../../interface;../../src/common"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WELSVP_EXPORTS;X86_ASM" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;WELSVP_EXPORTS;X86_ASM"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="false" EnableFunctionLevelLinking="false"
@ -314,7 +314,7 @@
Optimization="3" Optimization="3"
EnableIntrinsicFunctions="false" EnableIntrinsicFunctions="false"
FavorSizeOrSpeed="1" FavorSizeOrSpeed="1"
AdditionalIncludeDirectories="../../../common/" AdditionalIncludeDirectories="../../../common/;../../interface;../../src/common"
PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL;WELSVP_EXPORTS;X86_ASM" PreprocessorDefinitions="WIN64;NDEBUG;_WINDOWS;_USRDLL;WELSVP_EXPORTS;X86_ASM"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="false" EnableFunctionLevelLinking="false"

8
codec/processing/src/adaptivequantization/AdaptiveQuantization.h
View File

@ -41,10 +41,10 @@
#ifndef WELSVP_ADAPTIVEQUANTIZATION_H #ifndef WELSVP_ADAPTIVEQUANTIZATION_H
#define WELSVP_ADAPTIVEQUANTIZATION_H #define WELSVP_ADAPTIVEQUANTIZATION_H
#include "../common/util.h" #include "util.h"
#include "../common/memory.h" #include "memory.h"
#include "../common/WelsFrameWork.h" #include "WelsFrameWork.h"
#include "../../interface/IWelsVP.h" #include "IWelsVP.h"
#include "cpu.h" #include "cpu.h"
WELSVP_NAMESPACE_BEGIN WELSVP_NAMESPACE_BEGIN

8
codec/processing/src/backgrounddetection/BackgroundDetection.h
View File

@ -41,10 +41,10 @@
#ifndef WELSVP_BACKGROUNDDETECTION_H #ifndef WELSVP_BACKGROUNDDETECTION_H
#define WELSVP_BACKGROUNDDETECTION_H #define WELSVP_BACKGROUNDDETECTION_H
#include "../common/util.h" #include "util.h"
#include "../common/memory.h" #include "memory.h"
#include "../common/WelsFrameWork.h" #include "WelsFrameWork.h"
#include "../../interface/IWelsVP.h" #include "IWelsVP.h"
WELSVP_NAMESPACE_BEGIN WELSVP_NAMESPACE_BEGIN

2
codec/processing/src/common/WelsFrameWork.h
View File

@ -42,7 +42,7 @@
#ifndef WELSVP_WELSFRAMEWORK_H #ifndef WELSVP_WELSFRAMEWORK_H
#define WELSVP_WELSFRAMEWORK_H #define WELSVP_WELSFRAMEWORK_H
#include "../../interface/IWelsVP.h" #include "IWelsVP.h"
#include "util.h" #include "util.h"
#include "thread.h" #include "thread.h"

2
codec/processing/src/common/util.h
View File

@ -50,7 +50,7 @@
#include "typedef.h" #include "typedef.h"
#include "memory.h" #include "memory.h"
#include "../../interface/IWelsVP.h" #include "IWelsVP.h"
WELSVP_NAMESPACE_BEGIN WELSVP_NAMESPACE_BEGIN

8
codec/processing/src/complexityanalysis/ComplexityAnalysis.h
View File

@ -42,10 +42,10 @@
#ifndef WELSVP_COMPLEXITYANALYSIS_H #ifndef WELSVP_COMPLEXITYANALYSIS_H
#define WELSVP_COMPLEXITYANALYSIS_H #define WELSVP_COMPLEXITYANALYSIS_H
#include "../common/util.h" #include "util.h"
#include "../common/memory.h" #include "memory.h"
#include "../common/WelsFrameWork.h" #include "WelsFrameWork.h"
#include "../../interface/IWelsVP.h" #include "IWelsVP.h"
WELSVP_NAMESPACE_BEGIN WELSVP_NAMESPACE_BEGIN

2
codec/processing/src/denoise/denoise.cpp
View File

@ -31,7 +31,7 @@
*/ */
#include "denoise.h" #include "denoise.h"
#include "../common/cpu.h" #include "cpu.h"
WELSVP_NAMESPACE_BEGIN WELSVP_NAMESPACE_BEGIN

8
codec/processing/src/denoise/denoise.h
View File

@ -42,10 +42,10 @@
#ifndef WELSVP_DENOISE_H #ifndef WELSVP_DENOISE_H
#define WELSVP_DENOISE_H #define WELSVP_DENOISE_H
#include "../common/util.h" #include "util.h"
#include "../common/memory.h" #include "memory.h"
#include "../common/WelsFrameWork.h" #include "WelsFrameWork.h"
#include "../../interface/IWelsVP.h" #include "IWelsVP.h"
#define DENOISE_GRAY_RADIUS (1) #define DENOISE_GRAY_RADIUS (1)

2
codec/processing/src/downsample/downsample.cpp
View File

@ -31,7 +31,7 @@
*/ */
#include "downsample.h" #include "downsample.h"
#include "../common/cpu.h" #include "cpu.h"
WELSVP_NAMESPACE_BEGIN WELSVP_NAMESPACE_BEGIN

6
codec/processing/src/downsample/downsample.h
View File

@ -42,9 +42,9 @@
#ifndef WELSVP_DOWNSAMPLE_H #ifndef WELSVP_DOWNSAMPLE_H
#define WELSVP_DOWNSAMPLE_H #define WELSVP_DOWNSAMPLE_H
#include "../common/util.h" #include "util.h"
#include "../common/WelsFrameWork.h" #include "WelsFrameWork.h"
#include "../../interface/IWelsVP.h" #include "IWelsVP.h"
WELSVP_NAMESPACE_BEGIN WELSVP_NAMESPACE_BEGIN

6
codec/processing/src/imagerotate/imagerotate.h
View File

@ -42,9 +42,9 @@
#ifndef WELSVP_IMAGEROTATE_H #ifndef WELSVP_IMAGEROTATE_H
#define WELSVP_IMAGEROTATE_H #define WELSVP_IMAGEROTATE_H
#include "../common/util.h" #include "util.h"
#include "../common/WelsFrameWork.h" #include "WelsFrameWork.h"
#include "../../interface/IWelsVP.h" #include "IWelsVP.h"
WELSVP_NAMESPACE_BEGIN WELSVP_NAMESPACE_BEGIN

2
codec/processing/src/scenechangedetection/SceneChangeDetection.cpp
View File

@ -31,7 +31,7 @@
*/ */
#include "SceneChangeDetection.h" #include "SceneChangeDetection.h"
#include "../common/cpu.h" #include "cpu.h"
WELSVP_NAMESPACE_BEGIN WELSVP_NAMESPACE_BEGIN

8
codec/processing/src/scenechangedetection/SceneChangeDetection.h
View File

@ -42,10 +42,10 @@
#ifndef WELSVP_SCENECHANGEDETECTION_H #ifndef WELSVP_SCENECHANGEDETECTION_H
#define WELSVP_SCENECHANGEDETECTION_H #define WELSVP_SCENECHANGEDETECTION_H
#include "../common/util.h" #include "util.h"
#include "../common/memory.h" #include "memory.h"
#include "../common/WelsFrameWork.h" #include "WelsFrameWork.h"
#include "../../interface/IWelsVP.h" #include "IWelsVP.h"
#include "SceneChangeDetectionCommon.h" #include "SceneChangeDetectionCommon.h"
WELSVP_NAMESPACE_BEGIN WELSVP_NAMESPACE_BEGIN

8
codec/processing/src/scenechangedetection/SceneChangeDetectionCommon.h
View File

@ -41,10 +41,10 @@
#ifndef WELSVP_SCENECHANGEDETECTIONCOMMON_H #ifndef WELSVP_SCENECHANGEDETECTIONCOMMON_H
#define WELSVP_SCENECHANGEDETECTIONCOMMON_H #define WELSVP_SCENECHANGEDETECTIONCOMMON_H
#include "../common/util.h" #include "util.h"
#include "../common/memory.h" #include "memory.h"
#include "../common/WelsFrameWork.h" #include "WelsFrameWork.h"
#include "../../interface/IWelsVP.h" #include "IWelsVP.h"
WELSVP_NAMESPACE_BEGIN WELSVP_NAMESPACE_BEGIN

2
codec/processing/src/vaacalc/vaacalcfuncs.cpp
View File

@ -30,7 +30,7 @@
* *
*/ */
#include "../common/util.h" #include "util.h"
WELSVP_NAMESPACE_BEGIN WELSVP_NAMESPACE_BEGIN

2
codec/processing/src/vaacalc/vaacalculation.cpp
View File

@ -31,7 +31,7 @@
*/ */
#include "vaacalculation.h" #include "vaacalculation.h"
#include "../common/cpu.h" #include "cpu.h"
WELSVP_NAMESPACE_BEGIN WELSVP_NAMESPACE_BEGIN

8
codec/processing/src/vaacalc/vaacalculation.h
View File

@ -42,10 +42,10 @@
#ifndef WELSVP_VAACALCULATION_H #ifndef WELSVP_VAACALCULATION_H
#define WELSVP_VAACALCULATION_H #define WELSVP_VAACALCULATION_H
#include "../common/util.h" #include "util.h"
#include "../common/memory.h" #include "memory.h"
#include "../common/WelsFrameWork.h" #include "WelsFrameWork.h"
#include "../../interface/IWelsVP.h" #include "IWelsVP.h"
WELSVP_NAMESPACE_BEGIN WELSVP_NAMESPACE_BEGIN