From 23c718eeb234ea7453599089575f822de1e39811 Mon Sep 17 00:00:00 2001 From: Tsukasa Sugiura Date: Tue, 20 Jun 2017 03:15:25 +0900 Subject: [PATCH] Add OpenNI2 port Add OpenNI2 port --- ports/openni2/CONTROL | 3 + ports/openni2/disable_kinect.patch | 40 + ports/openni2/portfile.cmake | 241 ++++ ports/openni2/upgrade_projects.patch | 1584 ++++++++++++++++++++++++++ 4 files changed, 1868 insertions(+) create mode 100644 ports/openni2/CONTROL create mode 100644 ports/openni2/disable_kinect.patch create mode 100644 ports/openni2/portfile.cmake create mode 100644 ports/openni2/upgrade_projects.patch diff --git a/ports/openni2/CONTROL b/ports/openni2/CONTROL new file mode 100644 index 000000000..5dca7646a --- /dev/null +++ b/ports/openni2/CONTROL @@ -0,0 +1,3 @@ +Source: openni2 +Version: 2.2.0.33 +Description: OpenNI is open source library for access to Natural Interaction (NI) devices such as RGB-D camera. diff --git a/ports/openni2/disable_kinect.patch b/ports/openni2/disable_kinect.patch new file mode 100644 index 000000000..593ca079a --- /dev/null +++ b/ports/openni2/disable_kinect.patch @@ -0,0 +1,40 @@ +diff --git a/OpenNI.sln b/OpenNI.sln +index 9af176a..3786850 100644 +--- a/OpenNI.sln ++++ b/OpenNI.sln +@@ -86,12 +86,6 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Install", "Packaging\Instal + {5B74F010-8B79-46B5-B906-C2B56CDB3386} = {5B74F010-8B79-46B5-B906-C2B56CDB3386} + {D5709FB9-909D-415F-8F86-2F25BEF6CE23} = {D5709FB9-909D-415F-8F86-2F25BEF6CE23} + {1723CBBA-8EE7-439A-93FB-2E94B4DB2E63} = {1723CBBA-8EE7-439A-93FB-2E94B4DB2E63} +- {E636BACA-795F-41CF-BC52-14C727BF014E} = {E636BACA-795F-41CF-BC52-14C727BF014E} +- EndProjectSection +-EndProject +-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Kinect", "Source\Drivers\Kinect\Kinect.vcxproj", "{E636BACA-795F-41CF-BC52-14C727BF014E}" +- ProjectSection(ProjectDependencies) = postProject +- {72D595BB-8C52-449B-91DB-0E9F6AEAF5BB} = {72D595BB-8C52-449B-91DB-0E9F6AEAF5BB} + EndProjectSection + EndProject + Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DepthUtils", "Source\DepthUtils\DepthUtils.vcxproj", "{72D595BB-8C52-449B-91DB-0E9F6AEABBBB}" +@@ -252,14 +246,6 @@ Global + {BAEB9C48-562C-4D56-A6CD-18932265480A}.Debug|x86.ActiveCfg = Debug|x86 + {BAEB9C48-562C-4D56-A6CD-18932265480A}.Release|x64.ActiveCfg = Release|x64 + {BAEB9C48-562C-4D56-A6CD-18932265480A}.Release|x86.ActiveCfg = Release|x86 +- {E636BACA-795F-41CF-BC52-14C727BF014E}.Debug|x64.ActiveCfg = Debug|x64 +- {E636BACA-795F-41CF-BC52-14C727BF014E}.Debug|x64.Build.0 = Debug|x64 +- {E636BACA-795F-41CF-BC52-14C727BF014E}.Debug|x86.ActiveCfg = Debug|Win32 +- {E636BACA-795F-41CF-BC52-14C727BF014E}.Debug|x86.Build.0 = Debug|Win32 +- {E636BACA-795F-41CF-BC52-14C727BF014E}.Release|x64.ActiveCfg = Release|x64 +- {E636BACA-795F-41CF-BC52-14C727BF014E}.Release|x64.Build.0 = Release|x64 +- {E636BACA-795F-41CF-BC52-14C727BF014E}.Release|x86.ActiveCfg = Release|Win32 +- {E636BACA-795F-41CF-BC52-14C727BF014E}.Release|x86.Build.0 = Release|Win32 + {72D595BB-8C52-449B-91DB-0E9F6AEABBBB}.Debug|x64.ActiveCfg = Debug|x64 + {72D595BB-8C52-449B-91DB-0E9F6AEABBBB}.Debug|x64.Build.0 = Debug|x64 + {72D595BB-8C52-449B-91DB-0E9F6AEABBBB}.Debug|x86.ActiveCfg = Debug|Win32 +@@ -317,7 +303,6 @@ Global + {9F6652AF-35F2-452E-A2D3-08D05F5C075E} = {238D091D-1A85-4A61-9DCD-483768C51804} + {31F0F25B-A84A-48AC-9716-5DF9137F3855} = {238D091D-1A85-4A61-9DCD-483768C51804} + {15ECC029-90DE-4D1D-B00A-4A8E647D8C24} = {238D091D-1A85-4A61-9DCD-483768C51804} +- {E636BACA-795F-41CF-BC52-14C727BF014E} = {238D091D-1A85-4A61-9DCD-483768C51804} + {5B74F010-8B79-46B5-B906-C2B56CDB3386} = {238D091D-1A85-4A61-9DCD-483768C51804} + {BDA3BF24-550A-4BF9-83E5-0056134EED40} = {20285393-1DB1-4300-8AD3-30AEAE3C5DA6} + {D39A4248-3985-41DE-AFD5-AEC58D29291F} = {20285393-1DB1-4300-8AD3-30AEAE3C5DA6} diff --git a/ports/openni2/portfile.cmake b/ports/openni2/portfile.cmake new file mode 100644 index 000000000..5d798e195 --- /dev/null +++ b/ports/openni2/portfile.cmake @@ -0,0 +1,241 @@ +# Common Ambient Variables: +# CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT} +# CURRENT_PACKAGES_DIR = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET} +# CURRENT_PORT_DIR = ${VCPKG_ROOT_DIR}\ports\${PORT} +# PORT = current port name (zlib, etc) +# TARGET_TRIPLET = current triplet (x86-windows, x64-windows-static, etc) +# VCPKG_CRT_LINKAGE = C runtime linkage type (static, dynamic) +# VCPKG_LIBRARY_LINKAGE = target library linkage type (static, dynamic) +# VCPKG_ROOT_DIR = +# VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm) +# + +# UWP Not Support +if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") + message(FATAL_ERROR "Error: UWP builds are currently not supported.") +endif() + +# Static Build Not Support +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + message(STATUS "Warning: Static building not supported. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE "dynamic") +endif() + +# Download Source Code +include(vcpkg_common_functions) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/OpenNI2-2.2-beta2) +vcpkg_download_distfile(ARCHIVE + URLS "https://github.com/OpenNI/OpenNI2/archive/2.2-beta2.zip" + FILENAME "OpenNI2-2.2-beta.zip" + SHA512 9779161493114265745c9eb8b15db95a3ed2322cd75504931d0fb7b6214d7abc8a9eb2ea5f35e309bc4d2748f015eee27ada4974a2e9568b5ecb9d98099c84e9 +) +vcpkg_extract_source_archive(${ARCHIVE}) + +# Apply Patches +vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES "${CMAKE_CURRENT_LIST_DIR}/upgrade_projects.patch" +) + +set(KINECTSDK10_INSTALLED FALSE) +if(EXISTS "$ENV{KINECTSDK10_DIR}/inc/NuiApi.h") + set(KINECTSDK10_INSTALLED TRUE) +endif() + +if(NOT ${KINECTSDK10_INSTALLED}) + vcpkg_apply_patches( + SOURCE_PATH ${SOURCE_PATH} + PATCHES "${CMAKE_CURRENT_LIST_DIR}/disable_kinect.patch" + ) +endif() + +# Build OpenNI2 +vcpkg_build_msbuild( + PROJECT_PATH "${SOURCE_PATH}/OpenNI.sln" +) + +# Install OpenNI2 +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(PLATFORM Win32) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(PLATFORM x64) +endif() + +set(SOURCE_INCLUDE_PATH "${SOURCE_PATH}/Include") +set(SOURCE_BIN_PATH_RELEASE "${SOURCE_PATH}/Bin/${PLATFORM}-Release") +set(SOURCE_BIN_PATH_DEBUG "${SOURCE_PATH}/Bin/${PLATFORM}-Debug") +set(SOURCE_CONFIG_PATH "${SOURCE_PATH}/Config") +set(SOURCE_THIRDPARTY_PATH "${SOURCE_PATH}/ThirdParty") + +file( + INSTALL + "${SOURCE_INCLUDE_PATH}/Android-Arm/OniPlatformAndroid-Arm.h" + DESTINATION + ${CURRENT_PACKAGES_DIR}/include/Android-Arm +) + +file( + INSTALL + "${SOURCE_INCLUDE_PATH}/Driver/OniDriverAPI.h" + "${SOURCE_INCLUDE_PATH}/Driver/OniDriverTypes.h" + DESTINATION + ${CURRENT_PACKAGES_DIR}/include/Driver +) + +file( + INSTALL + "${SOURCE_INCLUDE_PATH}/Linux-Arm/OniPlatformLinux-Arm.h" + DESTINATION + ${CURRENT_PACKAGES_DIR}/include/Linux-Arm +) + +file( + INSTALL + "${SOURCE_INCLUDE_PATH}/Linux-x86/OniPlatformLinux-x86.h" + DESTINATION + ${CURRENT_PACKAGES_DIR}/include/Linux-x86 +) + +file( + INSTALL + "${SOURCE_INCLUDE_PATH}/MacOSX/OniPlatformMacOSX.h" + DESTINATION + ${CURRENT_PACKAGES_DIR}/include/MacOSX +) + +file( + INSTALL + "${SOURCE_INCLUDE_PATH}/Win32/OniPlatformWin32.h" + DESTINATION + ${CURRENT_PACKAGES_DIR}/include/Win32 +) + +file( + INSTALL + "${SOURCE_INCLUDE_PATH}/OniCAPI.h" + "${SOURCE_INCLUDE_PATH}/OniCEnums.h" + "${SOURCE_INCLUDE_PATH}/OniCProperties.h" + "${SOURCE_INCLUDE_PATH}/OniCTypes.h" + "${SOURCE_INCLUDE_PATH}/OniEnums.h" + "${SOURCE_INCLUDE_PATH}/OniPlatform.h" + "${SOURCE_INCLUDE_PATH}/OniProperties.h" + "${SOURCE_INCLUDE_PATH}/OniVersion.h" + "${SOURCE_INCLUDE_PATH}/OpenNI.h" + "${SOURCE_INCLUDE_PATH}/PrimeSense.h" + "${SOURCE_INCLUDE_PATH}/PS1080.h" + "${SOURCE_INCLUDE_PATH}/PSLink.h" + DESTINATION + ${CURRENT_PACKAGES_DIR}/include +) + +file( + INSTALL + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2.lib" + DESTINATION + ${CURRENT_PACKAGES_DIR}/lib +) + +file( + INSTALL + "${SOURCE_BIN_PATH_DEBUG}/OpenNI2.lib" + DESTINATION + ${CURRENT_PACKAGES_DIR}/debug/lib +) + +file( + INSTALL + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/OniFile.dll" + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/PS1080.dll" + "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PS1080.ini" + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/PSLink.dll" + "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PSLink.ini" + DESTINATION + ${CURRENT_PACKAGES_DIR}/bin/OpenNI2/Drivers +) + +if(${KINECTSDK10_INSTALLED}) + file( + INSTALL + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/Kinect.dll" + DESTINATION + ${CURRENT_PACKAGES_DIR}/bin/OpenNI2/Drivers + ) +endif() + +file( + INSTALL + "${SOURCE_CONFIG_PATH}/OpenNI.ini" + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2.dll" + DESTINATION + ${CURRENT_PACKAGES_DIR}/bin +) + +file( + INSTALL + "${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/OniFile.dll" + "${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/PS1080.dll" + "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PS1080.ini" + "${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/PSLink.dll" + "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PSLink.ini" + DESTINATION + ${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2/Drivers +) + +if(${KINECTSDK10_INSTALLED}) + file( + INSTALL + "${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/Kinect.dll" + DESTINATION + ${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2/Drivers + ) +endif() + +file( + INSTALL + "${SOURCE_CONFIG_PATH}/OpenNI.ini" + "${SOURCE_BIN_PATH_DEBUG}/OpenNI2.dll" + DESTINATION + ${CURRENT_PACKAGES_DIR}/debug/bin +) + +file( + INSTALL + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/OniFile.dll" + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/PS1080.dll" + "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PS1080.ini" + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/PSLink.dll" + "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PSLink.ini" + DESTINATION + ${CURRENT_PACKAGES_DIR}/tools/openni2/OpenNI2/Drivers +) + +if(${KINECTSDK10_INSTALLED}) + file( + INSTALL + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/Kinect.dll" + DESTINATION + ${CURRENT_PACKAGES_DIR}/tools/openni2/OpenNI2/Drivers + ) +endif() + +if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86") + set(NUMBEROFBIT 32) +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64") + set(NUMBEROFBIT 64) +endif() + +file( + INSTALL + "${SOURCE_THIRDPARTY_PATH}/GL/glut${NUMBEROFBIT}.dll" + "${SOURCE_BIN_PATH_RELEASE}/NiViewer.exe" + "${SOURCE_CONFIG_PATH}/OpenNI.ini" + "${SOURCE_BIN_PATH_RELEASE}/OpenNI2.dll" + "${SOURCE_BIN_PATH_RELEASE}/PS1080Console.exe" + "${SOURCE_BIN_PATH_RELEASE}/PSLinkConsole.exe" + DESTINATION + ${CURRENT_PACKAGES_DIR}/tools/openni2/ +) + +# Handle copyright +file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openni2) +file(RENAME ${CURRENT_PACKAGES_DIR}/share/openni2/LICENSE ${CURRENT_PACKAGES_DIR}/share/openni2/copyright) diff --git a/ports/openni2/upgrade_projects.patch b/ports/openni2/upgrade_projects.patch new file mode 100644 index 000000000..c1d23b72f --- /dev/null +++ b/ports/openni2/upgrade_projects.patch @@ -0,0 +1,1584 @@ +diff --git a/Samples/ClosestPointViewer/ClosestPointViewer.vcxproj b/Samples/ClosestPointViewer/ClosestPointViewer.vcxproj +index fe63dbf..6050e8f 100644 +--- a/Samples/ClosestPointViewer/ClosestPointViewer.vcxproj ++++ b/Samples/ClosestPointViewer/ClosestPointViewer.vcxproj +@@ -1,5 +1,5 @@ + ・ｿ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + Application + true + MultiByte ++ v141 + + + Application + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + +@@ -84,7 +88,7 @@ + _WINDLL;%(PreprocessorDefinitions) + Level4 + true +- true ++ false + + + +@@ -105,7 +109,7 @@ + _WINDLL;%(PreprocessorDefinitions) + Level4 + true +- true ++ false + + + +@@ -133,7 +137,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +@@ -142,6 +146,7 @@ + glut32.lib;OpenNI2.lib;MWClosestPoint.lib + $(OutDir);..\..\ThirdParty\GL + true ++ false + + + ..\..\Include +@@ -161,7 +166,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +diff --git a/Samples/EventBasedRead/EventBasedRead.vcxproj b/Samples/EventBasedRead/EventBasedRead.vcxproj +index f67db7a..ffe19ac 100644 +--- a/Samples/EventBasedRead/EventBasedRead.vcxproj ++++ b/Samples/EventBasedRead/EventBasedRead.vcxproj +@@ -1,5 +1,5 @@ + ・ｿ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + Application + true + MultiByte ++ v141 + + + Application + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + +@@ -83,7 +87,7 @@ + ..\..\Include;..\Common;%(AdditionalIncludeDirectories) + _WINDLL;%(PreprocessorDefinitions) + Level4 +- true ++ false + true + + +@@ -101,7 +105,7 @@ + ..\..\Include;..\Common;%(AdditionalIncludeDirectories) + _WINDLL;%(PreprocessorDefinitions) + Level4 +- true ++ false + true + + +@@ -119,7 +123,7 @@ + MaxSpeed + true + ..\..\Include;..\Common;%(AdditionalIncludeDirectories) +- true ++ false + true + AnySuitable + Speed +@@ -144,7 +148,7 @@ + MaxSpeed + true + ..\..\Include;..\Common;%(AdditionalIncludeDirectories) +- true ++ false + true + AnySuitable + Speed +diff --git a/Samples/MWClosestPoint/MWClosestPoint.vcxproj b/Samples/MWClosestPoint/MWClosestPoint.vcxproj +index 74cafe7..5844506 100644 +--- a/Samples/MWClosestPoint/MWClosestPoint.vcxproj ++++ b/Samples/MWClosestPoint/MWClosestPoint.vcxproj +@@ -1,5 +1,5 @@ + ・ｿ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + DynamicLibrary + true + MultiByte ++ v141 + + + DynamicLibrary + true + MultiByte ++ v141 + + + DynamicLibrary + false + true + MultiByte ++ v141 + + + DynamicLibrary + false + true + MultiByte ++ v141 + + + +@@ -84,7 +88,7 @@ + ..\..\Include + _CLOSEST_POINT;%(PreprocessorDefinitions) + true +- true ++ false + + + +@@ -105,7 +109,7 @@ + ..\..\Include + _CLOSEST_POINT;%(PreprocessorDefinitions) + true +- true ++ false + + + +@@ -134,7 +138,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +@@ -163,7 +167,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +diff --git a/Samples/MWClosestPointApp/MWClosestPointApp.vcxproj b/Samples/MWClosestPointApp/MWClosestPointApp.vcxproj +index 063ec37..deb7c17 100644 +--- a/Samples/MWClosestPointApp/MWClosestPointApp.vcxproj ++++ b/Samples/MWClosestPointApp/MWClosestPointApp.vcxproj +@@ -1,5 +1,5 @@ + ・ｿ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + Application + true + MultiByte ++ v141 + + + Application + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + +@@ -83,7 +87,7 @@ + Disabled + ..\MWClosestPoint;..\..\Include + true +- true ++ false + + + +@@ -103,7 +107,7 @@ + Disabled + ..\MWClosestPoint;..\..\Include + true +- true ++ false + + + +@@ -131,7 +135,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +@@ -159,7 +163,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +diff --git a/Samples/MultiDepthViewer/MultiDepthViewer.vcxproj b/Samples/MultiDepthViewer/MultiDepthViewer.vcxproj +index d021c0d..85a0d4f 100644 +--- a/Samples/MultiDepthViewer/MultiDepthViewer.vcxproj ++++ b/Samples/MultiDepthViewer/MultiDepthViewer.vcxproj +@@ -1,5 +1,5 @@ + ・ｿ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + Application + true + MultiByte ++ v141 + + + Application + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + +@@ -84,7 +88,7 @@ + _WINDLL;%(PreprocessorDefinitions) + Level4 + true +- true ++ false + + + +@@ -102,7 +106,7 @@ + _WINDLL;%(PreprocessorDefinitions) + Level4 + true +- true ++ false + + + +@@ -127,7 +131,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +@@ -136,6 +140,7 @@ + glut32.lib;OpenNI2.lib + $(OutDir);..\..\ThirdParty\GL + true ++ false + + + +@@ -152,7 +157,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +diff --git a/Samples/MultipleStreamRead/MultipleStreamRead.vcxproj b/Samples/MultipleStreamRead/MultipleStreamRead.vcxproj +index 15887ec..5fa8202 100644 +--- a/Samples/MultipleStreamRead/MultipleStreamRead.vcxproj ++++ b/Samples/MultipleStreamRead/MultipleStreamRead.vcxproj +@@ -1,5 +1,5 @@ + ・ｿ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + Application + true + MultiByte ++ v141 + + + Application + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + +@@ -83,7 +87,7 @@ + ..\..\Include;..\Common;%(AdditionalIncludeDirectories) + _WINDLL;%(PreprocessorDefinitions) + Level4 +- true ++ false + true + + +@@ -101,7 +105,7 @@ + ..\..\Include;..\Common;%(AdditionalIncludeDirectories) + _WINDLL;%(PreprocessorDefinitions) + Level4 +- true ++ false + true + + +@@ -119,7 +123,7 @@ + MaxSpeed + true + ..\..\Include;..\Common;%(AdditionalIncludeDirectories) +- true ++ false + true + AnySuitable + Speed +@@ -144,7 +148,7 @@ + MaxSpeed + true + ..\..\Include;..\Common;%(AdditionalIncludeDirectories) +- true ++ false + true + AnySuitable + Speed +diff --git a/Samples/SimpleRead/SimpleRead.vcxproj b/Samples/SimpleRead/SimpleRead.vcxproj +index de3942f..6ce41e3 100644 +--- a/Samples/SimpleRead/SimpleRead.vcxproj ++++ b/Samples/SimpleRead/SimpleRead.vcxproj +@@ -1,5 +1,5 @@ + ・ｿ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + Application + true + MultiByte ++ v141 + + + Application + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + +@@ -83,7 +87,7 @@ + ..\Common;..\..\Include;%(AdditionalIncludeDirectories) + _WINDLL;%(PreprocessorDefinitions) + Level4 +- true ++ false + true + + +@@ -101,7 +105,7 @@ + ..\Common;..\..\Include;%(AdditionalIncludeDirectories) + _WINDLL;%(PreprocessorDefinitions) + Level4 +- true ++ false + true + + +@@ -119,7 +123,7 @@ + MaxSpeed + true + ..\Common;..\..\Include;%(AdditionalIncludeDirectories) +- true ++ false + true + AnySuitable + Speed +@@ -144,7 +148,7 @@ + MaxSpeed + true + ..\Common;..\..\Include;%(AdditionalIncludeDirectories) +- true ++ false + true + AnySuitable + Speed +diff --git a/Samples/SimpleViewer/SimpleViewer.vcxproj b/Samples/SimpleViewer/SimpleViewer.vcxproj +index d693a1d..40621e1 100644 +--- a/Samples/SimpleViewer/SimpleViewer.vcxproj ++++ b/Samples/SimpleViewer/SimpleViewer.vcxproj +@@ -1,5 +1,5 @@ + ・ｿ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + Application + true + MultiByte ++ v141 + + + Application + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + +@@ -84,7 +88,7 @@ + _WINDLL;%(PreprocessorDefinitions) + Level4 + true +- true ++ false + + + +@@ -102,7 +106,7 @@ + _WINDLL;%(PreprocessorDefinitions) + Level4 + true +- true ++ false + + + +@@ -127,7 +131,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +@@ -136,6 +140,7 @@ + glut32.lib;OpenNI2.lib + $(OutDir);..\..\ThirdParty\GL + true ++ false + + + +@@ -152,7 +157,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +diff --git a/Source/Core/OpenNI.vcxproj b/Source/Core/OpenNI.vcxproj +index 12189de..f176682 100644 +--- a/Source/Core/OpenNI.vcxproj ++++ b/Source/Core/OpenNI.vcxproj +@@ -1,5 +1,5 @@ + ・ｿ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + DynamicLibrary + true + MultiByte ++ v141 + + + DynamicLibrary + true + MultiByte ++ v141 + + + DynamicLibrary + false + true + MultiByte ++ v141 + + + DynamicLibrary + false + true + MultiByte ++ v141 + + + +@@ -88,7 +92,7 @@ + _WINDLL;%(PreprocessorDefinitions);OPENNI2_EXPORT + ProgramDatabase + Level4 +- true ++ false + true + + +@@ -110,7 +114,7 @@ + _WINDLL;%(PreprocessorDefinitions);OPENNI2_EXPORT + ProgramDatabase + Level4 +- true ++ false + true + + +@@ -132,7 +136,7 @@ + true + _MBCS;%(PreprocessorDefinitions);OPENNI2_EXPORT + ..\..\Include;..\Drivers\OniFile\Formats;..\..\ThirdParty\PSCommon\XnLib\Include;..\..\ThirdParty\LibJPEG;%(AdditionalIncludeDirectories) +- true ++ false + true + AnySuitable + Speed +@@ -161,7 +165,7 @@ + true + _MBCS;%(PreprocessorDefinitions);OPENNI2_EXPORT + ..\..\Include;..\Drivers\OniFile\Formats;..\..\ThirdParty\PSCommon\XnLib\Include;..\..\ThirdParty\LibJPEG;%(AdditionalIncludeDirectories) +- true ++ false + true + AnySuitable + Speed +diff --git a/Source/DepthUtils/DepthUtils.vcxproj b/Source/DepthUtils/DepthUtils.vcxproj +index dcab0b7..e474661 100644 +--- a/Source/DepthUtils/DepthUtils.vcxproj ++++ b/Source/DepthUtils/DepthUtils.vcxproj +@@ -1,5 +1,5 @@ + ・ｿ +- ++ + + + Debug +@@ -35,23 +35,27 @@ + StaticLibrary + true + MultiByte ++ v141 + + + StaticLibrary + true + MultiByte ++ v141 + + + StaticLibrary + false + true + MultiByte ++ v141 + + + StaticLibrary + false + true + MultiByte ++ v141 + + + +@@ -94,7 +98,7 @@ + Disabled + _WINDLL;%(PreprocessorDefinitions);DepthUtils_EXPORT + Level4 +- true ++ false + true + + +@@ -114,7 +118,7 @@ + Disabled + _WINDLL;%(PreprocessorDefinitions);DepthUtils_EXPORT + Level4 +- true ++ false + true + + +@@ -134,7 +138,7 @@ + MaxSpeed + true + _MBCS;%(PreprocessorDefinitions);DepthUtils_EXPORT +- true ++ false + true + true + AnySuitable +@@ -160,7 +164,7 @@ + MaxSpeed + true + _MBCS;%(PreprocessorDefinitions);DepthUtils_EXPORT +- true ++ false + true + AnySuitable + Speed +diff --git a/Source/Drivers/DummyDevice/DummyDevice.vcxproj b/Source/Drivers/DummyDevice/DummyDevice.vcxproj +index 56c5944..0401f3d 100644 +--- a/Source/Drivers/DummyDevice/DummyDevice.vcxproj ++++ b/Source/Drivers/DummyDevice/DummyDevice.vcxproj +@@ -1,5 +1,5 @@ + ・ｿ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + DynamicLibrary + true + MultiByte ++ v141 + + + DynamicLibrary + true + MultiByte ++ v141 + + + DynamicLibrary + false + true + MultiByte ++ v141 + + + DynamicLibrary + false + true + MultiByte ++ v141 + + + +@@ -84,7 +88,7 @@ + _WINDLL;%(PreprocessorDefinitions);DummyDevice2_EXPORT + ProgramDatabase + Level4 +- true ++ false + true + + +@@ -104,7 +108,7 @@ + _WINDLL;%(PreprocessorDefinitions);DummyDevice2_EXPORT + ProgramDatabase + Level4 +- true ++ false + true + + +@@ -124,7 +128,7 @@ + true + _MBCS;%(PreprocessorDefinitions);DummyDevice2_EXPORT + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include +- true ++ false + true + AnySuitable + Speed +@@ -153,7 +157,7 @@ + true + _MBCS;%(PreprocessorDefinitions);DummyDevice2_EXPORT + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include +- true ++ false + true + AnySuitable + Speed +diff --git a/Source/Drivers/Kinect/Kinect.vcxproj b/Source/Drivers/Kinect/Kinect.vcxproj +index f54e8b2..7f54d04 100644 +--- a/Source/Drivers/Kinect/Kinect.vcxproj ++++ b/Source/Drivers/Kinect/Kinect.vcxproj +@@ -1,5 +1,5 @@ + ・ｿ +- ++ + + + Debug +@@ -28,12 +28,14 @@ + true + Unicode + true ++ v141 + + + DynamicLibrary + true + Unicode + true ++ v141 + + + DynamicLibrary +@@ -41,6 +43,7 @@ + true + MultiByte + true ++ v141 + + + DynamicLibrary +@@ -48,6 +51,7 @@ + true + MultiByte + true ++ v141 + + + +@@ -99,7 +103,7 @@ + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc; + _WINDLL;%(PreprocessorDefinitions);_WINDOWS + false +- true ++ false + + + true +@@ -115,7 +119,7 @@ + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc; + _WINDLL;%(PreprocessorDefinitions);_WINDOWS + false +- true ++ false + + + true +@@ -135,7 +139,7 @@ + true + true + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc; +- true ++ false + + + true +@@ -153,7 +157,7 @@ + true + true + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc; +- true ++ false + + + true +diff --git a/Source/Drivers/OniFile/OniFile.vcxproj b/Source/Drivers/OniFile/OniFile.vcxproj +index 9b173f7..e2f4391 100644 +--- a/Source/Drivers/OniFile/OniFile.vcxproj ++++ b/Source/Drivers/OniFile/OniFile.vcxproj +@@ -1,5 +1,5 @@ + ・ｿ +- ++ + + + Debug +@@ -28,23 +28,27 @@ + DynamicLibrary + true + MultiByte ++ v141 + + + DynamicLibrary + true + MultiByte ++ v141 + + + DynamicLibrary + false + true + MultiByte ++ v141 + + + DynamicLibrary + false + true + MultiByte ++ v141 + + + +@@ -98,7 +102,7 @@ + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;ONIFILESPLAYER_EXPORTS;%(PreprocessorDefinitions) + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG +- true ++ false + true + + +@@ -133,7 +137,7 @@ + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;ONIFILESPLAYER_EXPORTS;%(PreprocessorDefinitions) + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG +- true ++ false + true + + +@@ -169,7 +173,7 @@ + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;ONIFILESPLAYER_EXPORTS;%(PreprocessorDefinitions) + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG +- true ++ false + true + AnySuitable + Speed +@@ -212,7 +216,7 @@ + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;ONIFILESPLAYER_EXPORTS;%(PreprocessorDefinitions) + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG +- true ++ false + true + AnySuitable + Speed +diff --git a/Source/Drivers/PS1080/PS1080.vcxproj b/Source/Drivers/PS1080/PS1080.vcxproj +index 2a1154d..8495c28 100644 +--- a/Source/Drivers/PS1080/PS1080.vcxproj ++++ b/Source/Drivers/PS1080/PS1080.vcxproj +@@ -1,5 +1,5 @@ + ・ｿ +- ++ + + + Debug +@@ -525,23 +525,27 @@ + DynamicLibrary + true + Unicode ++ v141 + + + DynamicLibrary + true + Unicode ++ v141 + + + DynamicLibrary + false + true + Unicode ++ v141 + + + DynamicLibrary + false + true + Unicode ++ v141 + + + +@@ -587,7 +591,7 @@ + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;PS1080_EXPORTS;%(PreprocessorDefinitions) + .\Include;.\;..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG;..\..\DepthUtils +- true ++ false + StreamingSIMDExtensions2 + true + +@@ -612,7 +616,7 @@ + Disabled + WIN32;_DEBUG;_WINDOWS;_USRDLL;PS1080_EXPORTS;%(PreprocessorDefinitions) + .\Include;.\;..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG;..\..\DepthUtils +- true ++ false + StreamingSIMDExtensions2 + true + +@@ -638,7 +642,7 @@ + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;PS1080_EXPORTS;%(PreprocessorDefinitions) + .\Include;.\;..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG;..\..\DepthUtils +- true ++ false + StreamingSIMDExtensions2 + true + AnySuitable +@@ -670,7 +674,7 @@ + true + WIN32;NDEBUG;_WINDOWS;_USRDLL;PS1080_EXPORTS;%(PreprocessorDefinitions) + .\Include;.\;..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;..\..\..\ThirdParty\LibJPEG;..\..\DepthUtils +- true ++ false + StreamingSIMDExtensions2 + true + AnySuitable +diff --git a/Source/Drivers/PS1080/PS1080Console/PS1080Console.vcxproj b/Source/Drivers/PS1080/PS1080Console/PS1080Console.vcxproj +index b9adfea..7446d5a 100644 +--- a/Source/Drivers/PS1080/PS1080Console/PS1080Console.vcxproj ++++ b/Source/Drivers/PS1080/PS1080Console/PS1080Console.vcxproj +@@ -1,5 +1,5 @@ + ・ｿ +- ++ + + + Debug +@@ -28,19 +28,23 @@ + Application + MultiByte + true ++ v141 + + + Application + MultiByte ++ v141 + + + Application + MultiByte + true ++ v141 + + + Application + MultiByte ++ v141 + + + +@@ -87,7 +91,7 @@ + EditAndContinue + 4250;4127;%(DisableSpecificWarnings) + true +- true ++ false + + + XnLib.lib;OpenNI2.lib;%(AdditionalDependencies) +@@ -95,7 +99,7 @@ + true + Console + MachineX86 +- true ++ false + + + +@@ -114,7 +118,7 @@ + Level4 + ProgramDatabase + 4250;4127;%(DisableSpecificWarnings) +- true ++ false + + + XnLib.lib;OpenNI2.lib;%(AdditionalDependencies) +@@ -139,7 +143,7 @@ + Level4 + ProgramDatabase + 4250;4127;%(DisableSpecificWarnings) +- true ++ false + + + XnLib.lib;OpenNI2.lib;%(AdditionalDependencies) +@@ -169,7 +173,7 @@ + Level4 + ProgramDatabase + 4250;4127;%(DisableSpecificWarnings) +- true ++ false + + + XnLib.lib;OpenNI2.lib;%(AdditionalDependencies) +diff --git a/Source/Drivers/PSLink/PSLink.vcxproj b/Source/Drivers/PSLink/PSLink.vcxproj +index 8915163..68a7e96 100644 +--- a/Source/Drivers/PSLink/PSLink.vcxproj ++++ b/Source/Drivers/PSLink/PSLink.vcxproj +@@ -1,5 +1,5 @@ + ・ｿ +- ++ + + + Debug +@@ -28,19 +28,23 @@ + DynamicLibrary + Unicode + true ++ v141 + + + DynamicLibrary + Unicode ++ v141 + + + DynamicLibrary + Unicode + true ++ v141 + + + DynamicLibrary + Unicode ++ v141 + + + +@@ -87,7 +91,7 @@ + EditAndContinue + 4250;4127;%(DisableSpecificWarnings) + true +- true ++ false + + + XnLib.lib;%(AdditionalDependencies) +@@ -95,7 +99,7 @@ + true + Windows + MachineX86 +- true ++ false + + + +@@ -115,7 +119,7 @@ + Level4 + ProgramDatabase + 4250;4127;%(DisableSpecificWarnings) +- true ++ false + + + XnLib.lib;%(AdditionalDependencies) +@@ -140,7 +144,7 @@ + Level4 + ProgramDatabase + 4250;4127;%(DisableSpecificWarnings) +- true ++ false + + + XnLib.lib;%(AdditionalDependencies) +@@ -170,7 +174,7 @@ + Level4 + ProgramDatabase + 4250;4127;%(DisableSpecificWarnings) +- true ++ false + + + XnLib.lib;%(AdditionalDependencies) +diff --git a/Source/Drivers/PSLink/PSLinkConsole/PSLinkConsole.vcxproj b/Source/Drivers/PSLink/PSLinkConsole/PSLinkConsole.vcxproj +index e6c7c8c..26ff9c8 100644 +--- a/Source/Drivers/PSLink/PSLinkConsole/PSLinkConsole.vcxproj ++++ b/Source/Drivers/PSLink/PSLinkConsole/PSLinkConsole.vcxproj +@@ -1,5 +1,5 @@ + ・ｿ +- ++ + + + Debug +@@ -28,19 +28,23 @@ + Application + MultiByte + true ++ v141 + + + Application + MultiByte ++ v141 + + + Application + MultiByte + true ++ v141 + + + Application + MultiByte ++ v141 + + + +@@ -87,7 +91,7 @@ + EditAndContinue + 4250;4127;%(DisableSpecificWarnings) + true +- true ++ false + + + OpenNI2.lib;XnLib.lib;%(AdditionalDependencies) +@@ -95,7 +99,7 @@ + true + Console + MachineX86 +- true ++ false + + + +@@ -114,7 +118,7 @@ + Level4 + ProgramDatabase + 4250;4127;%(DisableSpecificWarnings) +- true ++ false + + + OpenNI2.lib;XnLib.lib;%(AdditionalDependencies) +@@ -139,7 +143,7 @@ + Level4 + ProgramDatabase + 4250;4127;%(DisableSpecificWarnings) +- true ++ false + + + OpenNI2.lib;XnLib.lib;%(AdditionalDependencies) +@@ -169,7 +173,7 @@ + Level4 + ProgramDatabase + 4250;4127;%(DisableSpecificWarnings) +- true ++ false + + + OpenNI2.lib;XnLib.lib;%(AdditionalDependencies) +diff --git a/Source/Drivers/TestDevice/TestDevice.vcxproj b/Source/Drivers/TestDevice/TestDevice.vcxproj +index e20a074..3777b2e 100644 +--- a/Source/Drivers/TestDevice/TestDevice.vcxproj ++++ b/Source/Drivers/TestDevice/TestDevice.vcxproj +@@ -1,5 +1,5 @@ + ・ｿ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + DynamicLibrary + true + MultiByte ++ v141 + + + DynamicLibrary + true + MultiByte ++ v141 + + + DynamicLibrary + false + true + MultiByte ++ v141 + + + DynamicLibrary + false + true + MultiByte ++ v141 + + + +@@ -84,7 +88,7 @@ + _WINDLL;%(PreprocessorDefinitions);TestDevice2_EXPORT + ProgramDatabase + Level4 +- true ++ false + true + + +@@ -101,7 +105,7 @@ + _WINDLL;%(PreprocessorDefinitions);TestDevice2_EXPORT + ProgramDatabase + Level4 +- true ++ false + true + + +@@ -118,7 +122,7 @@ + true + _MBCS;%(PreprocessorDefinitions);TestDevice2_EXPORT + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include +- true ++ false + true + AnySuitable + Speed +@@ -144,7 +148,7 @@ + true + _MBCS;%(PreprocessorDefinitions);TestDevice2_EXPORT + ..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include +- true ++ false + true + AnySuitable + Speed +diff --git a/Source/Tools/NiViewer/NiViewer.vcxproj b/Source/Tools/NiViewer/NiViewer.vcxproj +index 0a4c392..e331009 100644 +--- a/Source/Tools/NiViewer/NiViewer.vcxproj ++++ b/Source/Tools/NiViewer/NiViewer.vcxproj +@@ -1,5 +1,5 @@ + ・ｿ +- ++ + + + Debug +@@ -27,23 +27,27 @@ + Application + true + MultiByte ++ v141 + + + Application + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + Application + false + true + MultiByte ++ v141 + + + +@@ -84,7 +88,7 @@ + _WINDLL;%(PreprocessorDefinitions) + Level4 + true +- true ++ false + + + +@@ -105,7 +109,7 @@ + _WINDLL;%(PreprocessorDefinitions) + Level4 + true +- true ++ false + + + +@@ -133,7 +137,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +@@ -142,6 +146,7 @@ + Comdlg32.lib;OpenNI2.lib;XnLib.lib;glut32.lib + $(OutDir);..\..\..\ThirdParty\GL + true ++ false + + + ..\..\..\Include +@@ -161,7 +166,7 @@ + false + StreamingSIMDExtensions2 + Fast +- true ++ false + + + true +diff --git a/ThirdParty/PSCommon/XnLib/Source/XnLib.vcxproj b/ThirdParty/PSCommon/XnLib/Source/XnLib.vcxproj +index 2761222..f2094b3 100644 +--- a/ThirdParty/PSCommon/XnLib/Source/XnLib.vcxproj ++++ b/ThirdParty/PSCommon/XnLib/Source/XnLib.vcxproj +@@ -1,5 +1,5 @@ + ・ｿ +- ++ + + + Debug +@@ -116,23 +116,27 @@ + StaticLibrary + true + MultiByte ++ v141 + + + StaticLibrary + true + MultiByte ++ v141 + + + StaticLibrary + false + true + MultiByte ++ v141 + + + StaticLibrary + false + true + MultiByte ++ v141 + + + +@@ -176,7 +180,7 @@ + ..\Include;..\Driver\Win32\Build\sys;%(AdditionalIncludeDirectories) + _WINDLL;%(PreprocessorDefinitions);XnLib_EXPORT + Level4 +- true ++ false + true + + +@@ -198,7 +202,7 @@ + ..\Include;..\Driver\Win32\Build\sys;%(AdditionalIncludeDirectories) + _WINDLL;%(PreprocessorDefinitions);XnLib_EXPORT + Level4 +- true ++ false + true + + +@@ -220,7 +224,7 @@ + true + _MBCS;%(PreprocessorDefinitions);XnLib_EXPORT + ..\Include;..\Driver\Win32\Build\sys;%(AdditionalIncludeDirectories) +- true ++ false + true + true + AnySuitable +@@ -248,7 +252,7 @@ + true + _MBCS;%(PreprocessorDefinitions);XnLib_EXPORT + ..\Include;..\Driver\Win32\Build\sys;%(AdditionalIncludeDirectories) +- true ++ false + true + AnySuitable + Speed +diff --git a/Wrappers/java/OpenNI.jni/OpenNI.jni.vcxproj b/Wrappers/java/OpenNI.jni/OpenNI.jni.vcxproj +index b95c484..bfd0503 100644 +--- a/Wrappers/java/OpenNI.jni/OpenNI.jni.vcxproj ++++ b/Wrappers/java/OpenNI.jni/OpenNI.jni.vcxproj +@@ -1,5 +1,5 @@ + ・ｿ +- ++ + + + Debug +@@ -28,18 +28,22 @@ + true + Unicode + true ++ v141 + + + DynamicLibrary + false + true + Unicode ++ v141 + + + DynamicLibrary ++ v141 + + + DynamicLibrary ++ v141 + + +