From b835d961f7789df3d2848fb9c271c26ac2d86da7 Mon Sep 17 00:00:00 2001 From: Chenwenxuan Date: Wed, 6 Mar 2024 15:01:24 +0800 Subject: [PATCH] fix gitignore and include path --- .gitignore | 3 ++- Spark110.pro | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8b95ceb..4a1df92 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -*.user \ No newline at end of file +*.user +*.pro.user.* \ No newline at end of file diff --git a/Spark110.pro b/Spark110.pro index 8d666f3..63cf497 100644 --- a/Spark110.pro +++ b/Spark110.pro @@ -265,7 +265,7 @@ LIBS += -L$$PWD\lib\acs\ LIBS += -L$$PWD\lib\lasermark\ -llibLaserMark -LIBS += D:/Spark110/lib/R_detection/RMS_Dll.dll +LIBS += $$PWD/lib/R_detection/RMS_Dll.dll INCLUDEPATH += $$PWD/MVS/Includes @@ -273,9 +273,9 @@ DEPENDPATH += $$PWD/MVS/Includes LIBS += -L$$PWD/MVS/Libraries/win64/ -lMvCameraControl -INCLUDEPATH += D:/Spark110/OpenCV/include -DEPENDPATH += D:/Spark110/OpenCV/include -LIBS += D:/Spark110/OpenCV/x64/mingw/lib/libopencv_*.a +INCLUDEPATH +=$$PWD/OpenCV/include +DEPENDPATH += $$PWD/OpenCV/include +LIBS += $$PWD/OpenCV/x64/mingw/lib/libopencv_*.a #LIBS += -L$$PWD/OpenCV/x64/mingw/lib/ -llibopencv_core450