lmh188
/
code_device
mirror of http://192.168.10.5:8099/sane/code_device.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.100.140:8099/sane/code_device

This commit is contained in:
13038267101 2022-07-29 10:11:46 +08:00
parent 604bda6294 111bb281f8
commit 4ee1c74be1
5 changed files with 14 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -7,7 +7,7 @@ mainverstr="s/ver_1/4/g" #版本控制
minver="06"
minverstr="s/ver_2/"
sudo apt install libudev-dev
#sudo apt install libudev-dev
if [ "$sys" == "UnionTech" ];then
# uos ...

28
hgdriver/wrapper/CMakeLists.txt
View File

@ -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}/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("静态库预留04")
)
message("cpu is arm64")
elseif(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64")
# target_link_libraries(${PROJECT_NAME} PRIVATE
# ${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}/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")
# )
target_link_libraries(${PROJECT_NAME} PRIVATE
#message("静态库预留03")
#message("静态库预留04")
)
message("cpu is mips64")
else()
message(FATAL_ERROR "not find cpu and exit cmake ...")

7
hgdriver/wrapper/huagaoxxx_warraper_ex.cpp
View File

@ -10,19 +10,12 @@
#include <string.h>
#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) \
((((unsigned long long)(a) & 0x0ffff) << 48) \
| (((unsigned long long)(b) & 0x0ffff) << 32) \
| (((unsigned long long)(c) & 0x0ffff) << 16) \
| (((unsigned long long)(d) & 0x0ffff) << 0))
#define GET_BUILD_VER VERSION_BUILD - 100000
std::string g_scanner_path = "";
static std::string g_sane_name = "";

3
hgsane/sane_hg_mdw.cpp
View File

@ -19,9 +19,6 @@
#include "../../sdk/include/sane/sane_option_definitions.h"
#include "sane_option.h"
#ifndef VERSION_BUILD
#define VERSION_BUILD 22030
#endif
#ifndef SIGUSR1
#define SIGUSR1 10
#endif

14
sdk/hginclude/huagaoxxx_warraper_ex.h
View File

@ -28,13 +28,17 @@
#include "sane/sane_ex.h"
#if defined(WIN32) || defined(_WIN64)
#include "../../../sdk/include/huagao/brand.h"
#ifndef HGSCANNER_EXPORT
#ifdef _DEBUG
#pragma comment(lib, "debug/scanner.lib")
#pragma comment(lib, "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
#pragma comment(lib, "release/scanner.lib")
#endif
#endif
#define GET_BUILD_VER VERSION_BUILD - 100000
#endif
/*********************************************************************************************