From 274eb1268758a5ece1cca0bb44a9016adefa721c Mon Sep 17 00:00:00 2001
From: "Joshua M. Doe" <oss@nvl.army.mil>
Date: Tue, 31 Jul 2012 03:02:24 -0400
Subject: [PATCH] build: fix vs2010 files, and use WinDDK prop sheet

which should help with VC runtime issues.
---
 sys/CMakeLists.txt                     | 2 +-
 vs2010/niimaq/niimaq.vcxproj           | 2 ++
 vs2010/phoenix/phoenix.vcxproj         | 6 ++++--
 vs2010/videoadjust/videoadjust.vcxproj | 4 +++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/sys/CMakeLists.txt b/sys/CMakeLists.txt
index e8fa42d..89cb69a 100644
--- a/sys/CMakeLists.txt
+++ b/sys/CMakeLists.txt
@@ -12,4 +12,4 @@ endif (IOTECHDAQX_FOUND)
 
 if (PHOENIX_FOUND)
 	add_subdirectory(phoenix)
-endif (PHOENIX_FOUND)
\ No newline at end of file
+endif (PHOENIX_FOUND)
diff --git a/vs2010/niimaq/niimaq.vcxproj b/vs2010/niimaq/niimaq.vcxproj
index ce1e0f4..74cf4dc 100644
--- a/vs2010/niimaq/niimaq.vcxproj
+++ b/vs2010/niimaq/niimaq.vcxproj
@@ -34,12 +34,14 @@
     <Import Project="$(GSTREAMER_SDK_ROOT_X86)\share\vs\2010\libs\gstreamer-video-0.10.props" />
     <Import Project="$(GSTREAMER_SDK_ROOT_X86)\share\vs\2010\libs\gstreamer-interfaces-0.10.props" />
     <Import Project="niimaq.props" />
+    <Import Project="$(GSTREAMER_SDK_ROOT_X86)\share\vs\2010\msvc\x86.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(GSTREAMER_SDK_ROOT_X86)\share\vs\2010\libs\gstreamer-video-0.10.props" />
     <Import Project="$(GSTREAMER_SDK_ROOT_X86)\share\vs\2010\libs\gstreamer-interfaces-0.10.props" />
     <Import Project="niimaq.props" />
+    <Import Project="$(GSTREAMER_SDK_ROOT_X86)\share\vs\2010\msvc\x86.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
diff --git a/vs2010/phoenix/phoenix.vcxproj b/vs2010/phoenix/phoenix.vcxproj
index e371bbc..b0277ad 100644
--- a/vs2010/phoenix/phoenix.vcxproj
+++ b/vs2010/phoenix/phoenix.vcxproj
@@ -32,13 +32,15 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(GSTREAMER_SDK_ROOT_X86)\share\vs\2010\libs\gstreamer-base-0.10.props" />
-	<Import Project="$(GSTREAMER_SDK_ROOT_X86)\share\vs\2010\libs\gstreamer-video-0.10.props" />
+    <Import Project="$(GSTREAMER_SDK_ROOT_X86)\share\vs\2010\libs\gstreamer-video-0.10.props" />
+    <Import Project="$(GSTREAMER_SDK_ROOT_X86)\share\vs\2010\msvc\x86.props" />
     <Import Project="phoenix.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(GSTREAMER_SDK_ROOT_X86)\share\vs\2010\libs\gstreamer-base-0.10.props" />
-	<Import Project="$(GSTREAMER_SDK_ROOT_X86)\share\vs\2010\libs\gstreamer-video-0.10.props" />
+    <Import Project="$(GSTREAMER_SDK_ROOT_X86)\share\vs\2010\libs\gstreamer-video-0.10.props" />
+    <Import Project="$(GSTREAMER_SDK_ROOT_X86)\share\vs\2010\msvc\x86.props" />
     <Import Project="phoenix.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
diff --git a/vs2010/videoadjust/videoadjust.vcxproj b/vs2010/videoadjust/videoadjust.vcxproj
index bb63d07..78f40e7 100644
--- a/vs2010/videoadjust/videoadjust.vcxproj
+++ b/vs2010/videoadjust/videoadjust.vcxproj
@@ -32,10 +32,12 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(GSTREAMER_SDK_ROOT_X86)\share\vs\2010\libs\gstreamer-video-0.10.props" />
+    <Import Project="$(GSTREAMER_SDK_ROOT_X86)\share\vs\2010\msvc\x86.props" />
   </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
     <Import Project="$(GSTREAMER_SDK_ROOT_X86)\share\vs\2010\libs\gstreamer-video-0.10.props" />
+    <Import Project="$(GSTREAMER_SDK_ROOT_X86)\share\vs\2010\msvc\x86.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup />
@@ -75,4 +77,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>