From: Sandy Stutsman <sstut...@redhat.com>
Squashed commits:
[7336760] Fix up project configuration names to be consistent. (+1 squashed
commits)
Squashed commits:
[b87ec38] Fix up project configuration names to be consistent.
---
qxldod.sln | 20 ++++++++---------
qxldod/qxldod.vcxproj | 61 ++++++++++++++++++++++++++++-----------------------
2 files changed, 43 insertions(+), 38 deletions(-)
diff --git a/qxldod.sln b/qxldod.sln
index 231b4e5..5b79b02 100755
--- a/qxldod.sln
+++ b/qxldod.sln
@@ -19,16 +19,16 @@ Global
Win10 Release|x64 = Win10 Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10
Debug|Win32.ActiveCfg = Win10 Debug|Win32
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10
Debug|Win32.Build.0 = Win10 Debug|Win32
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10
Debug|Win32.Deploy.0 = Win10 Debug|Win32
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10
Debug|x64.ActiveCfg = Win10 Debug|x64
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10 Debug|x64.Build.0
= Win10 Debug|x64
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10
Release|Win32.ActiveCfg = Win10 Release|Win32
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10
Release|Win32.Build.0 = Win10 Release|Win32
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10
Release|Win32.Deploy.0 = Win10 Release|Win32
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10
Release|x64.ActiveCfg = Win10 Release|x64
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10
Release|x64.Build.0 = Win10 Release|x64
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10
Debug|Win32.ActiveCfg = Win10Debug|Win32
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10
Debug|Win32.Build.0 = Win10Debug|Win32
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10
Debug|x64.ActiveCfg = Win10Debug|x64
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10 Debug|x64.Build.0
= Win10Debug|x64
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10 Debug|x64.Deploy.0
= Win10Debug|x64
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10
Release|Win32.ActiveCfg = Win10Debug|Win32
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10
Release|Win32.Build.0 = Win10Debug|Win32
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10
Release|x64.ActiveCfg = Win10Debug|x64
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10
Release|x64.Build.0 = Win10Debug|x64
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10
Release|x64.Deploy.0 = Win10Debug|x64
{B8C04B51-4207-491D-A7DD-C54861E8B528}.Win10
Debug|Win32.ActiveCfg = Win10 Debug|Win32
{B8C04B51-4207-491D-A7DD-C54861E8B528}.Win10
Debug|Win32.Build.0 = Win10 Debug|Win32
{B8C04B51-4207-491D-A7DD-C54861E8B528}.Win10
Debug|x64.ActiveCfg = Win10 Debug|x64
diff --git a/qxldod/qxldod.vcxproj b/qxldod/qxldod.vcxproj
index 320748f..56b01c3 100755
--- a/qxldod/qxldod.vcxproj
+++ b/qxldod/qxldod.vcxproj
@@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Win10 Debug|Win32">
- <Configuration>Win10 Debug</Configuration>
+ <ProjectConfiguration Include="Win10Debug|Win32">
+ <Configuration>Win10Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Win10 Debug|x64">
- <Configuration>Win10 Debug</Configuration>
+ <ProjectConfiguration Include="Win10Debug|x64">
+ <Configuration>Win10Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Win10 Release|Win32">
- <Configuration>Win10 Release</Configuration>
+ <ProjectConfiguration Include="Win10Release|Win32">
+ <Configuration>Win10Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Win10 Release|x64">
- <Configuration>Win10 Release</Configuration>
+ <ProjectConfiguration Include="Win10Release|x64">
+ <Configuration>Win10Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
@@ -29,13 +29,14 @@
<PropertyGroup Label="Globals">
<RootNamespace>qxldod</RootNamespace>
<VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and
'$(VisualStudioVersion)' == '11.0'">$(VCTargetsPath11)</VCTargetsPath>
+
<WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
</PropertyGroup>
<PropertyGroup Label="PropertySheets">
<ConfigurationType>Driver</ConfigurationType>
<DriverType>WDM</DriverType>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10
Debug|Win32'" Label="Configuration">
+ <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Win10Debug|Win32'"
Label="Configuration">
<TargetVersion>
</TargetVersion>
<UseDebugLibraries>false</UseDebugLibraries>
@@ -43,21 +44,21 @@
<ALLOW_DATE_TIME>1</ALLOW_DATE_TIME>
<DriverTargetPlatform>Universal</DriverTargetPlatform>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10
Release|Win32'" Label="Configuration">
+ <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Win10Release|Win32'"
Label="Configuration">
<TargetVersion />
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
<ALLOW_DATE_TIME>1</ALLOW_DATE_TIME>
<DriverTargetPlatform>Universal</DriverTargetPlatform>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'"
Label="Configuration">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug|x64'"
Label="Configuration">
<TargetVersion>
</TargetVersion>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
<ALLOW_DATE_TIME>1</ALLOW_DATE_TIME>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10
Release|x64'" Label="Configuration">
+ <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Win10Release|x64'"
Label="Configuration">
<TargetVersion>
</TargetVersion>
<UseDebugLibraries>false</UseDebugLibraries>
@@ -74,27 +75,27 @@
<PropertyGroup>
<DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10
Debug|Win32'">
- <OutDir>objfre_win8_x86\i386\</OutDir>
- <IntDir>objfre_win8_x86\i386\</IntDir>
+ <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Win10Debug|Win32'">
+ <OutDir>$(Platform)\$(ConfigurationName)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>qxldod</TargetName>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10
Release|Win32'">
- <OutDir>objfre_win8_x86\i386\</OutDir>
- <IntDir>objfre_win8_x86\i386\</IntDir>
+ <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Win10Release|Win32'">
+ <OutDir>$(Platform)\$(ConfigurationName)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>qxldod</TargetName>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10 Debug|x64'">
- <OutDir>objfre_win8_amd64\amd64\</OutDir>
- <IntDir>objfre_win8_amd64\amd64\</IntDir>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug|x64'">
+ <OutDir>$(Platform)\$(ConfigurationName)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>qxldod</TargetName>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10
Release|x64'">
- <OutDir>objfre_win8_amd64\amd64\</OutDir>
- <IntDir>objfre_win8_amd64\amd64\</IntDir>
+ <PropertyGroup
Condition="'$(Configuration)|$(Platform)'=='Win10Release|x64'">
+ <OutDir>$(Platform)\$(ConfigurationName)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>qxldod</TargetName>
</PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10
Debug|Win32'">
+ <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Win10Debug|Win32'">
<Link>
<AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\displib.lib;$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib</AdditionalDependencies>
</Link>
@@ -104,6 +105,8 @@
<ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH);.\Include</AdditionalIncludeDirectories>
<WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+
<PreprocessorDefinitions>DBG;_X86_=1;i386=1;STD_CALL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<PostBuildEvent>
<Command>Inf2Cat /driver:$(OutDir) /os:8_X86,6_3_X86</Command>
@@ -116,7 +119,7 @@
</UmdfVersionNumber>
</Inf>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10
Release|Win32'">
+ <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Win10Release|Win32'">
<Link>
<AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\displib.lib;$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib</AdditionalDependencies>
</Link>
@@ -138,7 +141,7 @@
</UmdfVersionNumber>
</Inf>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10
Debug|x64'">
+ <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Win10Debug|x64'">
<Link>
<AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\displib.lib;$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib</AdditionalDependencies>
</Link>
@@ -148,6 +151,8 @@
<ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH);.\Include</AdditionalIncludeDirectories>
<WarningLevel>Level3</WarningLevel>
+ <Optimization>Disabled</Optimization>
+
<PreprocessorDefinitions>DBG;_WIN64;_AMD64_;AMD64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<PostBuildEvent>
<Command>Inf2Cat /driver:$(OutDir)
/os:8_X64,Server8_X64,Server6_3_X64,6_3_X64</Command>
@@ -160,7 +165,7 @@
</UmdfVersionNumber>
</Inf>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10
Release|x64'">
+ <ItemDefinitionGroup
Condition="'$(Configuration)|$(Platform)'=='Win10Release|x64'">
<Link>
<AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\displib.lib;$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib</AdditionalDependencies>
</Link>
--
1.8.3.1
_______________________________________________
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel
