diff --git a/huagao/huagaotwds.pro b/huagao/huagaotwds.pro index e11c4fa0..8fd97b7a 100644 --- a/huagao/huagaotwds.pro +++ b/huagao/huagaotwds.pro @@ -10,14 +10,30 @@ TEMPLATE = lib CONFIG += c++11 DEFINES += TWPP_IS_DS _AFXDLL -INCLUDEPATH += $$PWD/../ $$PWD/../twpp $$PWD/../3rdparty/opencv/include $$PWD/../3rdparty/nick $$PWD/../3rdparty/turbojpeg/include $$PWD/../3rdparty/hgOCR/include -LIBS += -L$$PWD/../3rdparty/opencv/x86/lib -L$$PWD/../3rdparty/turbojpeg/x86/lib -L$$PWD/../3rdparty/hgOCR/x86/lib +INCLUDEPATH += $$PWD/../ $$PWD/../twpp $$PWD/../3rdparty/opencv/include $$PWD/../3rdparty/nick $$PWD/../3rdparty/gpdf + +CONFIG(release, debug|release){ + LIBS += -L$$PWD/../3rdparty/opencv/x86/staticlib/release \ + -L$$PWD/../3rdparty/gpdf/x86/staticlib/release \ + -L$$PWD/../3rdparty/gpdf/3rdparty/tesseract/staticlib/x86/release + + LIBS += -lopencv_core343 -lopencv_highgui343 -lopencv_imgproc343 -lopencv_imgcodecs343 -lhg_gpdf \ + -lzlib -llibtiff -littnotify -llibjpeg-turbo -llibwebp -llibpng -llibjasper -lIlmImf \ + -lcvblob -llibjpeg -llibleptonica -llibprotobuf -lquirc -lxtiff \ + -ltesseract_api -ltesseract_arch -ltesseract_ccmain -ltesseract_ccstruct -ltesseract_ccutil -ltesseract_classify \ + -ltesseract_cutil -ltesseract_dict -ltesseract_lstm -ltesseract_opencl -ltesseract_textord -ltesseract_viewer -ltesseract_wordrec -CONFIG(release, debug|release){ - LIBS += -lopencv_world346 -lturbojpeg -lHG_OCR4 } CONFIG(debug, debug|release){ - LIBS += -lopencv_world346d -lturbojpeg -lHG_OCR4 + LIBS += -L$$PWD/../3rdparty/opencv/x86/staticlib/debug \ + -L$$PWD/../3rdparty/gpdf/x86/staticlib/debug \ + -L$$PWD/../3rdparty/gpdf/3rdparty/tesseract/staticlib/x86/debug + + LIBS += -lopencv_core343d -lopencv_highgui343d -lopencv_imgproc343d -lopencv_imgcodecs343d -lhg_gpdf \ + -lzlibd -llibtiffd -littnotifyd -llibjpeg-turbod -llibwebpd -llibpngd -llibjasperd -lIlmImfd \ + -llibprotobufd -lcvblob -llibjpeg -llibleptonica -lquirc -lxtiff \ + -ltesseract_api -ltesseract_arch -ltesseract_ccmain -ltesseract_ccstruct -ltesseract_ccutil -ltesseract_classify \ + -ltesseract_cutil -ltesseract_dict -ltesseract_lstm -ltesseract_opencl -ltesseract_textord -ltesseract_viewer -ltesseract_wordrec } DEF_FILE = exports.def @@ -39,13 +55,11 @@ SOURCES += huagaods.cpp \ Device/GScanVirtual.cpp \ Device/ImageMatQueue.cpp \ Device/ImageMultiOutput.cpp \ - Device/JpegBuffer.cpp \ Device/PaperSize.cpp \ Device/PublicFunc.cpp \ Device/UsbScanEx.cpp \ Device/config_new.cpp \ Device/GScan.cpp \ - Device/jpeglib.cpp \ Device/scn_config.cpp \ Device/cJSON.cpp \ Device/CJsonObject.cpp \ @@ -62,6 +76,7 @@ SOURCES += huagaods.cpp \ ImageProcess/ImageApplyRotation.cpp \ ImageProcess/ImageApplySharpen.cpp \ ImageProcess/ImageProcess_Public.cpp \ + ImageProcess/ImageApplyConcatenation.cpp \ Sliders.cpp \ SmartEdit.cpp \ TabCtrlSSL.cpp \ @@ -89,14 +104,12 @@ HEADERS += huagaods.hpp \ Device/IUsb.h \ Device/ImageMatQueue.h \ Device/ImageMultiOutput.h \ - Device/JpegBuffer.h \ Device/PaperSize.h \ Device/PublicFunc.h \ Device/UsbScanEx.h \ Device/config_new.h \ Device/device_common.h \ Device/GScan.h \ - Device/jpeglib.h \ Device/scn_config.h \ Device/filetools.h \ Device/cJSON.h \ @@ -115,6 +128,7 @@ HEADERS += huagaods.hpp \ ImageProcess/ImageApplyRotation.h \ ImageProcess/ImageApplySharpen.h \ ImageProcess/ImageProcess_Public.h \ + ImageProcess/ImageApplyConcatenation.h \ Sliders.h \ SmartEdit.h \ TabCtrlSSL.h \