From 007c6f71c2b0d2868dfc46edaf24a5c27eceab47 Mon Sep 17 00:00:00 2001 From: Loren Merritt Date: Fri, 31 Dec 2004 02:33:21 +0000 Subject: [PATCH] remove relative include paths, to avoid conflicts with libtool git-svn-id: svn://svn.videolan.org/x264/trunk@80 df754926-b1dd-0310-bc7b-ec298dee348c --- Jamfile | 4 ++-- common/common.h | 2 +- common/cpu.c | 2 +- common/i386/dct-c.c | 2 +- common/i386/mc-c.c | 4 ++-- common/i386/predict.c | 2 +- common/mc.c | 2 +- common/pixel.c | 2 +- common/ppc/mc.c | 4 ++-- common/ppc/pixel.c | 2 +- decoder/decoder.c | 6 +++--- decoder/macroblock.c | 4 ++-- decoder/set.c | 2 +- decoder/vlc.c | 4 ++-- encoder/analyse.c | 4 ++-- encoder/cabac.c | 2 +- encoder/cavlc.c | 4 ++-- encoder/encoder.c | 4 ++-- encoder/macroblock.c | 2 +- encoder/macroblock.h | 2 +- encoder/me.c | 2 +- encoder/ratecontrol.c | 6 +++--- encoder/set.c | 6 +++--- 23 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Jamfile b/Jamfile index b7771bce..c17c2e93 100644 --- a/Jamfile +++ b/Jamfile @@ -26,8 +26,8 @@ SOURCES_C = common/mc.c common/predict.c common/pixel.c common/macroblock.c encoder/set.c encoder/macroblock.c encoder/cabac.c encoder/cavlc.c encoder/encoder.c encoder/eval.c ; -SOURCES_X86 = common/i386/cpu.asm ; -SOURCES_MMX = common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c common/i386/dct.asm common/i386/pixel.asm common/i386/mc.asm ; +SOURCES_X86 = common/i386/cpu-a.asm ; +SOURCES_MMX = common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c common/i386/dct-a.asm common/i386/pixel-a.asm common/i386/mc-a.asm ; SOURCES_ALTIVEC = common/ppc/mc.c common/ppc/pixel.c ; diff --git a/common/common.h b/common/common.h index 19ddd1b8..dfbfc8be 100644 --- a/common/common.h +++ b/common/common.h @@ -31,7 +31,7 @@ #endif #include -#include "../x264.h" +#include "x264.h" #include "bs.h" #include "set.h" #include "predict.h" diff --git a/common/cpu.c b/common/cpu.c index a39c4271..499a0761 100644 --- a/common/cpu.c +++ b/common/cpu.c @@ -30,7 +30,7 @@ #include #include -#include "../x264.h" +#include "x264.h" #include "cpu.h" #ifdef ARCH_X86 diff --git a/common/i386/dct-c.c b/common/i386/dct-c.c index adba9480..45279035 100644 --- a/common/i386/dct-c.c +++ b/common/i386/dct-c.c @@ -31,7 +31,7 @@ #include "x264.h" -#include "../dct.h" +#include "common/dct.h" #include "dct.h" diff --git a/common/i386/mc-c.c b/common/i386/mc-c.c index e2e9251b..424f18ee 100644 --- a/common/i386/mc-c.c +++ b/common/i386/mc-c.c @@ -32,8 +32,8 @@ #include #include "x264.h" /* DECLARE_ALIGNED */ -#include "../mc.h" -#include "../clip1.h" +#include "common/mc.h" +#include "common/clip1.h" #include "mc.h" #if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3) diff --git a/common/i386/predict.c b/common/i386/predict.c index febb4a2e..b0a0b7b7 100644 --- a/common/i386/predict.c +++ b/common/i386/predict.c @@ -33,7 +33,7 @@ #include #include "x264.h" /* for keyword inline */ -#include "../predict.h" +#include "common/predict.h" #include "predict.h" static inline int clip_uint8( int a ) diff --git a/common/mc.c b/common/mc.c index 5eb94c4f..870b0fac 100644 --- a/common/mc.c +++ b/common/mc.c @@ -31,7 +31,7 @@ #include #include -#include "../x264.h" +#include "x264.h" #include "mc.h" #include "clip1.h" diff --git a/common/pixel.c b/common/pixel.c index d0001b1b..89af666b 100644 --- a/common/pixel.c +++ b/common/pixel.c @@ -30,7 +30,7 @@ #include #include -#include "../x264.h" +#include "x264.h" #include "pixel.h" #ifdef HAVE_MMXEXT diff --git a/common/ppc/mc.c b/common/ppc/mc.c index b96d3e3e..901d285e 100644 --- a/common/ppc/mc.c +++ b/common/ppc/mc.c @@ -32,8 +32,8 @@ #endif #include "x264.h" -#include "../mc.h" -#include "../clip1.h" +#include "common/mc.h" +#include "common/clip1.h" #include "mc.h" #include "ppccommon.h" diff --git a/common/ppc/pixel.c b/common/ppc/pixel.c index a6d048fc..de822e7f 100644 --- a/common/ppc/pixel.c +++ b/common/ppc/pixel.c @@ -32,7 +32,7 @@ #endif #include "x264.h" -#include "../pixel.h" +#include "common/pixel.h" #include "pixel.h" #include "ppccommon.h" diff --git a/decoder/decoder.c b/decoder/decoder.c index fa47454d..57bace52 100644 --- a/decoder/decoder.c +++ b/decoder/decoder.c @@ -26,9 +26,9 @@ #include #include -#include "../common/common.h" -#include "../common/cpu.h" -#include "../common/vlc.h" +#include "common/common.h" +#include "common/cpu.h" +#include "common/vlc.h" #include "macroblock.h" #include "set.h" diff --git a/decoder/macroblock.c b/decoder/macroblock.c index 55e8ea4b..7ab73750 100644 --- a/decoder/macroblock.c +++ b/decoder/macroblock.c @@ -26,8 +26,8 @@ #include #include -#include "../common/common.h" -#include "../common/vlc.h" +#include "common/common.h" +#include "common/vlc.h" #include "vlc.h" #include "macroblock.h" diff --git a/decoder/set.c b/decoder/set.c index e3f10aff..10e07966 100644 --- a/decoder/set.c +++ b/decoder/set.c @@ -26,7 +26,7 @@ #include #include -#include "../common/common.h" +#include "common/common.h" #include "set.h" /* return -1 if invalid, else the id */ diff --git a/decoder/vlc.c b/decoder/vlc.c index dc7f8d7e..f7535f63 100644 --- a/decoder/vlc.c +++ b/decoder/vlc.c @@ -25,8 +25,8 @@ #include #include -#include "../common/common.h" -#include "../common/vlc.h" +#include "common/common.h" +#include "common/vlc.h" #include "vlc.h" diff --git a/encoder/analyse.c b/encoder/analyse.c index 667058a9..3d98f41b 100644 --- a/encoder/analyse.c +++ b/encoder/analyse.c @@ -27,8 +27,8 @@ #include #include -#include "../common/common.h" -#include "../common/macroblock.h" +#include "common/common.h" +#include "common/macroblock.h" #include "macroblock.h" #include "me.h" #include "ratecontrol.h" diff --git a/encoder/cabac.c b/encoder/cabac.c index f30af96c..762ea341 100644 --- a/encoder/cabac.c +++ b/encoder/cabac.c @@ -25,7 +25,7 @@ #include #include -#include "../common/common.h" +#include "common/common.h" #include "macroblock.h" static const uint8_t block_idx_x[16] = diff --git a/encoder/cavlc.c b/encoder/cavlc.c index 95c5db68..f1df9a29 100644 --- a/encoder/cavlc.c +++ b/encoder/cavlc.c @@ -25,8 +25,8 @@ #include #include -#include "../common/common.h" -#include "../common/vlc.h" +#include "common/common.h" +#include "common/vlc.h" #include "macroblock.h" static const uint8_t intra4x4_cbp_to_golomb[48]= diff --git a/encoder/encoder.c b/encoder/encoder.c index 378371bf..2be43d5a 100644 --- a/encoder/encoder.c +++ b/encoder/encoder.c @@ -27,8 +27,8 @@ #include -#include "../common/common.h" -#include "../common/cpu.h" +#include "common/common.h" +#include "common/cpu.h" #include "set.h" #include "analyse.h" diff --git a/encoder/macroblock.c b/encoder/macroblock.c index 514b83a8..d07f0402 100644 --- a/encoder/macroblock.c +++ b/encoder/macroblock.c @@ -25,7 +25,7 @@ #include #include -#include "../common/common.h" +#include "common/common.h" #include "macroblock.h" diff --git a/encoder/macroblock.h b/encoder/macroblock.h index 4310c2e5..6c8768ae 100644 --- a/encoder/macroblock.h +++ b/encoder/macroblock.h @@ -24,7 +24,7 @@ #ifndef _ENCODER_MACROBLOCK_H #define _ENCODER_MACROBLOCK_H 1 -#include "../common/macroblock.h" +#include "common/macroblock.h" int x264_macroblock_probe_skip( x264_t *h, int b_bidir ); diff --git a/encoder/me.c b/encoder/me.c index fee0756c..b865a209 100644 --- a/encoder/me.c +++ b/encoder/me.c @@ -26,7 +26,7 @@ #include #include -#include "../common/common.h" +#include "common/common.h" #include "me.h" /* presets selected from good points on the speed-vs-quality curve of several test videos diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c index c33525aa..0fa92a31 100644 --- a/encoder/ratecontrol.c +++ b/encoder/ratecontrol.c @@ -32,9 +32,9 @@ #include #include -#include "../common/common.h" -#include "../common/cpu.h" -#include "../common/macroblock.h" +#include "common/common.h" +#include "common/cpu.h" +#include "common/macroblock.h" #include "ratecontrol.h" #ifdef SYS_MACOSX diff --git a/encoder/set.c b/encoder/set.c index 1a23bda1..9b9278f7 100644 --- a/encoder/set.c +++ b/encoder/set.c @@ -31,9 +31,9 @@ #include #include -#include "../x264.h" -#include "../common/bs.h" -#include "../common/set.h" +#include "x264.h" +#include "common/bs.h" +#include "common/set.h" void x264_sps_init( x264_sps_t *sps, int i_id, x264_param_t *param ) { -- 2.40.0