Merge branch 'master' of http://192.168.100.140:8099/sane/code_device
This commit is contained in:
commit
4ee1c74be1
2
build.sh
2
build.sh
|
@ -7,7 +7,7 @@ mainverstr="s/ver_1/4/g" #版本控制
|
||||||
minver="06"
|
minver="06"
|
||||||
minverstr="s/ver_2/"
|
minverstr="s/ver_2/"
|
||||||
|
|
||||||
sudo apt install libudev-dev
|
#sudo apt install libudev-dev
|
||||||
if [ "$sys" == "UnionTech" ];then
|
if [ "$sys" == "UnionTech" ];then
|
||||||
# uos ...
|
# uos ...
|
||||||
|
|
||||||
|
|
|
@ -69,35 +69,15 @@ elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "aarch64")
|
||||||
${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libittnotify.a
|
${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libittnotify.a
|
||||||
${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libtegra_hal.a
|
${PROJECT_SOURCE_DIR}/../3rdparty/opencv/lib/uos/${CMAKE_SYSTEM_PROCESSOR}/libtegra_hal.a
|
||||||
|
|
||||||
${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libexportfile.so
|
|
||||||
${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libcnocr.so
|
|
||||||
${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libconvert.so
|
|
||||||
${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libhwocrjni.so
|
|
||||||
${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libcrypto.so.1.0.0
|
|
||||||
${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libdocseg.so
|
|
||||||
${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libofd.so
|
|
||||||
${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libpdfparse.so
|
|
||||||
${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libtinyxml2.so
|
|
||||||
${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libzip.so
|
|
||||||
${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libhwocrdetect.so
|
|
||||||
#message("静态库预留03")
|
#message("静态库预留03")
|
||||||
#message("静态库预留04")
|
#message("静态库预留04")
|
||||||
)
|
)
|
||||||
message("cpu is arm64")
|
message("cpu is arm64")
|
||||||
elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64")
|
elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64")
|
||||||
# target_link_libraries(${PROJECT_NAME} PRIVATE
|
target_link_libraries(${PROJECT_NAME} PRIVATE
|
||||||
# ${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libcnocr.so
|
#message("静态库预留03")
|
||||||
# ${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libconvert.so
|
#message("静态库预留04")
|
||||||
# ${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libdocseg.so
|
)
|
||||||
# ${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libexportfile.so
|
|
||||||
# ${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libhwocrdetect.so
|
|
||||||
#${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libhwocrjni.so
|
|
||||||
# ${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libofd.so
|
|
||||||
# ${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libtinyxml2.so.8
|
|
||||||
# ${PROJECT_SOURCE_DIR}/../../../release/uos/${CMAKE_SYSTEM_PROCESSOR}/libzip.so.5
|
|
||||||
#message("静态库预留05")
|
|
||||||
#message("静态库预留06")
|
|
||||||
# )
|
|
||||||
message("cpu is mips64")
|
message("cpu is mips64")
|
||||||
else()
|
else()
|
||||||
message(FATAL_ERROR "not find cpu and exit cmake ...")
|
message(FATAL_ERROR "not find cpu and exit cmake ...")
|
||||||
|
|
|
@ -10,19 +10,12 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef VERSION_MAJOR
|
|
||||||
#define VERSION_MAJOR 1
|
|
||||||
#define VERSION_MINOR 0
|
|
||||||
#define VERSION_YEAR 2022
|
|
||||||
#define VERSION_BUILD 105181
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define MAKE_VERSION(a, b, c, d) \
|
#define MAKE_VERSION(a, b, c, d) \
|
||||||
((((unsigned long long)(a) & 0x0ffff) << 48) \
|
((((unsigned long long)(a) & 0x0ffff) << 48) \
|
||||||
| (((unsigned long long)(b) & 0x0ffff) << 32) \
|
| (((unsigned long long)(b) & 0x0ffff) << 32) \
|
||||||
| (((unsigned long long)(c) & 0x0ffff) << 16) \
|
| (((unsigned long long)(c) & 0x0ffff) << 16) \
|
||||||
| (((unsigned long long)(d) & 0x0ffff) << 0))
|
| (((unsigned long long)(d) & 0x0ffff) << 0))
|
||||||
#define GET_BUILD_VER VERSION_BUILD - 100000
|
|
||||||
|
|
||||||
std::string g_scanner_path = "";
|
std::string g_scanner_path = "";
|
||||||
static std::string g_sane_name = "";
|
static std::string g_sane_name = "";
|
||||||
|
|
|
@ -19,9 +19,6 @@
|
||||||
#include "../../sdk/include/sane/sane_option_definitions.h"
|
#include "../../sdk/include/sane/sane_option_definitions.h"
|
||||||
#include "sane_option.h"
|
#include "sane_option.h"
|
||||||
|
|
||||||
#ifndef VERSION_BUILD
|
|
||||||
#define VERSION_BUILD 22030
|
|
||||||
#endif
|
|
||||||
#ifndef SIGUSR1
|
#ifndef SIGUSR1
|
||||||
#define SIGUSR1 10
|
#define SIGUSR1 10
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -28,13 +28,17 @@
|
||||||
#include "sane/sane_ex.h"
|
#include "sane/sane_ex.h"
|
||||||
|
|
||||||
#if defined(WIN32) || defined(_WIN64)
|
#if defined(WIN32) || defined(_WIN64)
|
||||||
|
#include "../../../sdk/include/huagao/brand.h"
|
||||||
#ifndef HGSCANNER_EXPORT
|
#ifndef HGSCANNER_EXPORT
|
||||||
#ifdef _DEBUG
|
#pragma comment(lib, "scanner.lib")
|
||||||
#pragma comment(lib, "debug/scanner.lib")
|
#endif
|
||||||
|
#define VERSION_MAJOR VERSION_MAIN
|
||||||
|
#define VERSION_MINOR VERSION_SUB
|
||||||
|
#define VERSION_YEAR VERSION_BUILD1
|
||||||
|
#define VERSION_BUILD VERSION_PATCH
|
||||||
|
#define GET_BUILD_VER VERSION_BUILD
|
||||||
#else
|
#else
|
||||||
#pragma comment(lib, "release/scanner.lib")
|
#define GET_BUILD_VER VERSION_BUILD - 100000
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*********************************************************************************************
|
/*********************************************************************************************
|
||||||
|
|
Loading…
Reference in New Issue