[Spice-devel] [RFC PATCH vdagent 06/16] Fix include path to spice-protocol

[Frediano Ziglio]

> 
> Signed-off-by: Dmitry Fleytman <dmitry at daynix.com>
> ---
>  vdagent/vdagent.vcxproj     | 16 ++++++++--------
>  vdservice/vdservice.vcxproj |  8 ++++----
>  2 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/vdagent/vdagent.vcxproj b/vdagent/vdagent.vcxproj
> index 4f6f54a..bffc8a6 100644
> --- a/vdagent/vdagent.vcxproj
> +++ b/vdagent/vdagent.vcxproj
> @@ -154,7 +154,7 @@
>    <ItemDefinitionGroup
>    Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>      <ClCompile>
>        <Optimization>Disabled</Optimization>
> -
> <AdditionalIncludeDirectories>..\common;$(SPICE_PROTOCOL_DIR);$(SPICE_LIBS)\include\CxImage;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>..\common;..\spice-protocol\;$(SPICE_LIBS)\include\CxImage;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>        <MinimalRebuild>true</MinimalRebuild>
>        <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
> @@ -180,7 +180,7 @@
>    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10
>    Debug|Win32'">
>      <ClCompile>
>        <Optimization>Disabled</Optimization>
> -
> <AdditionalIncludeDirectories>..\common;$(SPICE_PROTOCOL_DIR);$(SPICE_LIBS)\include\CxImage;$(WindowsSdkDir)\Include\$(TargetPlatformVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>..\common;..\spice-protocol\;$(SPICE_LIBS)\include\CxImage;$(WindowsSdkDir)\Include\$(TargetPlatformVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=_WIN32_WINNT_WIN10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>        <MinimalRebuild>true</MinimalRebuild>
>        <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
> @@ -211,7 +211,7 @@
>      </Midl>
>      <ClCompile>
>        <Optimization>Disabled</Optimization>
> -
> <AdditionalIncludeDirectories>..\common;$(SPICE_PROTOCOL_DIR);$(SPICE_LIBS)\include\CxImage;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>..\common;..\spice-protocol\;$(SPICE_LIBS)\include\CxImage;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>        <MinimalRebuild>true</MinimalRebuild>
>        <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
> @@ -240,7 +240,7 @@
>      </Midl>
>      <ClCompile>
>        <Optimization>Disabled</Optimization>
> -
> <AdditionalIncludeDirectories>..\common;$(SPICE_PROTOCOL_DIR);$(SPICE_LIBS)\include\CxImage;$(WindowsSdkDir)\Include\$(TargetPlatformVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>..\common;..\spice-protocol\;$(SPICE_LIBS)\include\CxImage;$(WindowsSdkDir)\Include\$(TargetPlatformVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>        <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>        <MinimalRebuild>true</MinimalRebuild>
>        <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
> @@ -267,7 +267,7 @@
>    </ItemDefinitionGroup>
>    <ItemDefinitionGroup
>    Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>      <ClCompile>
> -
> <AdditionalIncludeDirectories>..\common;$(SPICE_PROTOCOL_DIR);$(SPICE_LIBS)\include\CxImage;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>..\common;..\spice-protocol\;$(SPICE_LIBS)\include\CxImage;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
>        <PrecompiledHeader />
> @@ -295,7 +295,7 @@
>        <TargetEnvironment>X64</TargetEnvironment>
>      </Midl>
>      <ClCompile>
> -
> <AdditionalIncludeDirectories>..\common;$(SPICE_PROTOCOL_DIR);$(SPICE_LIBS)\include\CxImage;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>..\common;..\spice-protocol\;$(SPICE_LIBS)\include\CxImage;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
>        <PrecompiledHeader />
> @@ -321,7 +321,7 @@
>    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10
>    Release|x64'">
>      <ClCompile>
>        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=_WIN32_WINNT_WIN10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
> -
> <AdditionalIncludeDirectories>..\common;$(SPICE_PROTOCOL_DIR);$(SPICE_LIBS)\include\CxImage;$(WindowsSdkDir)\Include\$(TargetPlatformVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>..\common;..\spice-protocol\;$(SPICE_LIBS)\include\CxImage;$(WindowsSdkDir)\Include\$(TargetPlatformVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
>      </ClCompile>
>      <Link>
> @@ -336,7 +336,7 @@
>    <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10
>    Release|Win32'">
>      <ClCompile>
>        <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_WIN32_WINNT=_WIN32_WINNT_WIN10;%(PreprocessorDefinitions)</PreprocessorDefinitions>
> -
> <AdditionalIncludeDirectories>..\common;$(SPICE_PROTOCOL_DIR);$(SPICE_LIBS)\include\CxImage;$(WindowsSdkDir)\Include\$(TargetPlatformVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>..\common;..\spice-protocol\;$(SPICE_LIBS)\include\CxImage;$(WindowsSdkDir)\Include\$(TargetPlatformVersion);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
>        <WholeProgramOptimization>true</WholeProgramOptimization>
>      </ClCompile>
> diff --git a/vdservice/vdservice.vcxproj b/vdservice/vdservice.vcxproj
> index 7ea66ea..b324802 100644
> --- a/vdservice/vdservice.vcxproj
> +++ b/vdservice/vdservice.vcxproj
> @@ -93,7 +93,7 @@
>    <ItemDefinitionGroup
>    Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
>      <ClCompile>
>        <Optimization>Disabled</Optimization>
> -
> <AdditionalIncludeDirectories>..\common;$(SPICE_PROTOCOL_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>..\common;..\spice-protocol\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>        <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>        <MinimalRebuild>true</MinimalRebuild>
>        <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
> @@ -117,7 +117,7 @@
>      </Midl>
>      <ClCompile>
>        <Optimization>Disabled</Optimization>
> -
> <AdditionalIncludeDirectories>..\common;$(SPICE_PROTOCOL_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>..\common;..\spice-protocol\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>        <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>        <MinimalRebuild>true</MinimalRebuild>
>        <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
> @@ -137,7 +137,7 @@
>    </ItemDefinitionGroup>
>    <ItemDefinitionGroup
>    Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
>      <ClCompile>
> -
> <AdditionalIncludeDirectories>..\common;$(SPICE_PROTOCOL_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>..\common;..\spice-protocol\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>        <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
>        <PrecompiledHeader />
> @@ -160,7 +160,7 @@
>        <TargetEnvironment>X64</TargetEnvironment>
>      </Midl>
>      <ClCompile>
> -
> <AdditionalIncludeDirectories>..\common;$(SPICE_PROTOCOL_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
> +
> <AdditionalIncludeDirectories>..\common;..\spice-protocol\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
>        <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0501;%(PreprocessorDefinitions)</PreprocessorDefinitions>
>        <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
>        <PrecompiledHeader />

Looks good.

Couldn't we define SPICE_PROTOCOL_DIR to ..\spice-protocol\ in the project file to reduce the changes?

Frediano