lmh188
/
twain3.0
mirror of http://192.168.1.51:8099/lmh188/twain3.0
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/huagaochina/twain3.0

This commit is contained in:
masayume 2021-07-31 19:29:57 +08:00
parent 957c1925e6 e20b160987
commit 59d673106e
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
huagao/CMakeLists.txt
View File

@ -39,6 +39,7 @@ ${PROJECT_SOURCE_DIR}
${PROJECT_SOURCE_DIR}/..
${PROJECT_SOURCE_DIR}/../twpp
${PROJECT_SOURCE_DIR}/../3rdparty/nick
${PROJECT_SOURCE_DIR}/../3rdparty/cyusb/inc
${PROJECT_SOURCE_DIR}/../3rdparty/libtiff/include
${PROJECT_SOURCE_DIR}/../3rdparty/gpdf/
${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include
@ -51,6 +52,7 @@ link_directories(${PROJECT_SOURCE_DIR}/../3rdparty/opencv/x86/staticlib/
${PROJECT_SOURCE_DIR}/../3rdparty/libtiff/
${PROJECT_SOURCE_DIR}/../3rdparty/log4cplus/lib/
${PROJECT_SOURCE_DIR}/../3rdparty/gpdf/x86/staticlib/
${PROJECT_SOURCE_DIR}/../3rdparty/cyusb/lib/windows/x86/
${PROJECT_SOURCE_DIR}/../3rdparty/gpdf/3rdparty/tesseract/staticlib/x86/
${PROJECT_SOURCE_DIR}/../3rdparty/turbojpeg/x86/lib/)
@ -97,6 +99,7 @@ ELSEIF (CMAKE_SYSTEM_NAME MATCHES "Windows")
link_libraries(tesseract_viewer)
link_libraries(tesseract_wordrec)
link_libraries(turbojpeg)
link_libraries(CyAPI)
RW_LINK_3RD_PART_LIBRARY(log4cplusS)
MESSAGE(STATUS "current platform: Windows")
ELSEIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")

1
huagao/Device/CyUsbEx.cpp
View File

@ -1,3 +1,4 @@
#include "stdafx.h"
#include "CyUsbEx.h"
#include "CyAPI.h"