Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions DFTFringe.pro
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ win32 {
message("Using WINDOWS project configuration.")

CONFIG( debug, debug|release ) {
LIBS += -L..\qwt-6.3.0\lib -lqwtd # debug
LIBS += -L$$PWD\..\qwt-6.3.0\lib -lqwtd # debug
} else {
LIBS += -L..\qwt-6.3.0\lib -lqwt # release
LIBS += -L$$PWD\..\qwt-6.3.0\lib -lqwt # release
CONFIG+=force_debug_info # keep debug infos (even in release build) to be able to link stacktrace address to actual function
CONFIG+=separate_debug_info # separate debug infos into a .exe.debug to not grow the .exe
}
Expand All @@ -47,14 +47,14 @@ win32 {
INCLUDEPATH += ..\build_armadillo\tmp\include
INCLUDEPATH += ..\build_openCV\install\include

LIBS += -L..\build_lapack\bin -llibblas
LIBS += -L..\build_lapack\bin -lliblapack
LIBS += -L..\build_openCV\install\x64\mingw\bin -llibopencv_calib3d4120
LIBS += -L..\build_openCV\install\x64\mingw\bin -llibopencv_core4120
LIBS += -L..\build_openCV\install\x64\mingw\bin -llibopencv_features2d4120
LIBS += -L..\build_openCV\install\x64\mingw\bin -llibopencv_highgui4120
LIBS += -L..\build_openCV\install\x64\mingw\bin -llibopencv_imgcodecs4120
LIBS += -L..\build_openCV\install\x64\mingw\bin -llibopencv_imgproc4120
LIBS += -L$$PWD\..\build_lapack\bin -llibblas
LIBS += -L$$PWD\..\build_lapack\bin -lliblapack
LIBS += -L$$PWD\..\build_openCV\install\x64\mingw\bin -llibopencv_calib3d4120
LIBS += -L$$PWD\..\build_openCV\install\x64\mingw\bin -llibopencv_core4120
LIBS += -L$$PWD\..\build_openCV\install\x64\mingw\bin -llibopencv_features2d4120
LIBS += -L$$PWD\..\build_openCV\install\x64\mingw\bin -llibopencv_highgui4120
LIBS += -L$$PWD\..\build_openCV\install\x64\mingw\bin -llibopencv_imgcodecs4120
LIBS += -L$$PWD\..\build_openCV\install\x64\mingw\bin -llibopencv_imgproc4120
LIBS += -ldbghelp # for SetUnhandledExceptionFilter


Expand Down
29 changes: 15 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ Copy content from `yourExtractionLocation\opencv\build\include` to `C:\buildingD

Get [Qwt](https://qwt.sourceforge.io/) source code version 6.3.0 in your prefered way (clone the repo, download the archive, homing pigeon, ...) and have it in folder named `C:\buildingDFTFringe\qwt-6.3.0`.

No additional modification required here.
Note: this method doesn't get you qwtd.dll. You will need to build DFTFringe in realase or modify .pro file to use qwt.dll.

#### Build Armadillo

Expand All @@ -218,12 +218,13 @@ Install DFTFringe from official installer and copy the DLLs from install folder
qwt-6.3.0\lib\qwt.dll
build_lapack\bin\libblas.dll
build_lapack\bin\liblapack.dll
build_openCV\install\x64\mingw\bin\libopencv_calib3d4110.dll
build_openCV\install\x64\mingw\bin\libopencv_core4110.dll
build_openCV\install\x64\mingw\bin\libopencv_features2d4110.dll
build_openCV\install\x64\mingw\bin\libopencv_highgui4110.dll
build_openCV\install\x64\mingw\bin\libopencv_imgcodecs4110.dll
build_openCV\install\x64\mingw\bin\libopencv_imgproc4110.dll
build_openCV\install\x64\mingw\bin\libopencv_calib3d4120.dll
build_openCV\install\x64\mingw\bin\libopencv_core4120.dll
build_openCV\install\x64\mingw\bin\libopencv_features2d4120.dll
build_openCV\install\x64\mingw\bin\libopencv_flann4120.dll
build_openCV\install\x64\mingw\bin\libopencv_highgui4120.dll
build_openCV\install\x64\mingw\bin\libopencv_imgcodecs4120.dll
build_openCV\install\x64\mingw\bin\libopencv_imgproc4120.dll
```

## Stage 3: Building DFTFringe
Expand Down Expand Up @@ -257,13 +258,13 @@ windeployqt.exe DFTFringe\Release\DFTFringe.exe

Copy-Item ".\build_lapack\bin\liblapack.dll" -Destination ".\DFTFringe\Release"
Copy-Item ".\build_lapack\bin\libblas.dll" -Destination ".\DFTFringe\Release"
Copy-Item ".\build_openCV\install\x64\mingw\bin\libopencv_calib3d4110.dll" -Destination ".\DFTFringe\Release"
Copy-Item ".\build_openCV\install\x64\mingw\bin\libopencv_core4110.dll" -Destination ".\DFTFringe\Release"
Copy-Item ".\build_openCV\install\x64\mingw\bin\libopencv_features2d4110.dll" -Destination ".\DFTFringe\Release"
Copy-Item ".\build_openCV\install\x64\mingw\bin\libopencv_flann4110.dll" -Destination ".\DFTFringe\Release"
Copy-Item ".\build_openCV\install\x64\mingw\bin\libopencv_highgui4110.dll" -Destination ".\DFTFringe\Release"
Copy-Item ".\build_openCV\install\x64\mingw\bin\libopencv_imgcodecs4110.dll" -Destination ".\DFTFringe\Release"
Copy-Item ".\build_openCV\install\x64\mingw\bin\libopencv_imgproc4110.dll" -Destination ".\DFTFringe\Release"
Copy-Item ".\build_openCV\install\x64\mingw\bin\libopencv_calib3d4120.dll" -Destination ".\DFTFringe\Release"
Copy-Item ".\build_openCV\install\x64\mingw\bin\libopencv_core4120.dll" -Destination ".\DFTFringe\Release"
Copy-Item ".\build_openCV\install\x64\mingw\bin\libopencv_features2d4120.dll" -Destination ".\DFTFringe\Release"
Copy-Item ".\build_openCV\install\x64\mingw\bin\libopencv_flann4120.dll" -Destination ".\DFTFringe\Release"
Copy-Item ".\build_openCV\install\x64\mingw\bin\libopencv_highgui4120.dll" -Destination ".\DFTFringe\Release"
Copy-Item ".\build_openCV\install\x64\mingw\bin\libopencv_imgcodecs4120.dll" -Destination ".\DFTFringe\Release"
Copy-Item ".\build_openCV\install\x64\mingw\bin\libopencv_imgproc4120.dll" -Destination ".\DFTFringe\Release"
Copy-Item ".\qwt-6.3.0\lib\qwt.dll" -Destination ".\DFTFringe\Release"
Copy-Item ".\6.8.3\mingw1_64\bin\Qt6OpenGL.dll" -Destination ".\DFTFringe\Release"
Copy-Item ".\tools\mingw1310_64\bin\libquadmath-0.dll" -Destination ".\DFTFringe\Release"
Expand Down
Loading