From 61165c067edb31afdca4874bf7fd225213d1fb74 Mon Sep 17 00:00:00 2001 From: "mo1027728827@qq.com" Date: Wed, 25 May 2022 17:55:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Ekylin=E5=B8=AE=E5=8A=A9?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.sh | 2 ++ hgdriver/hgdev/CMakeLists.txt | 1 + hgdriver/hgdev/hg_scanner.h | 22 +++++++++++++++++----- hgdriver/wrapper/CMakeLists.txt | 1 + 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index 6dc5276..eb3d0c6 100755 --- a/build.sh +++ b/build.sh @@ -70,9 +70,11 @@ fi if [ "$sys" == "UnionTech" ];then sed -i "s/kylin/uos/g" hgdriver/wrapper/CMakeLists.txt + sed -i "s/KYLIN/UOS/g" hgdriver/wrapper/CMakeLists.txt elif [ "$sys" == "Kylin" ];then sed -i "s/uos/kylin/g" hgdriver/wrapper/CMakeLists.txt sed -i "s/uos/kylin/g" hgsane/CMakeLists.txt + sed -i "s/UOS/KYLIN/g" hgdriver/wrapper/CMakeLists.txt else echo "unknown os" fi diff --git a/hgdriver/hgdev/CMakeLists.txt b/hgdriver/hgdev/CMakeLists.txt index 55ad07f..34104c0 100644 --- a/hgdriver/hgdev/CMakeLists.txt +++ b/hgdriver/hgdev/CMakeLists.txt @@ -1,6 +1,7 @@ project(gdev) add_compile_options(-std=c++11) add_definitions(-DOEM_HUAGAO) +add_definitions(-DUOS) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") aux_source_directory(${PROJECT_SOURCE_DIR} DIR_SRCS) diff --git a/hgdriver/hgdev/hg_scanner.h b/hgdriver/hgdev/hg_scanner.h index d8135dc..eb9f2cd 100644 --- a/hgdriver/hgdev/hg_scanner.h +++ b/hgdriver/hgdev/hg_scanner.h @@ -357,8 +357,20 @@ public: virtual int get_scan_is_sleep(void);//获取设备是否休眠当中 }; -#ifdef OEM_HANWANG -static const std::string helpfile_ ="/opt/apps/com.hanvonchina.hanvonscan/entries/help/HanvonScan_scanSettings_Help_manual.pdf";//帮助文档路径 -#else -static const std::string helpfile_ ="/opt/apps/com.huagaochina.huagoscan/entries/help/HuaGoScan_scanSettings_Help_manual.pdf";//帮助文档路径 -#endif +#ifdef UOS + #ifdef OEM_HANWANG + static const std::string helpfile_ ="/opt/apps/com.hanvonchina.hanvonscan/entries/help/HanvonScan_scanSettings_Help_manual.pdf";//帮助文档路径 + #elif + static const std::string helpfile_ ="/opt/apps/com.lanxumchina.lanxumscan/entries/help/LanxumScan_scanSettings_Help_manual.pdf";//帮助文档路径 + #else + static const std::string helpfile_ ="/opt/apps/com.huagaochina.huagoscan/entries/help/HuaGoScan_scanSettings_Help_manual.pdf";//帮助文档路径 + #endif +#elif KYLIN + #ifdef OEM_HANWANG + static const std::string helpfile_ ="/opt/apps/scanner-driver-hanvon/doc/HanvonScan_scanSettings_Help_manual.pdf";//帮助文档路径 + #elif + static const std::string helpfile_ ="/opt/apps/scanner-driver-lanxum/doc/LanxumScan_scanSettings_Help_manual.pdf";//帮助文档路径 + #else + static const std::string helpfile_ ="/opt/apps/scanner-driver-huagao/doc/HuaGoScan_scanSettings_Help_manual.pdf";//帮助文档路径 + #endif +#endif \ No newline at end of file diff --git a/hgdriver/wrapper/CMakeLists.txt b/hgdriver/wrapper/CMakeLists.txt index 82778db..e85e72f 100644 --- a/hgdriver/wrapper/CMakeLists.txt +++ b/hgdriver/wrapper/CMakeLists.txt @@ -6,6 +6,7 @@ add_definitions(-DVERSION_MINOR=ver_2) add_definitions(-DVERSION_YEAR=${CURRENT_YEAR}) add_definitions(-DVERSION_BUILD=${MONTHDAY}) add_definitions(-DOEM_HUAGAO) +add_definitions(-DUOS) add_definitions("-Wl,--exclude-libs,ALL") #add_definitions("-B direct") add_compile_options(-std=c++11)