diff options
| author | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2012-09-28 10:09:51 +0200 |
|---|---|---|
| committer | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2012-09-28 10:15:42 +0200 |
| commit | 726898f577b9b7051f1c38f9c59a94f5e549b1bb (patch) | |
| tree | a2620835fd14a33a90000b5f02fb80e826d961e4 | |
| parent | dc2308269b4cfdf0d9de6fedf231c6a79c7fe562 (diff) | |
| download | libva-726898f577b9b7051f1c38f9c59a94f5e549b1bb.tar.gz | |
tests: include "sysdeps.h" wherever necessary.
Use "sysdeps.h" header instead of "config.h" so that to include the
necessary definitions for Android.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
| -rw-r--r-- | test/common/Makefile.am | 1 | ||||
| -rw-r--r-- | test/common/va_display.c | 4 | ||||
| -rw-r--r-- | test/encode/Makefile.am | 8 | ||||
| -rw-r--r-- | test/encode/avcenc.c | 4 | ||||
| -rw-r--r-- | test/vainfo/Makefile.am | 1 | ||||
| -rw-r--r-- | test/vainfo/vainfo.c | 1 |
6 files changed, 11 insertions, 8 deletions
diff --git a/test/common/Makefile.am b/test/common/Makefile.am index 9bc4aeb..763847d 100644 --- a/test/common/Makefile.am +++ b/test/common/Makefile.am @@ -24,6 +24,7 @@ noinst_LTLIBRARIES = libva-display.la libva_display_cflags = \ -I$(top_srcdir) \ + -I$(top_srcdir)/va \ -I$(top_builddir) \ -DIN_LIBVA \ $(NULL) diff --git a/test/common/va_display.c b/test/common/va_display.c index b4e8e7e..dd58dd2 100644 --- a/test/common/va_display.c +++ b/test/common/va_display.c @@ -22,9 +22,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "sysdeps.h" #include <stdio.h> #include <stdlib.h> #include <stddef.h> diff --git a/test/encode/Makefile.am b/test/encode/Makefile.am index 933ac72..01550e2 100644 --- a/test/encode/Makefile.am +++ b/test/encode/Makefile.am @@ -25,14 +25,18 @@ if USE_X11 bin_PROGRAMS += h264encode endif +INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/va \ + $(NULL) + h264encode_SOURCES = h264encode_x11.c -h264encode_CFLAGS = -I$(top_srcdir) h264encode_LDADD = \ $(top_builddir)/va/libva.la \ $(top_builddir)/va/libva-x11.la avcenc_SOURCES = avcenc.c -avcenc_CFLAGS = -I$(top_srcdir) -I$(top_srcdir)/test/common +avcenc_CFLAGS = -I$(top_srcdir)/test/common avcenc_LDADD = \ $(top_builddir)/va/libva.la \ $(top_builddir)/test/common/libva-display.la diff --git a/test/encode/avcenc.c b/test/encode/avcenc.c index 81526e9..a29e55b 100644 --- a/test/encode/avcenc.c +++ b/test/encode/avcenc.c @@ -28,9 +28,7 @@ * ./avcenc <width> <height> <input file> <output file> [qp] */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "sysdeps.h" #include <stdio.h> #include <string.h> #include <stdlib.h> diff --git a/test/vainfo/Makefile.am b/test/vainfo/Makefile.am index cd9c37b..680d099 100644 --- a/test/vainfo/Makefile.am +++ b/test/vainfo/Makefile.am @@ -24,6 +24,7 @@ bin_PROGRAMS = vainfo vainfo_cflags = \ -I$(top_srcdir) \ + -I$(top_srcdir)/va \ -I$(top_srcdir)/test/common \ -I$(top_builddir) \ -DLIBVA_VERSION_S="\"$(LIBVA_VERSION)\"" \ diff --git a/test/vainfo/vainfo.c b/test/vainfo/vainfo.c index 3a49cf6..1eee671 100644 --- a/test/vainfo/vainfo.c +++ b/test/vainfo/vainfo.c @@ -22,6 +22,7 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +#include "sysdeps.h" #include <stdarg.h> #include <stdio.h> #include <string.h> |