Merge branch 'master' of http://192.168.10.5:8099/sane/code_device
This commit is contained in:
commit
1783a8c183
9
build.sh
9
build.sh
|
@ -49,6 +49,13 @@ elif [ "$oem" == "cts" ] || [ "$oem" == "ctsweb" ]; then
|
|||
sed -i "s/DOEM_HUAGAO/DOEM_CANGTIAN/g" hgdriver/hgdev/CMakeLists.txt
|
||||
sed -i "s/DOEM_HUAGAO/DOEM_CANGTIAN/g" hgdriver/wrapper/CMakeLists.txt
|
||||
sed -i "s/1%m%d1/1%m%d8/g" hgdriver/wrapper/CMakeLists.txt
|
||||
|
||||
elif [ "$oem" == "zj" ] || [ "$oem" == "zjweb" ]; then
|
||||
ver3=20
|
||||
|
||||
sed -i "s/DOEM_HUAGAO/DOEM_ZHONGJING/g" hgdriver/hgdev/CMakeLists.txt
|
||||
sed -i "s/DOEM_HUAGAO/DOEM_ZHONGJING/g" hgdriver/wrapper/CMakeLists.txt
|
||||
sed -i "s/1%m%d1/1%m%d9/g" hgdriver/wrapper/CMakeLists.txt
|
||||
fi
|
||||
|
||||
if [ "$oem" != "" ]; then
|
||||
|
@ -142,4 +149,4 @@ if [ -f ../code_device/hgdriver/wrapper/CMakeLists.txtbkp ]; then
|
|||
pwd
|
||||
fi
|
||||
|
||||
exit $err
|
||||
exit $err
|
||||
|
|
|
@ -297,7 +297,7 @@ extern "C"
|
|||
char path[256] = { 0 };
|
||||
int len = readlink(lnk, path, sizeof(path) - 1);
|
||||
|
||||
return path;
|
||||
return len > 0 ? path : lnk;
|
||||
}
|
||||
static int enum_files(const char* dir, bool recursive, bool(*found_file)(const char* path_file, void* param), void* param)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue