From ad1149ff12014186c4a302da1754f637adac92d9 Mon Sep 17 00:00:00 2001 From: Maxim Kostin Date: Mon, 2 Mar 2015 22:26:13 +0300 Subject: [PATCH] Enabled property sheets for WinRT related samples --- .../ImageManipulations/MediaCapture.vcxproj | 31 +++---- .../MediaCapture.vcxproj.filters | 2 - .../OcvTransform/OcvTransform.vcxproj | 44 +++++----- .../MediaExtensions/OcvTransform/opencv.props | 31 +++++++ samples/winrt/ImageManipulations/opencv.props | 31 +++++++ .../OcvImageProcessing.vcxproj | 81 +++---------------- .../OcvImageProcessing.vcxproj.filters | 5 -- .../OcvImageProcessing/opencv.props | 40 +++++++++ .../PhoneTutorial/PhoneTutorial.vcxproj | 35 +++++--- .../PhoneTutorial.vcxproj.filters | 4 - .../PhoneTutorial/opencv.props | 6 +- .../PhoneXamlDirect3DApp1Comp.vcxproj | 63 ++------------- .../PhoneXamlDirect3DApp1Comp/opencv.props | 41 ++++++++++ .../PhoneXamlDirect3DApp1Comp.vcxproj | 72 ++++------------- .../PhoneXamlDirect3DApp1Comp/opencv.props | 40 +++++++++ .../OpenCVComponent/OpenCVComponent.vcxproj | 29 +++---- .../OpenCVComponent.vcxproj.filters | 4 - .../OpenCVXaml/OpenCVComponent/opencv.props | 34 ++++++++ 18 files changed, 324 insertions(+), 269 deletions(-) create mode 100644 samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/opencv.props create mode 100644 samples/winrt/ImageManipulations/opencv.props create mode 100644 samples/winrt/OcvImageProcessing/OcvImageProcessing/opencv.props create mode 100644 samples/wp8/OcvImageManipulation/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/opencv.props create mode 100644 samples/wp8/OcvRotatingCube/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/opencv.props create mode 100644 samples/wp8/OpenCVXaml/OpenCVComponent/opencv.props diff --git a/samples/winrt/ImageManipulations/MediaCapture.vcxproj b/samples/winrt/ImageManipulations/MediaCapture.vcxproj index 3430a487f..ae243ce7d 100644 --- a/samples/winrt/ImageManipulations/MediaCapture.vcxproj +++ b/samples/winrt/ImageManipulations/MediaCapture.vcxproj @@ -75,21 +75,27 @@ + + + + + + True @@ -103,13 +109,17 @@ pch.h - ..\..\..\..\include;..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - ..\..\..\..\include;..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - ..\..\..\modules\imgproc\include;..\..\..\modules\features2d\include;..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - ..\..\..\..\include;..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - ..\..\..\..\include;..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - ..\..\..\..\include;..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + $(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + + %(AdditionalLibraryDirectories) + %(AdditionalDependencies) + @@ -184,15 +194,6 @@ {ba69218f-da5c-4d14-a78d-21a9e4dec669} - - - true - - - true - - - diff --git a/samples/winrt/ImageManipulations/MediaCapture.vcxproj.filters b/samples/winrt/ImageManipulations/MediaCapture.vcxproj.filters index db0f73761..fd0770052 100644 --- a/samples/winrt/ImageManipulations/MediaCapture.vcxproj.filters +++ b/samples/winrt/ImageManipulations/MediaCapture.vcxproj.filters @@ -52,7 +52,5 @@ - - \ No newline at end of file diff --git a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.vcxproj b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.vcxproj index c8f767e39..f335daf58 100644 --- a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.vcxproj +++ b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/OcvTransform.vcxproj @@ -76,28 +76,34 @@ + + + + + + false $(Configuration)\$(MSBuildProjectName)\ - $(ProjectDir)..\..\..\..\..\bin\WS\8.1\x86\lib\Debug;$(ProjectDir)..\..\..\..\..\bin\WS\8.1\x86\3rdparty\lib\Debug;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86) + $(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86) false @@ -125,14 +131,14 @@ $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) false - ..\..\..\..\..\modules\core\include;..\..\..\..\..\modules\imgproc\include;..\..\..\..\..\modules\features2d\include;..\..\..\..\..\modules\flann\include;$(ProjectDir)\..\Common;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) Console - opencv_core300d.lib;opencv_imgproc300d.lib;zlibd.lib;runtimeobject.lib;%(AdditionalDependencies);mf.lib;mfuuid.lib;mfplat.lib + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) false OcvTransform.def - $(OPENCV_DIR)\lib;%(AdditionalLibraryDirectories) mdmerge -metadata_dir "$(WindowsSDK_MetadataPath)" -o "$(ProjectDir)$(Configuration)\$(MSBuildProjectName)" -i "$(MSBuildProjectDirectory)" -v -partial @@ -149,14 +155,14 @@ $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) false - ..\..\..\..\..\include;..\..\..\..\..\modules\core\include;..\..\..\..\..\modules\imgproc\include;..\..\..\..\..\modules\features2d\include;..\..\..\..\..\modules\flann\include;$(ProjectDir)\..\Common;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) Console - runtimeobject.lib;%(AdditionalDependencies);mf.lib;mfuuid.lib;mfplat.lib + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) false OcvTransform.def - $(OPENCV_DIR)\lib;%(AdditionalLibraryDirectories) mdmerge -metadata_dir "$(WindowsSDK_MetadataPath)" -o "$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)" -i "$(MSBuildProjectDirectory)" -v -partial @@ -173,14 +179,14 @@ $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) false - ..\..\..\..\..\include;..\..\..\..\..\modules\core\include;..\..\..\..\..\modules\imgproc\include;..\..\..\..\..\modules\features2d\include;..\..\..\..\..\modules\flann\include;$(ProjectDir)\..\Common;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) Console - runtimeobject.lib;%(AdditionalDependencies);mf.lib;mfuuid.lib;mfplat.lib + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) false OcvTransform.def - $(OPENCV_DIR)\lib;%(AdditionalLibraryDirectories) mdmerge -metadata_dir "$(WindowsSDK_MetadataPath)" -o "$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)" -i "$(MSBuildProjectDirectory)" -v -partial @@ -197,14 +203,14 @@ $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) false - ..\..\..\..\..\include;..\..\..\..\..\modules\core\include;..\..\..\..\..\modules\imgproc\include;..\..\..\..\..\modules\features2d\include;..\..\..\..\..\modules\flann\include;$(ProjectDir)\..\Common;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) Console - runtimeobject.lib;%(AdditionalDependencies);mf.lib;mfuuid.lib;mfplat.lib + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) false OcvTransform.def - $(OPENCV_DIR)\lib;%(AdditionalLibraryDirectories) mdmerge -metadata_dir "$(WindowsSDK_MetadataPath)" -o "$(ProjectDir)$(Configuration)\$(MSBuildProjectName)" -i "$(MSBuildProjectDirectory)" -v -partial @@ -221,14 +227,14 @@ $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) false - ..\..\..\..\..\include;..\..\..\..\..\modules\core\include;..\..\..\..\..\modules\imgproc\include;..\..\..\..\..\modules\features2d\include;..\..\..\..\..\modules\flann\include;$(ProjectDir)\..\Common;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) Console - runtimeobject.lib;%(AdditionalDependencies);mf.lib;mfuuid.lib;mfplat.lib + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) false OcvTransform.def - $(OPENCV_DIR)\lib;%(AdditionalLibraryDirectories) mdmerge -metadata_dir "$(WindowsSDK_MetadataPath)" -o "$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)" -i "$(MSBuildProjectDirectory)" -v -partial @@ -245,14 +251,14 @@ $(WindowsSDK_WindowsMetadata);$(AdditionalUsingDirectories) false - ..\..\..\..\..\include;..\..\..\..\..\modules\core\include;..\..\..\..\..\modules\imgproc\include;..\..\..\..\..\modules\features2d\include;..\..\..\..\..\modules\flann\include;$(ProjectDir)\..\Common;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) Console - runtimeobject.lib;%(AdditionalDependencies);mf.lib;mfuuid.lib;mfplat.lib + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) false OcvTransform.def - $(OPENCV_DIR)\lib;%(AdditionalLibraryDirectories) mdmerge -metadata_dir "$(WindowsSDK_MetadataPath)" -o "$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)" -i "$(MSBuildProjectDirectory)" -v -partial diff --git a/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/opencv.props b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/opencv.props new file mode 100644 index 000000000..63acf9e60 --- /dev/null +++ b/samples/winrt/ImageManipulations/MediaExtensions/OcvTransform/opencv.props @@ -0,0 +1,31 @@ + + + + + $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\bin\ + $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\lib\ + $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\include\ + + d + + + + + + true + + + true + + + + + $(OpenCV_Include);$(ProjectDir)\..\Common;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + + + + opencv_core300$(DebugSuffix).lib;opencv_imgproc300$(DebugSuffix).lib;runtimeobject.lib;mf.lib;mfuuid.lib;mfplat.lib;%(AdditionalDependencies) + $(OpenCV_Lib);%(AdditionalLibraryDirectories); + + + \ No newline at end of file diff --git a/samples/winrt/ImageManipulations/opencv.props b/samples/winrt/ImageManipulations/opencv.props new file mode 100644 index 000000000..5ad46b43d --- /dev/null +++ b/samples/winrt/ImageManipulations/opencv.props @@ -0,0 +1,31 @@ + + + + + $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\bin\ + $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\lib\ + $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\include\ + + d + + + + + + true + + + true + + + + + $(OpenCV_Include);$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories); + + + + opencv_core300$(DebugSuffix).lib;opencv_imgproc300$(DebugSuffix).lib;%(AdditionalDependencies) + $(OpenCV_Lib);%(AdditionalLibraryDirectories); + + + \ No newline at end of file diff --git a/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing.vcxproj b/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing.vcxproj index ec7e826ae..888dfca05 100644 --- a/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing.vcxproj +++ b/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing.vcxproj @@ -74,21 +74,27 @@ + + + + + + @@ -96,68 +102,14 @@ False x86 - - $(ProjectDir)..\..\..\..\bin\WS\8.1\x86\lib\Debug;$(ProjectDir)..\..\..\..\bin\WS\8.1\x86\3rdparty\lib\Debug;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86) - - + /bigobj %(AdditionalOptions) 4453 - ..\..\..\..\include;..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - - - %(AdditionalDependencies) - - - - - /bigobj %(AdditionalOptions) - 4453 - ..\..\..\..\include;..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - - - %(AdditionalDependencies) - - - - - /bigobj %(AdditionalOptions) - 4453 - ..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - - - $(OPENCV_DIR)\lib;%(AdditionalLibraryDirectories) - opencv_core300d.lib;opencv_imgproc300d.lib;opencv_features2d300d.lib;opencv_flann300d.lib;opencv_ml300d.lib;zlibd.lib;%(AdditionalDependencies) - - - - - /bigobj %(AdditionalOptions) - 4453 - ..\..\..\..\include;..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - - - $(OPENCV_DIR)\lib;%(AdditionalLibraryDirectories) - %(AdditionalDependencies) - - - - - /bigobj %(AdditionalOptions) - 4453 - ..\..\..\..\include;..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - - - %(AdditionalDependencies) - - - - - /bigobj %(AdditionalOptions) - 4453 - ..\..\..\..\include;..\..\..\..\modules\core\include;..\..\..\..\modules\imgproc\include;..\..\..\..\modules\features2d\include;..\..\..\..\modules\flann\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + %(AdditionalLibraryDirectories) %(AdditionalDependencies) @@ -185,21 +137,6 @@ Designer - - true - - - true - - - true - - - true - - - true - diff --git a/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing.vcxproj.filters b/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing.vcxproj.filters index 48876df95..154682233 100644 --- a/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing.vcxproj.filters +++ b/samples/winrt/OcvImageProcessing/OcvImageProcessing/OcvImageProcessing.vcxproj.filters @@ -41,11 +41,6 @@ - - - - - diff --git a/samples/winrt/OcvImageProcessing/OcvImageProcessing/opencv.props b/samples/winrt/OcvImageProcessing/OcvImageProcessing/opencv.props new file mode 100644 index 000000000..40eaffd1f --- /dev/null +++ b/samples/winrt/OcvImageProcessing/OcvImageProcessing/opencv.props @@ -0,0 +1,40 @@ + + + + + $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\bin\ + $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\lib\ + $(OPENCV_WINRT_INSTALL_DIR)WS\8.1\$(PlatformTarget)\include\ + + d + + + + + + true + + + true + + + true + + + true + + + true + + + + + $(OpenCV_Include);$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories); + + + + opencv_core300$(DebugSuffix).lib;opencv_imgproc300$(DebugSuffix).lib;opencv_features2d300$(DebugSuffix).lib;opencv_flann300$(DebugSuffix).lib;opencv_ml300$(DebugSuffix).lib;%(AdditionalDependencies) + $(OpenCV_Lib);%(AdditionalLibraryDirectories); + + + \ No newline at end of file diff --git a/samples/winrt_universal/PhoneTutorial/PhoneTutorial.vcxproj b/samples/winrt_universal/PhoneTutorial/PhoneTutorial.vcxproj index cecf93fbf..a546b8c47 100644 --- a/samples/winrt_universal/PhoneTutorial/PhoneTutorial.vcxproj +++ b/samples/winrt_universal/PhoneTutorial/PhoneTutorial.vcxproj @@ -55,15 +55,19 @@ + + + + @@ -73,32 +77,45 @@ /bigobj %(AdditionalOptions) 4453;28204 - $(ProjectDir)..\..\..\binWP8_1;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + + %(AdditionalLibraryDirectories) + %(AdditionalDependencies) + /bigobj %(AdditionalOptions) 4453;28204 - $(ProjectDir)..\..\..\binWP8_1;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + + %(AdditionalLibraryDirectories) + %(AdditionalDependencies) + /bigobj %(AdditionalOptions) 4453;28204 - $(ProjectDir)..\..\..\modules\core\include;$(ProjectDir)..\..\..\modules\imgproc\include;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) - opencv_core300d.lib;opencv_imgproc300d.lib;zlibd.lib;WindowsPhoneCore.lib;RuntimeObject.lib;PhoneAppModelHost.lib;%(AdditionalDependencies) + %(AdditionalDependencies) + %(AdditionalLibraryDirectories) /bigobj %(AdditionalOptions) 4453;28204 - $(ProjectDir)..\..\..\binWP8_1;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) + + %(AdditionalLibraryDirectories) + %(AdditionalDependencies) + @@ -145,14 +162,6 @@ Create - - - true - - - true - - diff --git a/samples/winrt_universal/PhoneTutorial/PhoneTutorial.vcxproj.filters b/samples/winrt_universal/PhoneTutorial/PhoneTutorial.vcxproj.filters index 0ec5fc147..4a21284a7 100644 --- a/samples/winrt_universal/PhoneTutorial/PhoneTutorial.vcxproj.filters +++ b/samples/winrt_universal/PhoneTutorial/PhoneTutorial.vcxproj.filters @@ -48,8 +48,4 @@ Assets - - - - \ No newline at end of file diff --git a/samples/winrt_universal/PhoneTutorial/opencv.props b/samples/winrt_universal/PhoneTutorial/opencv.props index 2d99ce35d..3c7cac069 100644 --- a/samples/winrt_universal/PhoneTutorial/opencv.props +++ b/samples/winrt_universal/PhoneTutorial/opencv.props @@ -2,9 +2,9 @@ - $(OPENCV_DIR)WP\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\bin\ - $(OPENCV_DIR)WP\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\lib\ - $(OPENCV_DIR)WP\8.1\$(PlatformTarget)\include\ + $(OPENCV_WINRT_INSTALL_DIR)WP\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\bin\ + $(OPENCV_WINRT_INSTALL_DIR)WP\8.1\$(PlatformTarget)\$(PlatformTarget)\vc12\lib\ + $(OPENCV_WINRT_INSTALL_DIR)WP\8.1\$(PlatformTarget)\include\ d diff --git a/samples/wp8/OcvImageManipulation/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/PhoneXamlDirect3DApp1Comp.vcxproj b/samples/wp8/OcvImageManipulation/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/PhoneXamlDirect3DApp1Comp.vcxproj index 5babe235e..7d6bbfdd9 100644 --- a/samples/wp8/OcvImageManipulation/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/PhoneXamlDirect3DApp1Comp.vcxproj +++ b/samples/wp8/OcvImageManipulation/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/PhoneXamlDirect3DApp1Comp.vcxproj @@ -60,78 +60,40 @@ + false - - $(ProjectDir)..\..\..\..\..\bin\WP\8.0\x86\lib\Debug;$(ProjectDir)..\..\..\..\..\bin\WP\8.0\x86\3rdparty\lib\Debug;$(WP80ToolSetPath)lib;$(WindowsSDK_LibraryPath_x86) - - + _WINRT_DLL;%(PreprocessorDefinitions) Use pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) true - $(ProjectDir)..\..\..\..\..\modules\core\include;$(ProjectDir)..\..\..\..\..\modules\imgproc\include;$(ProjectDir)..\..\..\..\..\modules\flann\include;$(ProjectDir)..\..\..\..\..\modules\features2d\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) Console false - opencv_core300d.lib;opencv_imgproc300d.lib;opencv_features2d300d.lib;opencv_flann300d.lib;opencv_ml300d.lib;zlibd.lib;d3d11.lib;%(AdditionalDependencies) ole32.lib;%(IgnoreSpecificDefaultLibraries) true - + _WINRT_DLL;NDEBUG;%(PreprocessorDefinitions) Use pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) true - ..\..\..\..\..\binWP8;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories) Console false - d3d11.lib;%(AdditionalDependencies) - ole32.lib;%(IgnoreSpecificDefaultLibraries) - true - - - - - _WINRT_DLL;%(PreprocessorDefinitions) - Use - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - true - ..\..\..\..\..\binWP8;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - - - Console - false - d3d11.lib;%(AdditionalDependencies) - ole32.lib;%(IgnoreSpecificDefaultLibraries) - true - - - - - _WINRT_DLL;NDEBUG;%(PreprocessorDefinitions) - Use - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - true - ..\..\..\..\..\binWP8;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - - - Console - false - d3d11.lib;%(AdditionalDependencies) ole32.lib;%(IgnoreSpecificDefaultLibraries) true @@ -171,21 +133,6 @@ - - true - - - true - - - true - - - true - - - true - diff --git a/samples/wp8/OcvImageManipulation/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/opencv.props b/samples/wp8/OcvImageManipulation/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/opencv.props new file mode 100644 index 000000000..360cf6d79 --- /dev/null +++ b/samples/wp8/OcvImageManipulation/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/opencv.props @@ -0,0 +1,41 @@ + + + + + $(OPENCV_WINRT_INSTALL_DIR)WP\8.0\$(PlatformTarget)\$(PlatformTarget)\vc11\bin\ + $(OPENCV_WINRT_INSTALL_DIR)WP\8.0\$(PlatformTarget)\$(PlatformTarget)\vc11\lib\ + $(OPENCV_WINRT_INSTALL_DIR)WP\8.0\$(PlatformTarget)\include\ + + d + + + + + + + true + + + true + + + true + + + true + + + true + + + + + $(OpenCV_Include);$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + + + + opencv_core300$(DebugSuffix).lib;opencv_imgproc300$(DebugSuffix).lib;opencv_features2d300$(DebugSuffix).lib;opencv_flann300$(DebugSuffix).lib;opencv_ml300$(DebugSuffix).lib;d3d11.lib;%(AdditionalDependencies) + $(OpenCV_Lib);%(AdditionalLibraryDirectories); + + + \ No newline at end of file diff --git a/samples/wp8/OcvRotatingCube/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/PhoneXamlDirect3DApp1Comp.vcxproj b/samples/wp8/OcvRotatingCube/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/PhoneXamlDirect3DApp1Comp.vcxproj index 1dc73303b..b15c016fe 100644 --- a/samples/wp8/OcvRotatingCube/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/PhoneXamlDirect3DApp1Comp.vcxproj +++ b/samples/wp8/OcvRotatingCube/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/PhoneXamlDirect3DApp1Comp.vcxproj @@ -61,77 +61,48 @@ + + + + + + + + + + + + false - - $(ProjectDir)..\..\..\..\..\bin\WP\8.0\x86\lib\Debug;$(ProjectDir)..\..\..\..\..\bin\WP\8.0\x86\3rdparty\lib\Debug;$(WP80ToolSetPath)lib;$(WindowsSDK_LibraryPath_x86) - - + _WINRT_DLL;%(PreprocessorDefinitions) Use pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) true - $(ProjectDir)..\..\..\..\..\modules\features2d\include;$(ProjectDir)..\..\..\..\..\modules\flann\include;$(ProjectDir)..\..\..\..\..\modules\imgproc\include;$(ProjectDir)..\..\..\..\..\modules\core\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Console false - opencv_core300d.lib;opencv_imgproc300d.lib;opencv_features2d300d.lib;opencv_flann300d.lib;opencv_ml300d.lib;zlibd.lib;d3d11.lib;%(AdditionalDependencies) ole32.lib;%(IgnoreSpecificDefaultLibraries) true - + _WINRT_DLL;NDEBUG;%(PreprocessorDefinitions) Use pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) true - ..\..\..\..\..\binWP8;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) Console false - d3d11.lib;%(AdditionalDependencies) - ole32.lib;%(IgnoreSpecificDefaultLibraries) - true - - - - - _WINRT_DLL;%(PreprocessorDefinitions) - Use - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - true - ..\..\..\..\..\binWP8;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - - - Console - false - d3d11.lib;%(AdditionalDependencies) - ole32.lib;%(IgnoreSpecificDefaultLibraries) - true - - - - - _WINRT_DLL;NDEBUG;%(PreprocessorDefinitions) - Use - pch.h - $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) - true - ..\..\..\..\..\binWP8;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) - - - Console - false - d3d11.lib;%(AdditionalDependencies) ole32.lib;%(IgnoreSpecificDefaultLibraries) true @@ -171,21 +142,6 @@ - - true - - - true - - - true - - - true - - - true - diff --git a/samples/wp8/OcvRotatingCube/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/opencv.props b/samples/wp8/OcvRotatingCube/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/opencv.props new file mode 100644 index 000000000..21604366f --- /dev/null +++ b/samples/wp8/OcvRotatingCube/PhoneXamlDirect3DApp1/PhoneXamlDirect3DApp1Comp/opencv.props @@ -0,0 +1,40 @@ + + + + + $(OPENCV_WINRT_INSTALL_DIR)WP\8.0\$(PlatformTarget)\$(PlatformTarget)\vc11\bin\ + $(OPENCV_WINRT_INSTALL_DIR)WP\8.0\$(PlatformTarget)\$(PlatformTarget)\vc11\lib\ + $(OPENCV_WINRT_INSTALL_DIR)WP\8.0\$(PlatformTarget)\include\ + + d + + + + + + true + + + true + + + true + + + true + + + true + + + + + $(OpenCV_Include);$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories) + + + + opencv_core300$(DebugSuffix).lib;opencv_imgproc300$(DebugSuffix).lib;opencv_features2d300$(DebugSuffix).lib;opencv_flann300$(DebugSuffix).lib;opencv_ml300$(DebugSuffix).lib;d3d11.lib;%(AdditionalDependencies) + $(OpenCV_Lib);%(AdditionalLibraryDirectories); + + + \ No newline at end of file diff --git a/samples/wp8/OpenCVXaml/OpenCVComponent/OpenCVComponent.vcxproj b/samples/wp8/OpenCVXaml/OpenCVComponent/OpenCVComponent.vcxproj index 36798c251..54a75a0ea 100644 --- a/samples/wp8/OpenCVXaml/OpenCVComponent/OpenCVComponent.vcxproj +++ b/samples/wp8/OpenCVXaml/OpenCVComponent/OpenCVComponent.vcxproj @@ -52,12 +52,21 @@ + + + + + + + + + + + + false - - - $(ProjectDir)..\..\..\..\bin\WP\8.0\x86\lib\Debug;$(ProjectDir)..\..\..\..\bin\WP\8.0\x86\3rdparty\lib\Debug;$(WP80ToolSetPath)lib;$(WindowsSDK_LibraryPath_x86) false @@ -67,14 +76,13 @@ pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) true - $(ProjectDir)..\..\..\..\modules\imgproc\include;$(ProjectDir)..\..\..\..\modules\core\include;%(AdditionalIncludeDirectories) Console false ole32.lib;%(IgnoreSpecificDefaultLibraries) true - opencv_core300d.lib;opencv_imgproc300d.lib;zlibd.lib;WindowsPhoneCore.lib;RuntimeObject.lib;PhoneAppModelHost.lib;%(AdditionalDependencies) + @@ -84,7 +92,6 @@ pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) true - ..\..\..\..\binWP8;%(AdditionalIncludeDirectories) Console @@ -100,7 +107,6 @@ pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) true - ..\..\..\..\binWP8;%(AdditionalIncludeDirectories) Console @@ -116,7 +122,6 @@ pch.h $(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories) true - ..\..\..\..\binWP8;%(AdditionalIncludeDirectories) Console @@ -141,14 +146,6 @@ Create - - - true - - - true - - diff --git a/samples/wp8/OpenCVXaml/OpenCVComponent/OpenCVComponent.vcxproj.filters b/samples/wp8/OpenCVXaml/OpenCVComponent/OpenCVComponent.vcxproj.filters index 9a5b3c014..fdd57ac77 100644 --- a/samples/wp8/OpenCVXaml/OpenCVComponent/OpenCVComponent.vcxproj.filters +++ b/samples/wp8/OpenCVXaml/OpenCVComponent/OpenCVComponent.vcxproj.filters @@ -14,8 +14,4 @@ - - - - \ No newline at end of file diff --git a/samples/wp8/OpenCVXaml/OpenCVComponent/opencv.props b/samples/wp8/OpenCVXaml/OpenCVComponent/opencv.props new file mode 100644 index 000000000..fcd08940b --- /dev/null +++ b/samples/wp8/OpenCVXaml/OpenCVComponent/opencv.props @@ -0,0 +1,34 @@ + + + + + $(OPENCV_WINRT_INSTALL_DIR)WP\8.0\$(PlatformTarget)\$(PlatformTarget)\vc11\bin\ + $(OPENCV_WINRT_INSTALL_DIR)WP\8.0\$(PlatformTarget)\$(PlatformTarget)\vc11\lib\ + $(OPENCV_WINRT_INSTALL_DIR)WP\8.0\$(PlatformTarget)\include\ + + d + + + + true + + + + + true + + + true + + + + + $(OpenCV_Include);%(AdditionalIncludeDirectories); + + + + opencv_core300$(DebugSuffix).lib;opencv_imgproc300$(DebugSuffix).lib;WindowsPhoneCore.lib;RuntimeObject.lib;PhoneAppModelHost.lib;%(AdditionalDependencies) + $(OpenCV_Lib);%(AdditionalLibraryDirectories); + + + \ No newline at end of file