* Added Windows 10 Configurations and removed older ones.
* Migration to Visual Studio 2015.
* Set Allow Date, Time and Timestamp property for all builds/platforms.
* Fixed up project configuration names to be consistent.
* unified build output directories
* Simple build script added
Signed-off-by: Dmitry Fleytman <dmitry@xxxxxxxxxx>
---
Tools/vs_cmdline.vbs | 23 +++
Tools/vs_run.bat | 26 +++
buildAll.bat | 15 ++
buildAll_NoSign.bat | 19 +++
qxldod Package/qxldod Package.vcxproj | 173 ++++++++------------
qxldod Package/qxldod Package.vcxproj.user | 15 ++
qxldod.sln | 106 ++++++-------
qxldod/buildAll.bat | 31 ----
qxldod/callVisualStudio.bat | 28 ----
qxldod/checkWin8Tools.bat | 8 -
qxldod/clean.bat | 12 --
qxldod/qxldod.vcxproj | 245 ++++++++++++-----------------
qxldod/qxldod.vcxproj.user | 15 ++
13 files changed, 326 insertions(+), 390 deletions(-)
create mode 100644 Tools/vs_cmdline.vbs
create mode 100644 Tools/vs_run.bat
create mode 100644 buildAll.bat
create mode 100644 buildAll_NoSign.bat
create mode 100644 qxldod Package/qxldod Package.vcxproj.user
delete mode 100755 qxldod/buildAll.bat
delete mode 100755 qxldod/callVisualStudio.bat
delete mode 100755 qxldod/checkWin8Tools.bat
delete mode 100755 qxldod/clean.bat
create mode 100644 qxldod/qxldod.vcxproj.user
diff --git a/Tools/vs_cmdline.vbs b/Tools/vs_cmdline.vbs
new file mode 100644
index 0000000..65bd0e5
--- /dev/null
+++ b/Tools/vs_cmdline.vbs
@@ -0,0 +1,23 @@
+Dim strCmdLine, strTemp
+Set WshShell = Wscript.CreateObject("Wscript.Shell")
+
+On Error Resume Next
+strCmdLine = WshShell.RegRead("HKLM\SOFTWARE\Microsoft\VisualStudio\14.0\InstallDir")
+' In case of error assume WoW64 case
+If Err <> 0 Then
+ On Error Goto 0
+ strCmdLine = WshShell.RegRead("HKLM\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\InstallDir")
+End If
+
+On Error Goto 0
+strCmdLine = chr(34) + strCmdLine + "devenv.com" + chr(34)
+For i = 0 to (Wscript.Arguments.Count - 1)
+ strTemp = Wscript.Arguments(i)
+ If InStr(strTemp, " ") Or InStr(strTemp, "|") Then
+ strCmdLine = strCmdLine + " " + chr(34) + strTemp + chr(34)
+ Else
+ strCmdLine = strCmdLine + " " + strTemp
+ End If
+Next
+
+WScript.Echo strCmdLine + vbCrLf
diff --git a/Tools/vs_run.bat b/Tools/vs_run.bat
new file mode 100644
index 0000000..b057fe3
--- /dev/null
+++ b/Tools/vs_run.bat
@@ -0,0 +1,26 @@
+@echo off
+
+for /f "tokens=*" %%a in (
+'cscript.exe /nologo "%~dp0\vs_cmdline.vbs" %*'
+) do (
+SET vs_cmd=%%a
+)
+
+IF NOT DEFINED vs_cmd (
+echo Visual Studio not found
+EXIT /b 1
+)
+
+SET vs_cmd_no_quotes="%vs_cmd:"=%"
+IF "vs_cmd_no_quotes" == "" (
+echo Visual Studio not found
+EXIT /b 2
+)
+
+%vs_cmd%
+if %ERRORLEVEL% GEQ 1 (
+echo Build with Visual Studio FAILED
+EXIT /b 3
+)
+
+EXIT /b 0
diff --git a/buildAll.bat b/buildAll.bat
new file mode 100644
index 0000000..dbbd46b
--- /dev/null
+++ b/buildAll.bat
@@ -0,0 +1,15 @@
+@echo off
+
+SETLOCAL EnableExtensions EnableDelayedExpansion
+
+del *.log
+
+call buildAll_NoSign.bat
+
+call tools\vs_run.bat qxldod.sln /Rebuild "Win10Debug|Win32" /Out build_Win10_Debug_Win32.log
+if !ERRORLEVEL! NEQ 0 exit /B 1
+
+call tools\vs_run.bat qxldod.sln /Rebuild "Win10Debug|x64" /Out build_Win10_Debug_x64.log
+if !ERRORLEVEL! NEQ 0 exit /B 1
+
+ENDLOCAL
diff --git a/buildAll_NoSign.bat b/buildAll_NoSign.bat
new file mode 100644
index 0000000..20f1db4
--- /dev/null
+++ b/buildAll_NoSign.bat
@@ -0,0 +1,19 @@
+@echo off
+
+SETLOCAL EnableExtensions EnableDelayedExpansion
+
+del *.log
+
+call tools\vs_run.bat qxldod.sln /Rebuild "Win10Debug_NoSign|Win32" /Out build_Win10_Debug_NoSign_Win32.log
+if !ERRORLEVEL! NEQ 0 exit /B 1
+
+call tools\vs_run.bat qxldod.sln /Rebuild "Win10Release|Win32" /Out build_Win10_Release_Win32.log
+if !ERRORLEVEL! NEQ 0 exit /B 1
+
+call tools\vs_run.bat qxldod.sln /Rebuild "Win10Debug_NoSign|x64" /Out build_Win10_Debug_NoSign_x64.log
+if !ERRORLEVEL! NEQ 0 exit /B 1
+
+call tools\vs_run.bat qxldod.sln /Rebuild "Win10Release|x64" /Out build_Win10_Release_x64.log
+if !ERRORLEVEL! NEQ 0 exit /B 1
+
+ENDLOCAL
diff --git a/qxldod Package/qxldod Package.vcxproj b/qxldod Package/qxldod Package.vcxproj
index 2935ed7..a0c0cb8 100755
--- a/qxldod Package/qxldod Package.vcxproj
+++ b/qxldod Package/qxldod Package.vcxproj
@@ -1,59 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Win8.1 Debug|Win32">
- <Configuration>Win8.1 Debug</Configuration>
+ <ProjectConfiguration Include="Win10Debug_NoSign|Win32">
+ <Configuration>Win10Debug_NoSign</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Win8 Debug|Win32">
- <Configuration>Win8 Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Win8.1 Release|Win32">
- <Configuration>Win8.1 Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Win8 Release|Win32">
- <Configuration>Win8 Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Win7 Debug|Win32">
- <Configuration>Win7 Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Win7 Release|Win32">
- <Configuration>Win7 Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Win8.1 Debug|x64">
- <Configuration>Win8.1 Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Win8 Debug|x64">
- <Configuration>Win8 Debug</Configuration>
+ <ProjectConfiguration Include="Win10Debug_NoSign|x64">
+ <Configuration>Win10Debug_NoSign</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Win8.1 Release|x64">
- <Configuration>Win8.1 Release</Configuration>
- <Platform>x64</Platform>
+ <ProjectConfiguration Include="Win10Debug|Win32">
+ <Configuration>Win10Debug</Configuration>
+ <Platform>Win32</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Win8 Release|x64">
- <Configuration>Win8 Release</Configuration>
+ <ProjectConfiguration Include="Win10Debug|x64">
+ <Configuration>Win10Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Win7 Debug|x64">
- <Configuration>Win7 Debug</Configuration>
- <Platform>x64</Platform>
+ <ProjectConfiguration Include="Win10Release|Win32">
+ <Configuration>Win10Release</Configuration>
+ <Platform>Win32</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Win7 Release|x64">
- <Configuration>Win7 Release</Configuration>
+ <ProjectConfiguration Include="Win10Release|x64">
+ <Configuration>Win10Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{B8C04B51-4207-491D-A7DD-C54861E8B528}</ProjectGuid>
<TemplateGuid>{4605da2c-74a5-4865-98e1-152ef136825f}</TemplateGuid>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
<Configuration>Win8 Debug</Configuration>
<Platform Condition="'$(Platform)' == ''">Win32</Platform>
@@ -61,6 +37,8 @@
<PropertyGroup Label="Globals">
<RootNamespace>qxldod_Package</RootNamespace>
<VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VisualStudioVersion)' == '11.0'">$(VCTargetsPath11)</VCTargetsPath>
+ <WindowsTargetPlatformVersion>$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
+ <ProjectName>qxldod_Package</ProjectName>
</PropertyGroup>
<PropertyGroup Label="PropertySheets">
<ConfigurationType>Utility</ConfigurationType>
@@ -68,65 +46,39 @@
<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8.1 Debug|Win32'">
- <TargetVersion>WindowsV6.3</TargetVersion>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'" Label="Configuration">
- <TargetVersion>Windows8</TargetVersion>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8.1 Release|Win32'">
- <TargetVersion>WindowsV6.3</TargetVersion>
+ <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win10Debug|x64'">
+ <TargetVersion>
+ </TargetVersion>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset>
+ <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'" Label="Configuration">
- <TargetVersion>Windows8</TargetVersion>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug_NoSign|x64'" Label="Configuration">
+ <TargetVersion />
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|Win32'" Label="Configuration">
- <TargetVersion>Windows7</TargetVersion>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset>
+ <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Release|Win32'" Label="Configuration">
- <TargetVersion>Windows7</TargetVersion>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Release|x64'" Label="Configuration">
+ <TargetVersion>
+ </TargetVersion>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset>
+ <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
</PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8.1 Debug|x64'">
- <TargetVersion>WindowsV6.3</TargetVersion>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'" Label="Configuration">
- <TargetVersion>Windows8</TargetVersion>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8.1 Release|x64'">
- <TargetVersion>WindowsV6.3</TargetVersion>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug|Win32'" Label="Configuration">
+ <TargetVersion>
+ </TargetVersion>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset>
+ <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'" Label="Configuration">
- <TargetVersion>Windows8</TargetVersion>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug_NoSign|Win32'" Label="Configuration">
+ <TargetVersion />
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Debug|x64'" Label="Configuration">
- <TargetVersion>Windows7</TargetVersion>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset>
+ <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win7 Release|x64'" Label="Configuration">
- <TargetVersion>Windows7</TargetVersion>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Release|Win32'" Label="Configuration">
+ <TargetVersion>
+ </TargetVersion>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset>
+ <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -135,7 +87,9 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup />
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Release|x64'">
+ <OutDir>$(SolutionDir)\build\$(Platform)\$(ConfigurationName)\</OutDir>
+ </PropertyGroup>
<PropertyGroup>
<DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
<EnableDeployment>False</EnableDeployment>
@@ -149,42 +103,47 @@
<VerifyDrivers />
<VerifyFlags>133563</VerifyFlags>
</PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">
- <Inf2Cat>
- <WindowsVersionList>8_x86,6_3_x86</WindowsVersionList>
- </Inf2Cat>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">
- <Inf2Cat>
- <WindowsVersionList>8_x86,6_3_x86</WindowsVersionList>
- </Inf2Cat>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 Debug|Win32'">
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug|x64'">
+ <OutDir>$(SolutionDir)\build\$(Platform)\$(ConfigurationName)\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug_NoSign|x64'">
+ <OutDir>$(SolutionDir)\build\$(Platform)\$(ConfigurationName)\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Release|Win32'">
+ <OutDir>$(SolutionDir)\build\$(Platform)\$(ConfigurationName)\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug|Win32'">
+ <OutDir>$(SolutionDir)\build\$(Platform)\$(ConfigurationName)\</OutDir>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug_NoSign|Win32'">
+ <OutDir>$(SolutionDir)\build\$(Platform)\$(ConfigurationName)\</OutDir>
+ </PropertyGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug|x64'">
<Inf2Cat>
- <WindowsVersionList>8_x86,6_3_x86</WindowsVersionList>
+ <WindowsVersionList>8_x64,Server8_x64,Server6_3_x64,6_3_x64</WindowsVersionList>
</Inf2Cat>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 Release|Win32'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug_NoSign|x64'">
<Inf2Cat>
- <WindowsVersionList>8_x86,6_3_x86</WindowsVersionList>
+ <WindowsVersionList>8_x64,Server8_x64,Server6_3_x64,6_3_x64</WindowsVersionList>
</Inf2Cat>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10Release|x64'">
<Inf2Cat>
<WindowsVersionList>8_x64,Server8_x64,Server6_3_x64,6_3_x64</WindowsVersionList>
</Inf2Cat>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug|Win32'">
<Inf2Cat>
<WindowsVersionList>8_x64,Server8_x64,Server6_3_x64,6_3_x64</WindowsVersionList>
</Inf2Cat>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 Debug|x64'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug_NoSign|Win32'">
<Inf2Cat>
<WindowsVersionList>8_x64,Server8_x64,Server6_3_x64,6_3_x64</WindowsVersionList>
</Inf2Cat>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 Release|x64'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10Release|Win32'">
<Inf2Cat>
<WindowsVersionList>8_x64,Server8_x64,Server6_3_x64,6_3_x64</WindowsVersionList>
</Inf2Cat>
diff --git a/qxldod Package/qxldod Package.vcxproj.user b/qxldod Package/qxldod Package.vcxproj.user
new file mode 100644
index 0000000..14b3bb5
--- /dev/null
+++ b/qxldod Package/qxldod Package.vcxproj.user
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Release|x64'">
+ <SignMode>Off</SignMode>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Release|Win32'">
+ <SignMode>Off</SignMode>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug_NoSign|x64'">
+ <SignMode>Off</SignMode>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug_NoSign|Win32'">
+ <SignMode>Off</SignMode>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
diff --git a/qxldod.sln b/qxldod.sln
index 14f4cd6..5989215 100755
--- a/qxldod.sln
+++ b/qxldod.sln
@@ -1,74 +1,62 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qxldod", "qxldod\qxldod.vcxproj", "{A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qxldod Package", "qxldod Package\qxldod Package.vcxproj", "{B8C04B51-4207-491D-A7DD-C54861E8B528}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qxldod_Package", "qxldod Package\qxldod Package.vcxproj", "{B8C04B51-4207-491D-A7DD-C54861E8B528}"
ProjectSection(ProjectDependencies) = postProject
{A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD} = {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}
EndProjectSection
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{467F7836-D656-441E-ACFE-1CF73CD25364}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Win8 Debug|Win32 = Win8 Debug|Win32
- Win8 Debug|x64 = Win8 Debug|x64
- Win8 Release|Win32 = Win8 Release|Win32
- Win8 Release|x64 = Win8 Release|x64
- Win8.1 Debug|Win32 = Win8.1 Debug|Win32
- Win8.1 Debug|x64 = Win8.1 Debug|x64
- Win8.1 Release|Win32 = Win8.1 Release|Win32
- Win8.1 Release|x64 = Win8.1 Release|x64
+ Win10Debug_NoSign|Win32 = Win10Debug_NoSign|Win32
+ Win10Debug_NoSign|x64 = Win10Debug_NoSign|x64
+ Win10Debug|Win32 = Win10Debug|Win32
+ Win10Debug|x64 = Win10Debug|x64
+ Win10Release|Win32 = Win10Release|Win32
+ Win10Release|x64 = Win10Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8 Debug|Win32.ActiveCfg = Win8 Debug|Win32
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8 Debug|Win32.Build.0 = Win8 Debug|Win32
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8 Debug|Win32.Deploy.0 = Win8 Debug|Win32
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8 Debug|x64.ActiveCfg = Win8 Debug|x64
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8 Debug|x64.Build.0 = Win8 Debug|x64
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8 Debug|x64.Deploy.0 = Win8 Debug|x64
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8 Release|Win32.ActiveCfg = Win8 Release|Win32
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8 Release|Win32.Build.0 = Win8 Release|Win32
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8 Release|Win32.Deploy.0 = Win8 Release|Win32
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8 Release|x64.ActiveCfg = Win8 Release|x64
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8 Release|x64.Build.0 = Win8 Release|x64
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8 Release|x64.Deploy.0 = Win8 Release|x64
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8.1 Debug|Win32.ActiveCfg = Win8.1 Debug|Win32
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8.1 Debug|Win32.Build.0 = Win8.1 Debug|Win32
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8.1 Debug|Win32.Deploy.0 = Win8.1 Debug|Win32
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8.1 Debug|x64.ActiveCfg = Win8.1 Debug|x64
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8.1 Debug|x64.Build.0 = Win8.1 Debug|x64
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8.1 Debug|x64.Deploy.0 = Win8.1 Debug|x64
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8.1 Release|Win32.ActiveCfg = Win8.1 Release|Win32
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8.1 Release|Win32.Build.0 = Win8.1 Release|Win32
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8.1 Release|Win32.Deploy.0 = Win8.1 Release|Win32
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8.1 Release|x64.ActiveCfg = Win8.1 Release|x64
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8.1 Release|x64.Build.0 = Win8.1 Release|x64
- {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win8.1 Release|x64.Deploy.0 = Win8.1 Release|x64
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8 Debug|Win32.ActiveCfg = Win8 Debug|Win32
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8 Debug|Win32.Build.0 = Win8 Debug|Win32
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8 Debug|Win32.Deploy.0 = Win8 Debug|Win32
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8 Debug|x64.ActiveCfg = Win8 Debug|x64
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8 Debug|x64.Build.0 = Win8 Debug|x64
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8 Debug|x64.Deploy.0 = Win8 Debug|x64
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8 Release|Win32.ActiveCfg = Win8 Release|Win32
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8 Release|Win32.Build.0 = Win8 Release|Win32
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8 Release|Win32.Deploy.0 = Win8 Release|Win32
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8 Release|x64.ActiveCfg = Win8 Release|x64
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8 Release|x64.Build.0 = Win8 Release|x64
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8 Release|x64.Deploy.0 = Win8 Release|x64
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8.1 Debug|Win32.ActiveCfg = Win8.1 Debug|Win32
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8.1 Debug|Win32.Build.0 = Win8.1 Debug|Win32
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8.1 Debug|Win32.Deploy.0 = Win8.1 Debug|Win32
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8.1 Debug|x64.ActiveCfg = Win8.1 Debug|x64
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8.1 Debug|x64.Build.0 = Win8.1 Debug|x64
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8.1 Debug|x64.Deploy.0 = Win8.1 Debug|x64
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8.1 Release|Win32.ActiveCfg = Win8.1 Release|Win32
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8.1 Release|Win32.Build.0 = Win8.1 Release|Win32
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8.1 Release|Win32.Deploy.0 = Win8.1 Release|Win32
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8.1 Release|x64.ActiveCfg = Win8.1 Release|x64
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8.1 Release|x64.Build.0 = Win8.1 Release|x64
- {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win8.1 Release|x64.Deploy.0 = Win8.1 Release|x64
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10Debug_NoSign|Win32.ActiveCfg = Win10Debug_NoSign|Win32
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10Debug_NoSign|Win32.Build.0 = Win10Debug_NoSign|Win32
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10Debug_NoSign|Win32.Deploy.0 = Win10Debug_NoSign|Win32
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10Debug_NoSign|x64.ActiveCfg = Win10Debug_NoSign|x64
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10Debug_NoSign|x64.Build.0 = Win10Debug_NoSign|x64
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10Debug_NoSign|x64.Deploy.0 = Win10Debug_NoSign|x64
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10Debug|Win32.ActiveCfg = Win10Debug|Win32
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10Debug|Win32.Build.0 = Win10Debug|Win32
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10Debug|Win32.Deploy.0 = Win10Debug|Win32
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10Debug|x64.ActiveCfg = Win10Debug|x64
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10Debug|x64.Build.0 = Win10Debug|x64
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10Debug|x64.Deploy.0 = Win10Debug|x64
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10Release|Win32.ActiveCfg = Win10Release|Win32
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10Release|Win32.Build.0 = Win10Release|Win32
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10Release|Win32.Deploy.0 = Win10Release|Win32
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10Release|x64.ActiveCfg = Win10Release|x64
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10Release|x64.Build.0 = Win10Release|x64
+ {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}.Win10Release|x64.Deploy.0 = Win10Release|x64
+ {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win10Debug_NoSign|Win32.ActiveCfg = Win10Debug_NoSign|Win32
+ {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win10Debug_NoSign|Win32.Build.0 = Win10Debug_NoSign|Win32
+ {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win10Debug_NoSign|Win32.Deploy.0 = Win10Debug_NoSign|Win32
+ {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win10Debug_NoSign|x64.ActiveCfg = Win10Debug_NoSign|x64
+ {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win10Debug_NoSign|x64.Build.0 = Win10Debug_NoSign|x64
+ {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win10Debug_NoSign|x64.Deploy.0 = Win10Debug_NoSign|x64
+ {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win10Debug|Win32.ActiveCfg = Win10Debug|Win32
+ {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win10Debug|Win32.Build.0 = Win10Debug|Win32
+ {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win10Debug|Win32.Deploy.0 = Win10Debug|Win32
+ {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win10Debug|x64.ActiveCfg = Win10Debug|x64
+ {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win10Debug|x64.Build.0 = Win10Debug|x64
+ {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win10Debug|x64.Deploy.0 = Win10Debug|x64
+ {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win10Release|Win32.ActiveCfg = Win10Release|Win32
+ {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win10Release|Win32.Build.0 = Win10Release|Win32
+ {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win10Release|Win32.Deploy.0 = Win10Release|Win32
+ {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win10Release|x64.ActiveCfg = Win10Release|x64
+ {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win10Release|x64.Build.0 = Win10Release|x64
+ {B8C04B51-4207-491D-A7DD-C54861E8B528}.Win10Release|x64.Deploy.0 = Win10Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/qxldod/buildAll.bat b/qxldod/buildAll.bat
deleted file mode 100755
index 072a2b4..0000000
--- a/qxldod/buildAll.bat
+++ /dev/null
@@ -1,31 +0,0 @@
-@echo off
-
-call clean.bat
-
-rem WIN8_64
-setlocal
-if exist Install\win8\amd64 rmdir Install\win8\amd64 /s /q
-call callVisualStudio.bat 12 qxldod.vcxproj /Rebuild "Win8 Release|x64" /Out buildfre_win8_amd64.log
-mkdir .\Install\Win8\x64
-del /Q .\Install\Win8\x64\*
-copy /Y objfre_win8_amd64\amd64\qxldod.sys .\Install\Win8\x64
-copy /Y objfre_win8_amd64\amd64\qxldod.inf .\Install\Win8\x64
-copy /Y objfre_win8_amd64\amd64\qxldod.cat .\Install\Win8\x64
-copy /Y objfre_win8_amd64\amd64\qxldod.pdb .\Install\Win8\x64
-endlocal
-if %ERRORLEVEL% NEQ 0 goto :eof
-
-rem WIN8_32
-setlocal
-if exist Install\win8\x86 rmdir Install\win8\x86 /s /q
-call callVisualStudio.bat 12 qxldod.vcxproj /Rebuild "Win8 Release|Win32" /Out buildfre_win8_x86.log
-mkdir .\Install\Win8\x86
-del /Q .\Install\Win8\x86\*
-copy /Y objfre_win8_x86\i386\qxldod.sys .\Install\Win8\x86
-copy /Y objfre_win8_x86\i386\qxldod.inf .\Install\Win8\x86
-copy /Y objfre_win8_x86\i386\qxldod.cat .\Install\Win8\x86
-copy /Y objfre_win8_x86\i386\qxldod.pdb .\Install\Win8\x86
-endlocal
-if %ERRORLEVEL% NEQ 0 goto :eof
-
-:eof
diff --git a/qxldod/callVisualStudio.bat b/qxldod/callVisualStudio.bat
deleted file mode 100755
index 769752d..0000000
--- a/qxldod/callVisualStudio.bat
+++ /dev/null
@@ -1,28 +0,0 @@
-@echo off
-
-call %~dp0\checkWin8Tools.bat
-
-for /f "tokens=*" %%a in (
-'cscript.exe /nologo "%~dp0\getVisualStudioCmdLine.vbs" %*'
-) do (
-set vs_cmd=%%a
-)
-
-IF NOT DEFINED vs_cmd (
-echo Visual Studio not found
-EXIT /b 1
-)
-
-SET vs_cmd_no_quotes="%vs_cmd:"=%"
-IF "vs_cmd_no_quotes" == "" (
-echo Visual Studio not found
-EXIT /b 2
-)
-
-call %vs_cmd%
-if %ERRORLEVEL% GEQ 1 (
-echo Build with Visual Studio FAILED
-exit /b %ERRORLEVEL%
-)
-
-exit /b 0
diff --git a/qxldod/checkWin8Tools.bat b/qxldod/checkWin8Tools.bat
deleted file mode 100755
index 66a9436..0000000
--- a/qxldod/checkWin8Tools.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off
-
-reg query HKLM\Software\Microsoft\VisualStudio\12.0 /v InstallDir > nul 2>nul
-if %ERRORLEVEL% EQU 0 exit /b 0
-reg query HKLM\Software\Wow6432Node\Microsoft\VisualStudio\12.0 /v InstallDir > nul 2>nul
-if %ERRORLEVEL% EQU 0 exit /b 0
-echo ERROR building Win8 drivers: VS12 is not installed
-exit /b 2
\ No newline at end of file
diff --git a/qxldod/clean.bat b/qxldod/clean.bat
deleted file mode 100755
index 83da6de..0000000
--- a/qxldod/clean.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-@echo on
-
-rmdir /S /Q .\Install
-
-rmdir /S /Q objfre_win8_x86
-rmdir /S /Q objfre_win8_amd64
-rmdir /S /Q objchk_win8_x86
-rmdir /S /Q objchk_win8_amd64
-
-del /F *.log *.wrn *.err
-
-
diff --git a/qxldod/qxldod.vcxproj b/qxldod/qxldod.vcxproj
index 84e7cc3..15b116c 100755
--- a/qxldod/qxldod.vcxproj
+++ b/qxldod/qxldod.vcxproj
@@ -1,43 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Win8.1 Debug|Win32">
- <Configuration>Win8.1 Debug</Configuration>
+ <ProjectConfiguration Include="Win10Debug_NoSign|Win32">
+ <Configuration>Win10Debug_NoSign</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Win8 Debug|Win32">
- <Configuration>Win8 Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Win8.1 Release|Win32">
- <Configuration>Win8.1 Release</Configuration>
- <Platform>Win32</Platform>
+ <ProjectConfiguration Include="Win10Debug_NoSign|x64">
+ <Configuration>Win10Debug_NoSign</Configuration>
+ <Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Win8 Release|Win32">
- <Configuration>Win8 Release</Configuration>
+ <ProjectConfiguration Include="Win10Debug|Win32">
+ <Configuration>Win10Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Win8.1 Debug|x64">
- <Configuration>Win8.1 Debug</Configuration>
+ <ProjectConfiguration Include="Win10Debug|x64">
+ <Configuration>Win10Debug</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Win8 Debug|x64">
- <Configuration>Win8 Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Win8.1 Release|x64">
- <Configuration>Win8.1 Release</Configuration>
- <Platform>x64</Platform>
+ <ProjectConfiguration Include="Win10Release|Win32">
+ <Configuration>Win10Release</Configuration>
+ <Platform>Win32</Platform>
</ProjectConfiguration>
- <ProjectConfiguration Include="Win8 Release|x64">
- <Configuration>Win8 Release</Configuration>
+ <ProjectConfiguration Include="Win10Release|x64">
+ <Configuration>Win10Release</Configuration>
<Platform>x64</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}</ProjectGuid>
<TemplateGuid>{dd38f7fc-d7bd-488b-9242-7d8754cde80d}</TemplateGuid>
- <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
<MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
<Configuration>Win8 Debug</Configuration>
<Platform Condition="'$(Platform)' == ''">Win32</Platform>
@@ -45,55 +37,53 @@
<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 Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8.1 Debug|Win32'">
- <TargetVersion>WindowsV6.3</TargetVersion>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug|Win32'" Label="Configuration">
+ <TargetVersion>
+ </TargetVersion>
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
<ALLOW_DATE_TIME>1</ALLOW_DATE_TIME>
+ <DriverTargetPlatform>Universal</DriverTargetPlatform>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'" Label="Configuration">
- <TargetVersion>Windows8</TargetVersion>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug_NoSign|Win32'" Label="Configuration">
+ <TargetVersion />
+ <UseDebugLibraries>false</UseDebugLibraries>
+ <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
<ALLOW_DATE_TIME>1</ALLOW_DATE_TIME>
+ <DriverTargetPlatform>Universal</DriverTargetPlatform>
</PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8.1 Release|Win32'">
- <TargetVersion>WindowsV6.3</TargetVersion>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Release|Win32'" Label="Configuration">
+ <TargetVersion />
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset>
+ <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
<ALLOW_DATE_TIME>1</ALLOW_DATE_TIME>
+ <DriverTargetPlatform>Universal</DriverTargetPlatform>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'" Label="Configuration">
- <TargetVersion>Windows8</TargetVersion>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug|x64'" Label="Configuration">
+ <TargetVersion>
+ </TargetVersion>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset>
+ <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
<ALLOW_DATE_TIME>1</ALLOW_DATE_TIME>
</PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8.1 Debug|x64'">
- <TargetVersion>WindowsV6.3</TargetVersion>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'" Label="Configuration">
- <TargetVersion>Windows8</TargetVersion>
- <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Win8.1 Release|x64'">
- <TargetVersion>WindowsV6.3</TargetVersion>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug_NoSign|x64'" Label="Configuration">
+ <TargetVersion />
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset>
+ <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
+ <ALLOW_DATE_TIME>1</ALLOW_DATE_TIME>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'" Label="Configuration">
- <TargetVersion>Windows8</TargetVersion>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Release|x64'" Label="Configuration">
+ <TargetVersion>
+ </TargetVersion>
<UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>WindowsKernelModeDriver8.1</PlatformToolset>
+ <PlatformToolset>WindowsKernelModeDriver10.0</PlatformToolset>
<ALLOW_DATE_TIME>1</ALLOW_DATE_TIME>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
@@ -103,50 +93,40 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 Debug|Win32'">
- <OutDir>objchk_win8_x86\i386\</OutDir>
- <IntDir>objchk_win8_x86\i386\</IntDir>
- <TargetName>qxldod</TargetName>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">
- <OutDir>objchk_win8_x86\i386\</OutDir>
- <IntDir>objchk_win8_x86\i386\</IntDir>
- <TargetName>qxldod</TargetName>
- </PropertyGroup>
<PropertyGroup>
<DebuggerFlavor>DbgengKernelDebugger</DebuggerFlavor>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 Release|Win32'">
- <OutDir>objfre_win8_x86\i386\</OutDir>
- <IntDir>objfre_win8_x86\i386\</IntDir>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug|Win32'">
+ <OutDir>$(SolutionDir)\build\$(Platform)\$(ConfigurationName)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>qxldod</TargetName>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">
- <OutDir>objfre_win8_x86\i386\</OutDir>
- <IntDir>objfre_win8_x86\i386\</IntDir>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug_NoSign|Win32'">
+ <OutDir>$(SolutionDir)\build\$(Platform)\$(ConfigurationName)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>qxldod</TargetName>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 Release|x64'">
- <OutDir>objfre_win8_amd64\amd64\</OutDir>
- <IntDir>objfre_win8_amd64\amd64\</IntDir>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Release|Win32'">
+ <OutDir>$(SolutionDir)\build\$(Platform)\$(ConfigurationName)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>qxldod</TargetName>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|x64'">
- <OutDir>objfre_win8_amd64\amd64\</OutDir>
- <IntDir>objfre_win8_amd64\amd64\</IntDir>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug|x64'">
+ <OutDir>$(SolutionDir)\build\$(Platform)\$(ConfigurationName)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>qxldod</TargetName>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 Debug|x64'">
- <OutDir>objchk_win8_amd64\amd64\</OutDir>
- <IntDir>objchk_win8_amd64\amd64\</IntDir>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug_NoSign|x64'">
+ <OutDir>$(SolutionDir)\build\$(Platform)\$(ConfigurationName)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>qxldod</TargetName>
</PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">
- <OutDir>objchk_win8_amd64\amd64\</OutDir>
- <IntDir>objchk_win8_amd64\amd64\</IntDir>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Release|x64'">
+ <OutDir>$(SolutionDir)\build\$(Platform)\$(ConfigurationName)\</OutDir>
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
<TargetName>qxldod</TargetName>
</PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 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>
@@ -156,19 +136,21 @@
<ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH);.\Include</AdditionalIncludeDirectories>
<WarningLevel>Level3</WarningLevel>
- <ExceptionHandling>
- </ExceptionHandling>
+ <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>
</PostBuildEvent>
<Inf>
<EnableVerbose>true</EnableVerbose>
- <KmdfVersionNumber />
- <UmdfVersionNumber />
+ <KmdfVersionNumber>
+ </KmdfVersionNumber>
+ <UmdfVersionNumber>
+ </UmdfVersionNumber>
</Inf>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|Win32'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug_NoSign|Win32'">
<Link>
<AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\displib.lib;$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib</AdditionalDependencies>
</Link>
@@ -178,22 +160,21 @@
<ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH);.\Include</AdditionalIncludeDirectories>
<WarningLevel>Level3</WarningLevel>
- <ExceptionHandling />
+ <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>
</PostBuildEvent>
<Inf>
- <KmdfVersionNumber />
- </Inf>
- <Inf>
- <UmdfVersionNumber />
- </Inf>
- <Inf>
<EnableVerbose>true</EnableVerbose>
+ <KmdfVersionNumber>
+ </KmdfVersionNumber>
+ <UmdfVersionNumber>
+ </UmdfVersionNumber>
</Inf>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 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>
@@ -209,11 +190,13 @@
</PostBuildEvent>
<Inf>
<EnableVerbose>true</EnableVerbose>
- <KmdfVersionNumber />
- <UmdfVersionNumber />
+ <KmdfVersionNumber>
+ </KmdfVersionNumber>
+ <UmdfVersionNumber>
+ </UmdfVersionNumber>
</Inf>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Release|Win32'">
+ <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>
@@ -223,55 +206,21 @@
<ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH);.\Include</AdditionalIncludeDirectories>
<WarningLevel>Level3</WarningLevel>
- </ClCompile>
- <PostBuildEvent>
- <Command>Inf2Cat /driver:$(OutDir) /os:8_X86,6_3_X86</Command>
- </PostBuildEvent>
- <Inf>
- <EnableVerbose>true</EnableVerbose>
- <KmdfVersionNumber />
- <UmdfVersionNumber />
- </Inf>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 Debug|x64'">
- <Link>
- <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\displib.lib;$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib</AdditionalDependencies>
- </Link>
- <ResourceCompile>
- <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <ClCompile>
- <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH);.\Include</AdditionalIncludeDirectories>
- </ClCompile>
- <PostBuildEvent>
- <Command>Inf2Cat /driver:$(OutDir) /os:8_X64,Server8_X64,Server6_3_X64,6_3_X64</Command>
- </PostBuildEvent>
- <Inf>
- <EnableVerbose>true</EnableVerbose>
- <KmdfVersionNumber />
- <UmdfVersionNumber />
- </Inf>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 Debug|x64'">
- <Link>
- <AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\displib.lib;$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib</AdditionalDependencies>
- </Link>
- <ResourceCompile>
- <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH)</AdditionalIncludeDirectories>
- </ResourceCompile>
- <ClCompile>
- <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH);.\Include</AdditionalIncludeDirectories>
+ <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>
</PostBuildEvent>
<Inf>
<EnableVerbose>true</EnableVerbose>
- <KmdfVersionNumber />
- <UmdfVersionNumber />
+ <KmdfVersionNumber>
+ </KmdfVersionNumber>
+ <UmdfVersionNumber>
+ </UmdfVersionNumber>
</Inf>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8.1 Release|x64'">
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug_NoSign|x64'">
<Link>
<AdditionalDependencies>%(AdditionalDependencies);$(DDK_LIB_PATH)\displib.lib;$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib</AdditionalDependencies>
</Link>
@@ -281,17 +230,21 @@
<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>
</PostBuildEvent>
<Inf>
<EnableVerbose>true</EnableVerbose>
- <KmdfVersionNumber />
- <UmdfVersionNumber />
+ <KmdfVersionNumber>
+ </KmdfVersionNumber>
+ <UmdfVersionNumber>
+ </UmdfVersionNumber>
</Inf>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Win8 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>
@@ -307,8 +260,10 @@
</PostBuildEvent>
<Inf>
<EnableVerbose>true</EnableVerbose>
- <KmdfVersionNumber />
- <UmdfVersionNumber />
+ <KmdfVersionNumber>
+ </KmdfVersionNumber>
+ <UmdfVersionNumber>
+ </UmdfVersionNumber>
</Inf>
</ItemDefinitionGroup>
<ItemGroup>
diff --git a/qxldod/qxldod.vcxproj.user b/qxldod/qxldod.vcxproj.user
new file mode 100644
index 0000000..14b3bb5
--- /dev/null
+++ b/qxldod/qxldod.vcxproj.user
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Release|x64'">
+ <SignMode>Off</SignMode>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Release|Win32'">
+ <SignMode>Off</SignMode>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug_NoSign|x64'">
+ <SignMode>Off</SignMode>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Win10Debug_NoSign|Win32'">
+ <SignMode>Off</SignMode>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
--
2.7.0.windows.1
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel