diff --git a/hgdriver/3rdparty/tiff/include/tiff.h b/hgdriver/3rdparty/tiff/include/tiff.h index 5b0a0c9..0ee369c 100644 --- a/hgdriver/3rdparty/tiff/include/tiff.h +++ b/hgdriver/3rdparty/tiff/include/tiff.h @@ -72,8 +72,10 @@ typedef TIFF_UINT16_T uint16; typedef TIFF_INT32_T int32; typedef TIFF_UINT32_T uint32; +#ifdef WIN32 typedef TIFF_INT64_T int64; typedef TIFF_UINT64_T uint64; +#endif /* * Some types as promoted in a variable argument list diff --git a/hgdriver/ImageProcess/CMakeLists.txt b/hgdriver/ImageProcess/CMakeLists.txt index 099b6c9..dc55d60 100644 --- a/hgdriver/ImageProcess/CMakeLists.txt +++ b/hgdriver/ImageProcess/CMakeLists.txt @@ -10,8 +10,9 @@ add_library(${PROJECT_NAME} STATIC ${DIR_SRCS}) target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR} - ${PROJECT_SOURCE_DIR}/../3rdparty/nick - ${PROJECT_SOURCE_DIR}/../hgimgproc - ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include + ${PROJECT_SOURCE_DIR}/../3rdparty/nick + ${PROJECT_SOURCE_DIR}/../hgimgproc + ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include + ${PROJECT_SOURCE_DIR}/../3rdparty/tiff/include ) set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/../../../build/) diff --git a/hgdriver/hgdev/CMakeLists.txt b/hgdriver/hgdev/CMakeLists.txt index 34104c0..f181f24 100644 --- a/hgdriver/hgdev/CMakeLists.txt +++ b/hgdriver/hgdev/CMakeLists.txt @@ -44,7 +44,8 @@ target_link_libraries(${PROJECT_NAME} PRIVATE usb-1.0) target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/../3rdparty/nick ${PROJECT_SOURCE_DIR}/../ImageProcess - ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include + ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include + ${PROJECT_SOURCE_DIR}/../3rdparty/tiff/include ${PROJECT_SOURCE_DIR}/../../../sdk/include ) diff --git a/hgdriver/wrapper/CMakeLists.txt b/hgdriver/wrapper/CMakeLists.txt index 0795ccd..1d79b1a 100644 --- a/hgdriver/wrapper/CMakeLists.txt +++ b/hgdriver/wrapper/CMakeLists.txt @@ -106,6 +106,7 @@ endif() target_include_directories(${PROJECT_NAME} PRIVATE ${PROJECT_SOURCE_DIR} ${PROJECT_SOURCE_DIR}/../3rdparty/nick ${PROJECT_SOURCE_DIR}/../3rdparty/opencv/include + ${PROJECT_SOURCE_DIR}/../3rdparty/tiff/include ${PROJECT_SOURCE_DIR}/../ImageProcess ${PROJECT_SOURCE_DIR}/../hgdev ${PROJECT_SOURCE_DIR}/../../../sdk/include