# HG changeset patch # User Yoshiki Yazawa # Date 1227635778 -32400 # Node ID a7b80f765d6f329bf50438808d73ceeab279f451 # Parent 7bf7f83a217e874742b8375cdeaa6c5a442bc9ac moved libSAD.h to src/audlegacy for the path for header files. diff -r 7bf7f83a217e -r a7b80f765d6f src/audlegacy/Makefile --- a/src/audlegacy/Makefile Wed Nov 26 00:44:56 2008 +0900 +++ b/src/audlegacy/Makefile Wed Nov 26 02:56:18 2008 +0900 @@ -125,7 +125,8 @@ util.h \ vfs.h \ vfs_buffer.h \ - vfs_buffered_file.h + vfs_buffered_file.h \ + libSAD.h DATA = images/about-logo.png \ images/appearance.png \ diff -r 7bf7f83a217e -r a7b80f765d6f src/audlegacy/libSAD.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/audlegacy/libSAD.h Wed Nov 26 02:56:18 2008 +0900 @@ -0,0 +1,26 @@ +/* Scale & Dither library (libSAD) + * High-precision bit depth converter with ReplayGain support + * + * Copyright (c) 2007-2008 Eugene Zagidullin (e.asphyx@gmail.com) + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef LIBSAD_H +#define LIBSAD_H + +#include "common.h" +#include "dither.h" + +#endif /* LIBSAD_H */ diff -r 7bf7f83a217e -r a7b80f765d6f src/audlegacy/plugin.h --- a/src/audlegacy/plugin.h Wed Nov 26 00:44:56 2008 +0900 +++ b/src/audlegacy/plugin.h Wed Nov 26 02:56:18 2008 +0900 @@ -47,7 +47,7 @@ #include "audlegacy/preferences.h" #include "audlegacy/interface.h" #include "audlegacy/equalizer_preset.h" -#include "libSAD/libSAD.h" +#include "audlegacy/libSAD.h" #define PLUGIN(x) ((Plugin *)(x)) #define INPUT_PLUGIN(x) ((InputPlugin *)(x)) diff -r 7bf7f83a217e -r a7b80f765d6f src/audlegacy/util.h --- a/src/audlegacy/util.h Wed Nov 26 00:44:56 2008 +0900 +++ b/src/audlegacy/util.h Wed Nov 26 02:56:18 2008 +0900 @@ -38,7 +38,7 @@ G_BEGIN_DECLS #include "audlegacy/plugin.h" -#include "libSAD/libSAD.h" +#include "audlegacy/libSAD.h" #define SWAP(a, b) { a^=b; b^=a; a^=b; } diff -r 7bf7f83a217e -r a7b80f765d6f src/libSAD/Makefile --- a/src/libSAD/Makefile Wed Nov 26 00:44:56 2008 +0900 +++ b/src/libSAD/Makefile Wed Nov 26 02:56:18 2008 +0900 @@ -6,8 +6,7 @@ dither_ops.c \ noicegen.c -INCLUDES = libSAD.h \ - common.h \ +INCLUDES = common.h \ dither.h include ../../buildsys.mk diff -r 7bf7f83a217e -r a7b80f765d6f src/libSAD/libSAD.h --- a/src/libSAD/libSAD.h Wed Nov 26 00:44:56 2008 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,26 +0,0 @@ -/* Scale & Dither library (libSAD) - * High-precision bit depth converter with ReplayGain support - * - * Copyright (c) 2007-2008 Eugene Zagidullin (e.asphyx@gmail.com) - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef LIBSAD_H -#define LIBSAD_H - -#include "common.h" -#include "dither.h" - -#endif /* LIBSAD_H */ diff -r 7bf7f83a217e -r a7b80f765d6f src/libid3tag/Makefile --- a/src/libid3tag/Makefile Wed Nov 26 00:44:56 2008 +0900 +++ b/src/libid3tag/Makefile Wed Nov 26 02:56:18 2008 +0900 @@ -29,7 +29,7 @@ #includesubdir = audacious -CPPFLAGS += ${LIB_CPPFLAGS} -I.. ${GLIB_CFLAGS} ${GTK_CFLAGS} \ +CPPFLAGS += ${LIB_CPPFLAGS} -I.. -I../libSAD ${GLIB_CFLAGS} ${GTK_CFLAGS} \ ${MOWGLI_CFLAGS} ${LIBMCS_CFLAGS} CFLAGS += ${LIB_CFLAGS}