diff --git a/.gitignore b/.gitignore index 8be1abf..026150b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ *.aps *.user *.filters -**/build \ No newline at end of file +**/build +arm* \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index f0cafa3..4a83194 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ SET(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/arm/libs) SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_SOURCE_DIR}/arm/bin) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../thirdParty/VzNLSDK/Inc) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../thirdParty/opencv/build/include) +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../thirdParty/OpenCV320/include) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sourceCode/inc) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/sourceCode) diff --git a/bagPositioning/bagPositioning.vcxproj b/bagPositioning/bagPositioning.vcxproj index a19196a..eb6b380 100644 --- a/bagPositioning/bagPositioning.vcxproj +++ b/bagPositioning/bagPositioning.vcxproj @@ -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\Windows\vc14\Release;..\..\thirdParty\opencv\build\x64\vc16\lib;..\build\x64\Release;%(AdditionalLibraryDirectories) + opencv_world320.lib;baseAlgorithm.lib;%(AdditionalDependencies) diff --git a/baseAlgorithm/baseAlgorithm.vcxproj b/baseAlgorithm/baseAlgorithm.vcxproj index de7d070..4d47757 100644 --- a/baseAlgorithm/baseAlgorithm.vcxproj +++ b/baseAlgorithm/baseAlgorithm.vcxproj @@ -156,8 +156,8 @@ true true false - ..\..\thirdParty\opencv\build\x64\vc16\lib;%(AdditionalLibraryDirectories) - opencv_world480.lib;%(AdditionalDependencies) + ..\..\thirdParty\OpenCV320\Windows\vc14\Release;..\..\thirdParty\opencv\build\x64\vc16\lib;%(AdditionalLibraryDirectories) + opencv_world320.lib;%(AdditionalDependencies)