diff --git a/motorStatorPosition/motorStatorPosition.vcxproj b/motorStatorPosition/motorStatorPosition.vcxproj index e5c72b7..89fd177 100644 --- a/motorStatorPosition/motorStatorPosition.vcxproj +++ b/motorStatorPosition/motorStatorPosition.vcxproj @@ -79,12 +79,12 @@ true $(SolutionDir)build\$(Platform)\$(Configuration)\ - ..\..\thirdParty\VzNLSDK\Inc;..\..\thirdParty\opencv\build\include;..\sourceCode;..\sourceCode\inc;$(IncludePath) + ..\..\thirdParty\VzNLSDK\Inc;..\sourceCode;..\sourceCode\inc;$(IncludePath) false $(SolutionDir)build\$(Platform)\$(Configuration)\ - ..\..\thirdParty\VzNLSDK\Inc;..\..\thirdParty\opencv\build\include;..\sourceCode;..\sourceCode\inc;$(IncludePath) + ..\..\thirdParty\VzNLSDK\Inc;..\sourceCode;..\sourceCode\inc;$(IncludePath) @@ -124,18 +124,18 @@ Level3 true - SG_API_LIBRARY;_DEBUG;MOTORSTATORPOSITION_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;SG_API_LIBRARY;_DEBUG;MOTORSTATORPOSITION_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true NotUsing pch.h - ..\..\thirdParty\opencv\build\include;%(AdditionalIncludeDirectories) + ..\..\thirdParty\opencv320\build\include;%(AdditionalIncludeDirectories) Windows true false - ..\..\thirdParty\opencv\build\x64\vc16\lib;..\build\x64\Debug;%(AdditionalLibraryDirectories) - opencv_world480d.lib;baseAlgorithm.lib;%(AdditionalDependencies) + ..\..\thirdParty\opencv320\build\x64\vc14\lib;..\build\x64\Debug;%(AdditionalLibraryDirectories) + opencv_world320d.lib;baseAlgorithm.lib;%(AdditionalDependencies) @@ -144,11 +144,11 @@ true true true - SG_API_LIBRARY;NDEBUG;MOTORSTATORPOSITION_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;SG_API_LIBRARY;NDEBUG;MOTORSTATORPOSITION_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) true NotUsing pch.h - ..\..\thirdParty\opencv\build\include;%(AdditionalIncludeDirectories) + ..\..\thirdParty\opencv320\build\include;%(AdditionalIncludeDirectories) Windows @@ -156,8 +156,8 @@ true true false - ..\..\thirdParty\opencv\build\x64\vc16\lib;..\build\x64\Release;%(AdditionalLibraryDirectories) - opencv_world480.lib;baseAlgorithm.lib;%(AdditionalDependencies) + ..\..\thirdParty\opencv320\build\x64\vc14\lib;..\build\x64\Release;%(AdditionalLibraryDirectories) + opencv_world320.lib;baseAlgorithm.lib;%(AdditionalDependencies) diff --git a/motorStatorPosition_test/motorStatorPosition_test.vcxproj b/motorStatorPosition_test/motorStatorPosition_test.vcxproj index c1b5dc6..4d44d82 100644 --- a/motorStatorPosition_test/motorStatorPosition_test.vcxproj +++ b/motorStatorPosition_test/motorStatorPosition_test.vcxproj @@ -118,15 +118,15 @@ Level3 true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\thirdParty\opencv\build\include; + ..\..\thirdParty\opencv320\build\include; Console true - ..\..\thirdParty\opencv\build\x64\vc16\lib;..\build\x64\Debug;%(AdditionalLibraryDirectories) - opencv_world480d.lib; motorStatorPosition.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\thirdParty\opencv320\build\x64\vc14\lib;..\build\x64\Debug;%(AdditionalLibraryDirectories) + opencv_world320d.lib; motorStatorPosition.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) @@ -135,17 +135,17 @@ true true true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + _CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true - ..\..\thirdParty\opencv\build\include; + ..\..\thirdParty\opencv320\build\include; Console true true true - ..\..\thirdParty\opencv\build\x64\vc16\lib;..\build\x64\Release;%(AdditionalLibraryDirectories) - opencv_world480.lib; motorStatorPosition.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\thirdParty\opencv320\build\x64\vc14\lib;..\build\x64\Release;%(AdditionalLibraryDirectories) + opencv_world320.lib; motorStatorPosition.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)