From cef975cc9317aba211f7cce4af44fd79d30a4d59 Mon Sep 17 00:00:00 2001
From: vinjn <vinjn.z@gmail.com>
Date: Wed, 7 Sep 2016 21:29:42 +0800
Subject: [PATCH 1/2] Fix build errors for {x86 | amd64} x {debug | release}.
 Use $(JAVA_HOME) environment variable to locate jdk folder smartly.

---
 .../KinectLib_V2.0/KinectLib_V2.0.vcxproj          | 14 +++++++++++---
 .../KinectPV2_vc2012/KinectLib_V2.0/KinectPV2.cpp  |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Build_libs/KinectPV2_vc2012/KinectLib_V2.0/KinectLib_V2.0.vcxproj b/Build_libs/KinectPV2_vc2012/KinectLib_V2.0/KinectLib_V2.0.vcxproj
index 75aa0ca..cb0e767 100644
--- a/Build_libs/KinectPV2_vc2012/KinectLib_V2.0/KinectLib_V2.0.vcxproj
+++ b/Build_libs/KinectPV2_vc2012/KinectLib_V2.0/KinectLib_V2.0.vcxproj
@@ -47,7 +47,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -69,7 +69,6 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <OutDir>C:\Users\thomas\Documents\Programacion\Java\Workspace\PKinectV2\lib</OutDir>
     <IncludePath>$(KINECTSDK20_DIR)\inc;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -92,10 +91,13 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;KINECTLIB_V20_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(KINECTSDK20_DIR)\inc;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>kinect20.lib;Kinect20.Face.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(KINECTSDK20_DIR)\Lib\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -105,10 +107,13 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;KINECTLIB_V20_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(KINECTSDK20_DIR)\inc;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>kinect20.lib;Kinect20.Face.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(KINECTSDK20_DIR)\Lib\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -120,12 +125,15 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;KINECTLIB_V20_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
+      <AdditionalIncludeDirectories>$(KINECTSDK20_DIR)\inc;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>kinect20.lib;Kinect20.Face.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(KINECTSDK20_DIR)\Lib\$(PlatformTarget);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -137,7 +145,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;KINECTLIB_V20_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(KINECTSDK20_DIR)\inc;C:\Program Files\Java\jdk1.8.0_45\include;C:\Program Files\Java\jdk1.8.0_45\include\win32;Kinect20.lib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(KINECTSDK20_DIR)\inc;$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff --git a/Build_libs/KinectPV2_vc2012/KinectLib_V2.0/KinectPV2.cpp b/Build_libs/KinectPV2_vc2012/KinectLib_V2.0/KinectPV2.cpp
index 6db3a40..a325961 100644
--- a/Build_libs/KinectPV2_vc2012/KinectLib_V2.0/KinectPV2.cpp
+++ b/Build_libs/KinectPV2_vc2012/KinectLib_V2.0/KinectPV2.cpp
@@ -621,7 +621,7 @@ namespace KinectPV2{
 
 	bool Device::update()
 	{
-
+        return true;
 	}
 
 	void Device::colorProcess()

From cff9d4077547a6e3fb0ef2430124263cfab629fa Mon Sep 17 00:00:00 2001
From: vinjn <vinjn.z@gmail.com>
Date: Wed, 7 Sep 2016 21:37:28 +0800
Subject: [PATCH 2/2] Use correct win32 / x64 build folders.

---
 .../KinectLib_V2.0/KinectLib_V2.0.vcxproj                | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Build_libs/KinectPV2_vc2012/KinectLib_V2.0/KinectLib_V2.0.vcxproj b/Build_libs/KinectPV2_vc2012/KinectLib_V2.0/KinectLib_V2.0.vcxproj
index cb0e767..752f802 100644
--- a/Build_libs/KinectPV2_vc2012/KinectLib_V2.0/KinectLib_V2.0.vcxproj
+++ b/Build_libs/KinectPV2_vc2012/KinectLib_V2.0/KinectLib_V2.0.vcxproj
@@ -70,19 +70,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
     <IncludePath>$(KINECTSDK20_DIR)\inc;$(IncludePath)</IncludePath>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <IncludePath>$(KINECTSDK20_DIR)\inc;$(IncludePath)</IncludePath>
     <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
+    <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
     <IncludePath>$(KINECTSDK20_DIR)\inc;$(IncludePath)</IncludePath>
     <LibraryPath>$(KINECTSDK20_DIR)\Lib\x64;$(LibraryPath)</LibraryPath>
-    <OutDir>..\..\KinectPV2_Eclipse\lib</OutDir>
+    <OutDir>..\..\KinectPV2_Eclipse\lib\</OutDir>
+    <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>