From cf60cddbdd3468ec49d387f1944c068bd35fca92 Mon Sep 17 00:00:00 2001 From: Uri Lublin Date: Thu, 7 Jan 2010 22:22:37 +0200 Subject: spice: configure: mv ffmpeg_inc.h.in from common/ to client/ Moved common/win/ffmpeg_inc.h to client/windows/ Moved common/linux/ffmpeg_inc.h.in to client/x11/ Copied common/linux/ffmpeg_inc.h.in to server/ Update *configure.ac and */Makefile.am accordingly (* is for {common,server,client} Signed-off-by: Yaniv Kamay Signed-off-by: Uri Lublin --- client/x11/Makefile.am | 1 - client/x11/ffmpeg_inc.h.in | 12 ++++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 client/x11/ffmpeg_inc.h.in (limited to 'client/x11') diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am index 9a8e5556..1fd0eaf7 100644 --- a/client/x11/Makefile.am +++ b/client/x11/Makefile.am @@ -15,7 +15,6 @@ INCLUDES = \ -I. \ -I.. \ -I$(COMMON_DIR) \ - -I$(COMMON_DIR)/linux \ -I$(CLIENT_DIR) \ $(GL_CFLAGS) \ $(ALSA_CFLAGS) \ diff --git a/client/x11/ffmpeg_inc.h.in b/client/x11/ffmpeg_inc.h.in new file mode 100644 index 00000000..7e322b51 --- /dev/null +++ b/client/x11/ffmpeg_inc.h.in @@ -0,0 +1,12 @@ + +#ifdef __GNUG__ +extern "C" { +#endif + +#include "@AVCODEC_PREFIX@avcodec.h" + +#ifdef __GNUG__ +} +#endif + + -- cgit