From 400f7ad7c5c75e98966c53b5d6b21c97360c5c63 Mon Sep 17 00:00:00 2001 From: Vadim Rozenfeld Date: Mon, 18 Aug 2014 23:14:54 +1000 Subject: [PATCH] update build to VS2012 --- qxldod Package/qxldod Package.vcxproj | 72 ++++++++------- qxldod.sln | 30 ++++++- qxldod/buildAll.bat | 4 +- qxldod/checkWin8Tools.bat | 10 +-- qxldod/qxldod.vcxproj | 122 +++++++++++++++++++++++++- 5 files changed, 198 insertions(+), 40 deletions(-) diff --git a/qxldod Package/qxldod Package.vcxproj b/qxldod Package/qxldod Package.vcxproj index d783186..f71e4c6 100755 --- a/qxldod Package/qxldod Package.vcxproj +++ b/qxldod Package/qxldod Package.vcxproj @@ -1,10 +1,18 @@  + + Win8.1 Debug + Win32 + Win8 Debug Win32 + + Win8.1 Release + Win32 + Win8 Release Win32 @@ -17,18 +25,18 @@ Win7 Release Win32 - - Vista Debug - Win32 - - - Vista Release - Win32 + + Win8.1 Debug + x64 Win8 Debug x64 + + Win8.1 Release + x64 + Win8 Release x64 @@ -41,14 +49,6 @@ Win7 Release x64 - - Vista Debug - x64 - - - Vista Release - x64 - {B8C04B51-4207-491D-A7DD-C54861E8B528} @@ -63,59 +63,70 @@ $(VCTargetsPath11) - WindowsKernelModeDriver8.0 Utility Package true + + WindowsV6.3 + true + WindowsKernelModeDriver8.1 + Windows8 true + WindowsKernelModeDriver8.1 + + + WindowsV6.3 + false + WindowsKernelModeDriver8.1 Windows8 false + WindowsKernelModeDriver8.1 Windows7 true + WindowsKernelModeDriver8.1 Windows7 false + WindowsKernelModeDriver8.1 - - Vista + + WindowsV6.3 true - - - Vista - false + WindowsKernelModeDriver8.1 Windows8 true + WindowsKernelModeDriver8.1 + + + WindowsV6.3 + false + WindowsKernelModeDriver8.1 Windows8 false + WindowsKernelModeDriver8.1 Windows7 true + WindowsKernelModeDriver8.1 Windows7 false - - - Vista - true - - - Vista - false + WindowsKernelModeDriver8.1 @@ -137,7 +148,6 @@ True 133563 - $(OutDir)qxldod Package diff --git a/qxldod.sln b/qxldod.sln index 2b74fb7..494614b 100755 --- a/qxldod.sln +++ b/qxldod.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qxldod", "qxldod\qxldod.vcxproj", "{A6F48FC7-97E9-48EC-BCDF-1E4F9B43AADD}" @@ -10,12 +10,40 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "qxldod Package", "qxldod Pa EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + 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 Win8 Debug|Win32 = Win8 Debug|Win32 Win8 Debug|x64 = Win8 Debug|x64 Win8 Release|Win32 = Win8 Release|Win32 Win8 Release|x64 = Win8 Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {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.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}.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 diff --git a/qxldod/buildAll.bat b/qxldod/buildAll.bat index eed3b82..072a2b4 100755 --- a/qxldod/buildAll.bat +++ b/qxldod/buildAll.bat @@ -5,7 +5,7 @@ call clean.bat rem WIN8_64 setlocal if exist Install\win8\amd64 rmdir Install\win8\amd64 /s /q -call callVisualStudio.bat 11 qxldod.vcxproj /Rebuild "Win8 Release|x64" /Out buildfre_win8_amd64.log +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 @@ -18,7 +18,7 @@ if %ERRORLEVEL% NEQ 0 goto :eof rem WIN8_32 setlocal if exist Install\win8\x86 rmdir Install\win8\x86 /s /q -call callVisualStudio.bat 11 qxldod.vcxproj /Rebuild "Win8 Release|Win32" /Out buildfre_win8_x86.log +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 diff --git a/qxldod/checkWin8Tools.bat b/qxldod/checkWin8Tools.bat index c95d30b..992142c 100755 --- a/qxldod/checkWin8Tools.bat +++ b/qxldod/checkWin8Tools.bat @@ -1,16 +1,16 @@ @echo off reg query "HKLM\Software\Microsoft\Windows Kits\WDK" /v WDKProductVersion >nul 2>nul -if %ERRORLEVEL% EQU 0 goto checkVS11 +if %ERRORLEVEL% EQU 0 goto checkVS12 reg query "HKLM\Software\Wow6432Node\Microsoft\Windows Kits\WDK" /v WDKProductVersion > nul 2>nul -if %ERRORLEVEL% EQU 0 goto checkVS11 +if %ERRORLEVEL% EQU 0 goto checkVS12 echo ERROR building Win8 drivers: Win8 WDK is not installed exit /b 1 -:checkVS11 -reg query HKLM\Software\Microsoft\VisualStudio\11.0 /v InstallDir > nul 2>nul +:checkVS12 +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\11.0 /v InstallDir > nul 2>nul +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: VS11 is not installed exit /b 2 \ No newline at end of file diff --git a/qxldod/qxldod.vcxproj b/qxldod/qxldod.vcxproj index ba73247..510d748 100755 --- a/qxldod/qxldod.vcxproj +++ b/qxldod/qxldod.vcxproj @@ -1,18 +1,34 @@  + + Win8.1 Debug + Win32 + Win8 Debug Win32 + + Win8.1 Release + Win32 + Win8 Release Win32 + + Win8.1 Debug + x64 + Win8 Debug x64 + + Win8.1 Release + x64 + Win8 Release x64 @@ -31,26 +47,49 @@ $(VCTargetsPath11) - WindowsKernelModeDriver8.0 Driver WDM + + WindowsV6.3 + true + WindowsKernelModeDriver8.1 + Windows8 true + WindowsKernelModeDriver8.1 + + + WindowsV6.3 + false + WindowsKernelModeDriver8.1 Windows8 false + WindowsKernelModeDriver8.1 + + + WindowsV6.3 + true + WindowsKernelModeDriver8.1 Windows8 true + WindowsKernelModeDriver8.1 + + + WindowsV6.3 + false + WindowsKernelModeDriver8.1 Windows8 false + WindowsKernelModeDriver8.1 @@ -59,6 +98,11 @@ + + objchk_win8_x86\i386\ + objchk_win8_x86\i386\ + qxldod + objchk_win8_x86\i386\ objchk_win8_x86\i386\ @@ -67,21 +111,53 @@ DbgengKernelDebugger + + objfre_win8_x86\i386\ + objfre_win8_x86\i386\ + qxldod + objfre_win8_x86\i386\ objfre_win8_x86\i386\ qxldod + + objfre_win8_amd64\amd64\ + objfre_win8_amd64\amd64\ + qxldod + objfre_win8_amd64\amd64\ objfre_win8_amd64\amd64\ qxldod + + objchk_win8_amd64\amd64\ + objchk_win8_amd64\amd64\ + qxldod + objchk_win8_amd64\amd64\ objchk_win8_amd64\amd64\ qxldod + + + %(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_X86 + + %(AdditionalDependencies);$(DDK_LIB_PATH)\displib.lib;$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib @@ -98,6 +174,21 @@ Inf2Cat /driver:$(OutDir) /os:8_X86 + + + %(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_X86 + + %(AdditionalDependencies);$(DDK_LIB_PATH)\displib.lib;$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib @@ -113,6 +204,20 @@ Inf2Cat /driver:$(OutDir) /os:8_X86 + + + %(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 + + %(AdditionalDependencies);$(DDK_LIB_PATH)\displib.lib;$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib @@ -127,6 +232,21 @@ Inf2Cat /driver:$(OutDir) /os:8_X64 + + + %(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 + + %(AdditionalDependencies);$(DDK_LIB_PATH)\displib.lib;$(DDK_LIB_PATH)\ntoskrnl.lib;$(DDK_LIB_PATH)\hal.lib