[Spice-devel] [PATCH] libwdi driver installer: use specific static libs

[Arnon Gilboa]

-add Advapi32.lib ole32.lib, set RTL to MT instead of MD
-otherwise it requires to install MS VC++ 2008 SP1 redist
-solves libwdi error WDI_ERROR_NEEDS_ADMIN (-15)
"Unable to run process with required administrative privileges"

rhbz#857119
---
 libwdi/.msvc/installer_x64_2008.vcproj |   10 ++++++----
 libwdi/.msvc/installer_x86_2008.vcproj |   10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/libwdi/.msvc/installer_x64_2008.vcproj b/libwdi/.msvc/installer_x64_2008.vcproj
index 11d606b..366a47f 100644
--- a/libwdi/.msvc/installer_x64_2008.vcproj
+++ b/libwdi/.msvc/installer_x64_2008.vcproj
@@ -21,6 +21,7 @@
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\helper"
 			IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\helper\installer_x64"
 			ConfigurationType="1"
+			UseOfMFC="0"
 			CharacterSet="1"
 			>
 			<Tool
@@ -44,7 +45,7 @@
 				Optimization="0"
 				AdditionalIncludeDirectories="..\msvc"
 				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS; _WIN64"
-				RuntimeLibrary="3"
+				RuntimeLibrary="1"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -59,7 +60,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="newdev.lib setupapi.lib"
+				AdditionalDependencies="newdev.lib setupapi.lib Advapi32.lib ole32.lib"
 				OutputFile="$(OutDir)\installer_x64.exe"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -92,6 +93,7 @@
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\helper"
 			IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\helper\installer_x64"
 			ConfigurationType="1"
+			UseOfMFC="0"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
@@ -116,7 +118,7 @@
 				Optimization="1"
 				AdditionalIncludeDirectories="..\..\msvc"
 				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS; _WIN64"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				WarningLevel="3"
 			/>
 			<Tool
@@ -130,7 +132,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="newdev.lib setupapi.lib"
+				AdditionalDependencies="newdev.lib setupapi.lib Advapi32.lib ole32.lib"
 				OutputFile="$(OutDir)\installer_x64.exe"
 				GenerateDebugInformation="false"
 				SubSystem="1"
diff --git a/libwdi/.msvc/installer_x86_2008.vcproj b/libwdi/.msvc/installer_x86_2008.vcproj
index eb58428..d0d00ea 100644
--- a/libwdi/.msvc/installer_x86_2008.vcproj
+++ b/libwdi/.msvc/installer_x86_2008.vcproj
@@ -21,6 +21,7 @@
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\helper"
 			IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\helper\installer_x86"
 			ConfigurationType="1"
+			UseOfMFC="0"
 			CharacterSet="1"
 			>
 			<Tool
@@ -44,7 +45,7 @@
 				AdditionalIncludeDirectories="..\..\msvc"
 				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
 				MinimalRebuild="true"
-				RuntimeLibrary="3"
+				RuntimeLibrary="1"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 			/>
@@ -59,7 +60,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="newdev.lib setupapi.lib"
+				AdditionalDependencies="newdev.lib setupapi.lib Advapi32.lib ole32.lib"
 				OutputFile="$(OutDir)\installer_x86.exe"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -92,6 +93,7 @@
 			OutputDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\helper"
 			IntermediateDirectory="$(SolutionDir)$(PlatformName)\$(ConfigurationName)\helper\installer_x86"
 			ConfigurationType="1"
+			UseOfMFC="0"
 			CharacterSet="1"
 			WholeProgramOptimization="1"
 			>
@@ -115,7 +117,7 @@
 				Optimization="1"
 				AdditionalIncludeDirectories="..\..\msvc"
 				PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS"
-				RuntimeLibrary="2"
+				RuntimeLibrary="0"
 				WarningLevel="3"
 			/>
 			<Tool
@@ -129,7 +131,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="newdev.lib setupapi.lib"
+				AdditionalDependencies="newdev.lib setupapi.lib Advapi32.lib ole32.lib"
 				OutputFile="$(OutDir)\installer_x86.exe"
 				GenerateDebugInformation="false"
 				SubSystem="1"
-- 
1.7.4.1