[MPlayer-dev-eng] [PATCH] config.h from MPlayer clashes with config.h from x264

[Diego Biurrun]

On Mon, Aug 14, 2006 at 04:26:19PM +0700, Vladislav Naumov wrote:
> 
> Patch I've attached puts $(OPTFLAGS) after '-I..'.

I think I'll apply the patch, but here are some small comments:

> --- libmpcodecs/Makefile	(revision 19389)
> +++ libmpcodecs/Makefile	(working copy)
> @@ -317,8 +317,9 @@
>  SRCS2=$(ENCODER_SRCS)
>  OBJS2=$(SRCS2:.c=.o)
>  
> -CFLAGS  = $(OPTFLAGS) \
> +CFLAGS  = \

A line with just a backslash is ugly, please fix this.

> --- libass/Makefile	(revision 19389)
> +++ libass/Makefile	(working copy)
> @@ -9,8 +9,9 @@
>  
>  OBJS=$(SRCS:.c=.o)
>  
> -CFLAGS  = $(OPTFLAGS) \
> +CFLAGS  = \

same here

> --- libswscale/Makefile	(revision 19389)
> +++ libswscale/Makefile	(working copy)
> @@ -8,7 +8,7 @@
>  # NOTE: -I.. is needed to include config.h
> -CFLAGS=$(OPTFLAGS) -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \
> +CFLAGS=-I.. $(OPTFLAGS) -I$(SRC_PATH) -I$(SRC_PATH)/libavutil \

-I$(SRC_PATH) will usually point to .. so put $(OPTFLAGS) after it.

> --- loader/dmo/Makefile	(revision 19389)
> +++ loader/dmo/Makefile	(working copy)
> @@ -13,7 +13,7 @@
>  
>  INCLUDE = -I. -I../dshow -I..
> -CFLAGS  = $(OPTFLAGS) $(INCLUDE) -DNOAVIFILE_HEADERS
> +CFLAGS  = $(INCLUDE) -DNOAVIFILE_HEADERS $(OPTFLAGS)

Keep the -D option at the end, just in case.

Diego