diff options
| author | Yaniv Kamay <ykamay@redhat.com> | 2009-10-26 23:30:41 +0200 |
|---|---|---|
| committer | Yaniv Kamay <ykamay@redhat.com> | 2009-10-26 23:30:41 +0200 |
| commit | c12c3facbd32c30267949ddf4eaa71ca5134718e (patch) | |
| tree | 7d53d50c93238ad3869a0f8f94d75020bd27b196 /client | |
| parent | 48535714bfe126331c6eeaae220b4957d49c660a (diff) | |
| download | spice-c12c3facbd32c30267949ddf4eaa71ca5134718e.tar.gz spice-c12c3facbd32c30267949ddf4eaa71ca5134718e.tar.xz spice-c12c3facbd32c30267949ddf4eaa71ca5134718e.zip | |
fix build on Debian
Diffstat (limited to 'client')
| -rw-r--r-- | client/display_channel.cpp | 5 | ||||
| -rw-r--r-- | client/windows/redc.vcproj | 4 | ||||
| -rw-r--r-- | client/x11/Makefile.am | 1 |
3 files changed, 4 insertions, 6 deletions
diff --git a/client/display_channel.cpp b/client/display_channel.cpp index 5d3a7afd..2e2e4f56 100644 --- a/client/display_channel.cpp +++ b/client/display_channel.cpp @@ -40,10 +40,7 @@ #include "red_gdi_canvas.h" #endif #include "platform_utils.h" - -extern "C" { -#include "libavcodec/avcodec.h" -} +#include "ffmpeg_inc.h" static Mutex avcodec_mutex; diff --git a/client/windows/redc.vcproj b/client/windows/redc.vcproj index 90d235ca..f65e3a2f 100644 --- a/client/windows/redc.vcproj +++ b/client/windows/redc.vcproj @@ -41,7 +41,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;..;"..\..\common\win\my_getopt-1.5";..\..\common;"$(SPICE_LIBS)\include";"$(SPICE_LIBS)\include\qcairo";"$(SPICE_LIBS)\include\ffmpeg""
+ AdditionalIncludeDirectories=".;..;..\..\common;..\..\common\win;"..\..\common\win\my_getopt-1.5";"$(SPICE_LIBS)\include";"$(SPICE_LIBS)\include\qcairo";"$(SPICE_LIBS)\include\ffmpeg""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;CAIRO_CANVAS_ACCESS_TEST;CAIRO_CANVAS_CACHE;CAIRO_CANVAS_CACH_IS_SHARED;RED_DEBUG;CAIRO_CANVAS_NO_CHUNKS;_WIN32_WINNT=0x0500;LOG4CPLUS_STATIC;USE_GLZ;PTW32_STATIC_LIB"
MinimalRebuild="false"
BasicRuntimeChecks="3"
@@ -124,7 +124,7 @@ />
<Tool
Name="VCCLCompilerTool"
- AdditionalIncludeDirectories=".;..;"..\..\common\win\my_getopt-1.5";..\..\common;"$(SPICE_LIBS)\include";"$(SPICE_LIBS)\include\qcairo";"$(SPICE_LIBS)\include\ffmpeg""
+ AdditionalIncludeDirectories=".;..;..\..\common;..\..\common\win;"..\..\common\win\my_getopt-1.5";"$(SPICE_LIBS)\include";"$(SPICE_LIBS)\include\qcairo";"$(SPICE_LIBS)\include\ffmpeg""
PreprocessorDefinitions="WIN32;_WINDOWS;CAIRO_CANVAS_ACCESS_TEST;CAIRO_CANVAS_CACHE;CAIRO_CANVAS_NO_CHUNKS;CAIRO_CANVAS_CACH_IS_SHARED;_WIN32_WINNT=0x0500;LOG4CPLUS_STATIC;USE_GLZ;PTW32_STATIC_LIB"
RuntimeLibrary="0"
UsePrecompiledHeader="0"
diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am index 02ee8717..06909a81 100644 --- a/client/x11/Makefile.am +++ b/client/x11/Makefile.am @@ -12,6 +12,7 @@ INCLUDES = \ -I. \ -I.. \ -I$(top_srcdir)/common \ + -I$(top_srcdir)/common/linux \ -I$(top_srcdir)/client \ $(GL_CFLAGS) \ $(ALSA_CFLAGS) \ |