diff --git a/huagao/CMakeLists.txt b/huagao/CMakeLists.txt index 29733e33..54ac5634 100644 --- a/huagao/CMakeLists.txt +++ b/huagao/CMakeLists.txt @@ -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") diff --git a/huagao/Device/CyUsbEx.cpp b/huagao/Device/CyUsbEx.cpp index a4e819a0..32d309eb 100644 --- a/huagao/Device/CyUsbEx.cpp +++ b/huagao/Device/CyUsbEx.cpp @@ -1,3 +1,4 @@ +#include "stdafx.h" #include "CyUsbEx.h" #include "CyAPI.h"