Mercurial > audlegacy
changeset 4268:af17e0fc8f08
Automated merge with ssh://hg.atheme.org//hg/audacious
| author | Eugene Zagidullin <e.asphyx@gmail.com> |
|---|---|
| date | Sun, 10 Feb 2008 07:21:49 +0300 |
| parents | a41fb6bc632a (current diff) 9a55e8237988 (diff) |
| children | 2a4954d14bfb |
| files | |
| diffstat | 3 files changed, 13 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/libSAD/Makefile Sun Feb 10 07:19:45 2008 +0300 +++ b/src/libSAD/Makefile Sun Feb 10 07:21:49 2008 +0300 @@ -3,7 +3,12 @@ dither_ops.c \ noicegen.c +INCLUDES = libSAD.h \ + common.h \ + dither.h + include ../../buildsys.mk include ../../extra.mk -CPPFLAGS += ${SIMD_CFLAGS} +PACKAGE = libSAD +CPPFLAGS += ${SIMD_CFLAGS} -I../..
--- a/src/libSAD/common.h Sun Feb 10 07:19:45 2008 +0300 +++ b/src/libSAD/common.h Sun Feb 10 07:21:49 2008 +0300 @@ -17,8 +17,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef COMMON_H -#define COMMON_H +#ifndef LIBSAD_COMMON_H +#define LIBSAD_COMMON_H #include <stdio.h> #include <stdlib.h> @@ -34,7 +34,9 @@ #define FALSE 0 #endif -#include "../../config.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif typedef int SAD_error;
--- a/src/libSAD/dither.h Sun Feb 10 07:19:45 2008 +0300 +++ b/src/libSAD/dither.h Sun Feb 10 07:21:49 2008 +0300 @@ -17,8 +17,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef DITHER_H -#define DITHER_H +#ifndef LIBSAD_DITHER_H +#define LIBSAD_DITHER_H #include "common.h"