diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2017-09-28 14:07:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 14:07:26 -0700 |
| commit | f37e66b34d0a65a615117944334aca25f49e3d8e (patch) | |
| tree | 76fd5a335e4596d62242ba4f3a328f9b6e0f65d0 /ports/openni2/replace_environment_variable.patch.in | |
| parent | f1dd027dc8358022c2481c204d985d914d5f348b (diff) | |
| parent | 1b7b8146891d6a0664cddc41c6b46e43052d0977 (diff) | |
| download | vcpkg-f37e66b34d0a65a615117944334aca25f49e3d8e.tar.gz vcpkg-f37e66b34d0a65a615117944334aca25f49e3d8e.zip | |
Merge pull request #1341 from UnaNancyOwen/fix_openni2
Add Kinect driver to OpenNI2 port
Diffstat (limited to 'ports/openni2/replace_environment_variable.patch.in')
| -rw-r--r-- | ports/openni2/replace_environment_variable.patch.in | 76 |
1 files changed, 76 insertions, 0 deletions
diff --git a/ports/openni2/replace_environment_variable.patch.in b/ports/openni2/replace_environment_variable.patch.in new file mode 100644 index 000000000..25abe7edf --- /dev/null +++ b/ports/openni2/replace_environment_variable.patch.in @@ -0,0 +1,76 @@ +diff --git a/Source/Drivers/Kinect/Kinect.vcxproj b/Source/Drivers/Kinect/Kinect.vcxproj +index 08a49fe..7fd8620 100644 +--- a/Source/Drivers/Kinect/Kinect.vcxproj ++++ b/Source/Drivers/Kinect/Kinect.vcxproj +@@ -101,7 +101,7 @@ + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> +- <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories> ++ <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@KINECTSDK10_DIR@\inc;</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);_WINDOWS</PreprocessorDefinitions> + <DisableLanguageExtensions>false</DisableLanguageExtensions> + <TreatWarningAsError>false</TreatWarningAsError> +@@ -109,7 +109,7 @@ + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>Kinect10.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies> +- <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\x86;</AdditionalLibraryDirectories> ++ <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;@KINECTSDK10_DIR@\lib\x86;</AdditionalLibraryDirectories> + <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors> + </Link> + </ItemDefinitionGroup> +@@ -117,7 +117,7 @@ + <ClCompile> + <WarningLevel>Level3</WarningLevel> + <Optimization>Disabled</Optimization> +- <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories> ++ <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@KINECTSDK10_DIR@\inc;</AdditionalIncludeDirectories> + <PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);_WINDOWS</PreprocessorDefinitions> + <DisableLanguageExtensions>false</DisableLanguageExtensions> + <TreatWarningAsError>false</TreatWarningAsError> +@@ -125,7 +125,7 @@ + <Link> + <GenerateDebugInformation>true</GenerateDebugInformation> + <AdditionalDependencies>Kinect10.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies> +- <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\amd64;</AdditionalLibraryDirectories> ++ <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;@KINECTSDK10_DIR@\lib\amd64;</AdditionalLibraryDirectories> + <IgnoreSpecificDefaultLibraries> + </IgnoreSpecificDefaultLibraries> + <IgnoreAllDefaultLibraries> +@@ -139,7 +139,7 @@ + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> +- <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories> ++ <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@KINECTSDK10_DIR@\inc;</AdditionalIncludeDirectories> + <TreatWarningAsError>false</TreatWarningAsError> + </ClCompile> + <Link> +@@ -147,7 +147,7 @@ + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <AdditionalDependencies>Kinect10.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies> +- <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\x86;</AdditionalLibraryDirectories> ++ <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;@KINECTSDK10_DIR@\lib\x86;</AdditionalLibraryDirectories> + <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors> + </Link> + </ItemDefinitionGroup> +@@ -157,7 +157,7 @@ + <Optimization>MaxSpeed</Optimization> + <FunctionLevelLinking>true</FunctionLevelLinking> + <IntrinsicFunctions>true</IntrinsicFunctions> +- <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories> ++ <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@KINECTSDK10_DIR@\inc;</AdditionalIncludeDirectories> + <TreatWarningAsError>false</TreatWarningAsError> + </ClCompile> + <Link> +@@ -165,7 +165,7 @@ + <EnableCOMDATFolding>true</EnableCOMDATFolding> + <OptimizeReferences>true</OptimizeReferences> + <AdditionalDependencies>Kinect10.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies> +- <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\amd64;</AdditionalLibraryDirectories> ++ <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;@KINECTSDK10_DIR@\lib\amd64;</AdditionalLibraryDirectories> + <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors> + </Link> + </ItemDefinitionGroup> |