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/qxldod/callVisualStudio.bat b/Tools/vs_run.bat old mode 100755 new mode 100644 similarity index 56% rename from qxldod/callVisualStudio.bat rename to Tools/vs_run.bat index 769752d..b057fe3 --- a/qxldod/callVisualStudio.bat +++ b/Tools/vs_run.bat @@ -1,12 +1,10 @@ @echo off -call %~dp0\checkWin8Tools.bat - -for /f "tokens=*" %%a in ( -'cscript.exe /nologo "%~dp0\getVisualStudioCmdLine.vbs" %*' -) do ( -set vs_cmd=%%a -) +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 @@ -19,10 +17,10 @@ echo Visual Studio not found EXIT /b 2 ) -call %vs_cmd% +%vs_cmd% if %ERRORLEVEL% GEQ 1 ( echo Build with Visual Studio FAILED -exit /b %ERRORLEVEL% +EXIT /b 3 ) -exit /b 0 +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..d26feb5 100755 --- a/qxldod Package/qxldod Package.vcxproj +++ b/qxldod Package/qxldod Package.vcxproj @@ -1,59 +1,35 @@ - - + + - - Win8.1 Debug + + Win10Debug_NoSign Win32 - - Win8 Debug - Win32 - - - Win8.1 Release - Win32 - - - Win8 Release - Win32 - - - Win7 Debug - Win32 - - - Win7 Release - Win32 - - - Win8.1 Debug + + Win10Debug_NoSign x64 - - Win8 Debug + + Win10Debug + Win32 + + + Win10Debug x64 - - Win8.1 Release - x64 + + Win10Release + Win32 - - Win8 Release - x64 - - - Win7 Debug - x64 - - - Win7 Release + + Win10Release x64 {B8C04B51-4207-491D-A7DD-C54861E8B528} {4605da2c-74a5-4865-98e1-152ef136825f} - v4.5 + v4.5.2 11.0 Win8 Debug Win32 @@ -61,6 +37,8 @@ qxldod_Package $(VCTargetsPath11) + $(LatestTargetPlatformVersion) + qxldod_Package Utility @@ -68,65 +46,39 @@ true - - WindowsV6.3 - true - WindowsKernelModeDriver8.1 - - - Windows8 - true - WindowsKernelModeDriver8.1 - - - WindowsV6.3 + + + false - WindowsKernelModeDriver8.1 + WindowsKernelModeDriver10.0 - - Windows8 + + false - WindowsKernelModeDriver8.1 + WindowsKernelModeDriver10.0 - - Windows7 - true - WindowsKernelModeDriver8.1 - - - Windows7 + + + false - WindowsKernelModeDriver8.1 + WindowsKernelModeDriver10.0 - - WindowsV6.3 - true - WindowsKernelModeDriver8.1 - - - Windows8 - true - WindowsKernelModeDriver8.1 - - - WindowsV6.3 + + + false - WindowsKernelModeDriver8.1 + WindowsKernelModeDriver10.0 - - Windows8 + + false - WindowsKernelModeDriver8.1 + WindowsKernelModeDriver10.0 - - Windows7 - true - WindowsKernelModeDriver8.1 - - - Windows7 + + + false - WindowsKernelModeDriver8.1 + WindowsKernelModeDriver10.0 @@ -135,7 +87,9 @@ - + + $(SolutionDir)\build\$(Platform)\$(ConfigurationName)\ + DbgengKernelDebugger False @@ -149,42 +103,47 @@ 133563 - - - 8_x86,6_3_x86 - - - - - 8_x86,6_3_x86 - - - - - 8_x86,6_3_x86 - - - - - 8_x86,6_3_x86 - - - + + $(SolutionDir)\build\$(Platform)\$(ConfigurationName)\ + + + $(SolutionDir)\build\$(Platform)\$(ConfigurationName)\ + + + $(SolutionDir)\build\$(Platform)\$(ConfigurationName)\ + + + $(SolutionDir)\build\$(Platform)\$(ConfigurationName)\ + + + $(SolutionDir)\build\$(Platform)\$(ConfigurationName)\ + + 8_x64,Server8_x64,Server6_3_x64,6_3_x64 - + 8_x64,Server8_x64,Server6_3_x64,6_3_x64 - + 8_x64,Server8_x64,Server6_3_x64,6_3_x64 - + + + 8_x64,Server8_x64,Server6_3_x64,6_3_x64 + + + + + 8_x64,Server8_x64,Server6_3_x64,6_3_x64 + + + 8_x64,Server8_x64,Server6_3_x64,6_3_x64 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 @@ + + + + Off + + + Off + + + Off + + + Off + + \ 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/checkWin8Tools.bat b/qxldod/checkWin8Tools.bat deleted file mode 100755 index f81b853..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 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 a76f604..37d2b38 100755 --- a/qxldod/qxldod.vcxproj +++ b/qxldod/qxldod.vcxproj @@ -1,43 +1,35 @@ - - + + - - Win8.1 Debug + + Win10Debug_NoSign Win32 - - Win8 Debug - Win32 - - - Win8.1 Release - Win32 - - - Win8 Release - Win32 - - - Win8.1 Debug + + Win10Debug_NoSign x64 - - Win8 Debug + + Win10Debug + Win32 + + + Win10Debug x64 - - Win8.1 Release - x64 + + Win10Release + Win32 - - Win8 Release + + Win10Release x64 {A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD} {dd38f7fc-d7bd-488b-9242-7d8754cde80d} - v4.5 + v4.5.2 11.0 Win8 Debug Win32 @@ -45,55 +37,53 @@ qxldod $(VCTargetsPath11) + $(LatestTargetPlatformVersion) Driver WDM - - WindowsV6.3 - true - WindowsKernelModeDriver8.1 + + + + false + WindowsKernelModeDriver10.0 + 1 + Universal + + + + false + WindowsKernelModeDriver10.0 + 1 + Universal + + + + false + WindowsKernelModeDriver10.0 + 1 + Universal + + + + + false + WindowsKernelModeDriver10.0 1 - - Windows8 - true - WindowsKernelModeDriver8.1 + + + false + WindowsKernelModeDriver10.0 1 - - WindowsV6.3 + + + false - WindowsKernelModeDriver8.1 - 1 - - - Windows8 - false - WindowsKernelModeDriver8.1 - 1 - - - WindowsV6.3 - true - WindowsKernelModeDriver8.1 - - - Windows8 - true - WindowsKernelModeDriver8.1 - - - WindowsV6.3 - false - WindowsKernelModeDriver8.1 - - - Windows8 - false - WindowsKernelModeDriver8.1 + WindowsKernelModeDriver10.0 1 @@ -103,50 +93,40 @@ - - objchk_win8_x86\i386\ - objchk_win8_x86\i386\ - qxldod - - - objchk_win8_x86\i386\ - objchk_win8_x86\i386\ - qxldod - DbgengKernelDebugger - - objfre_win8_x86\i386\ - objfre_win8_x86\i386\ + + $(SolutionDir)\build\$(Platform)\$(ConfigurationName)\ + $(Platform)\$(Configuration)\ qxldod - - objfre_win8_x86\i386\ - objfre_win8_x86\i386\ + + $(SolutionDir)\build\$(Platform)\$(ConfigurationName)\ + $(Platform)\$(Configuration)\ qxldod - - objfre_win8_amd64\amd64\ - objfre_win8_amd64\amd64\ + + $(SolutionDir)\build\$(Platform)\$(ConfigurationName)\ + $(Platform)\$(Configuration)\ qxldod - - objfre_win8_amd64\amd64\ - objfre_win8_amd64\amd64\ + + $(SolutionDir)\build\$(Platform)\$(ConfigurationName)\ + $(Platform)\$(Configuration)\ qxldod - - objchk_win8_amd64\amd64\ - objchk_win8_amd64\amd64\ + + $(SolutionDir)\build\$(Platform)\$(ConfigurationName)\ + $(Platform)\$(Configuration)\ qxldod - - objchk_win8_amd64\amd64\ - objchk_win8_amd64\amd64\ + + $(SolutionDir)\build\$(Platform)\$(ConfigurationName)\ + $(Platform)\$(Configuration)\ qxldod - + %(AdditionalDependencies);$(DDK_LIB_PATH)\displib.lib;$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib @@ -156,19 +136,21 @@ %(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH);.\Include Level3 - - + Disabled + DBG;_X86_=1;i386=1;STD_CALL;%(PreprocessorDefinitions) Inf2Cat /driver:$(OutDir) /os:8_X86,6_3_X86 true - - + + + + - + %(AdditionalDependencies);$(DDK_LIB_PATH)\displib.lib;$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib @@ -178,22 +160,21 @@ %(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH);.\Include Level3 - + Disabled + DBG;_X86_=1;i386=1;STD_CALL;%(PreprocessorDefinitions) Inf2Cat /driver:$(OutDir) /os:8_X86,6_3_X86 - - - - - - true + + + + - + %(AdditionalDependencies);$(DDK_LIB_PATH)\displib.lib;$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib @@ -209,11 +190,13 @@ true - - + + + + - + %(AdditionalDependencies);$(DDK_LIB_PATH)\displib.lib;$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib @@ -223,17 +206,21 @@ %(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH);.\Include Level3 + Disabled + DBG;_WIN64;_AMD64_;AMD64;%(PreprocessorDefinitions) - Inf2Cat /driver:$(OutDir) /os:8_X86,6_3_X86 + Inf2Cat /driver:$(OutDir) /os:8_X64,Server8_X64,Server6_3_X64,6_3_X64 true - - + + + + - + %(AdditionalDependencies);$(DDK_LIB_PATH)\displib.lib;$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib @@ -242,36 +229,22 @@ %(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH);.\Include + Level3 + Disabled + DBG;_WIN64;_AMD64_;AMD64;%(PreprocessorDefinitions) Inf2Cat /driver:$(OutDir) /os:8_X64,Server8_X64,Server6_3_X64,6_3_X64 true - - + + + + - - - %(AdditionalDependencies);$(DDK_LIB_PATH)\displib.lib;$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib - - - %(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH) - - - %(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH);.\Include - - - Inf2Cat /driver:$(OutDir) /os:8_X64,Server8_X64,Server6_3_X64,6_3_X64 - - - true - - - - - + %(AdditionalDependencies);$(DDK_LIB_PATH)\displib.lib;$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib @@ -287,28 +260,10 @@ true - - - - - - - %(AdditionalDependencies);$(DDK_LIB_PATH)\displib.lib;$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib - - - %(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH) - - - %(AdditionalIncludeDirectories);$(DDK_INC_PATH);$(SDK_INC_PATH);.\Include - Level3 - - - Inf2Cat /driver:$(OutDir) /os:8_X64,Server8_X64,Server6_3_X64,6_3_X64 - - - true - - + + + + 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 @@ + + + + Off + + + Off + + + Off + + + Off + + \ No newline at end of file