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

调整中性版本

This commit is contained in:
13038267101 2023-04-20 17:35:03 +08:00
parent ecd94407da
commit 9eead04e8e
5 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
build_all.bat
View File

@ -9,7 +9,7 @@ set BUILD_LSC=false
set BUILD_CTS=false
set BUILD_ZJ=false
set BUILD_ZG=false
set BUILD_HGNEU=false
set BUILD_NEU=false
set BUILD_X86=true
set BUILD_X64=true
@ -25,8 +25,8 @@ if "%OEM%"=="hw" (
set BUILD_ZJ=true
)else if "%OEM%" == "zg" (
set BUILD_ZG=true
)else if "%OEM%" == "hgneu" (
set BUILD_HGNEU=true
)else if "%OEM%" == "neu" (
set BUILD_NEU=true
)else if "%OEM%" == "all" (
set BUILD_HG=true
set BUILD_HW=true
@ -34,7 +34,7 @@ if "%OEM%"=="hw" (
set BUILD_CTS=true
set BUILD_ZJ=true
set BUILD_ZG=true
set BUILD_HGNEU=true
set BUILD_NEU=true
)else (
set BUILD_HG=true
set OEM=hg
@ -102,10 +102,10 @@ if "%BUILD_HG%"=="true" (
if %ERRORLEVEL% neq 0 goto end
if "%BUILD_X64%"=="true" call :compile_hg hg x64
)
if "%BUILD_HGNEU%"=="true" (
if "%BUILD_X86%"=="true" call :compile_hgneu hgneu x86
if "%BUILD_NEU%"=="true" (
if "%BUILD_X86%"=="true" call :compile_neu neu x86
if %ERRORLEVEL% neq 0 goto end
if "%BUILD_X64%"=="true" call :compile_hgneu hgneu x64
if "%BUILD_X64%"=="true" call :compile_neu neu x64
if %ERRORLEVEL% neq 0 goto end
)
goto end
@ -127,7 +127,7 @@ REM parameters for all OEM compiling procedure are: oem cpu
if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL%
EXIT /B 0
:compile_hgneu
:compile_neu
call build_base.bat %1 %2
if %ERRORLEVEL% neq 0 EXIT /B %ERRORLEVEL%
call build_ds.bat %1 %2 100

8
build_base.bat
View File

@ -1,5 +1,5 @@
@echo off
echo "Parameter 1:hg | lsc| hw | zj | cts | hgneu"
echo "Parameter 1:hg | lsc| hw | zj | cts | neu"
echo "Parameter 2:x86 | x64 "
set OEM=%1
@ -42,9 +42,9 @@ if "%OEM%" equ "cts" (
set CL=/DOEM_CANGTIAN /DBACKEND_NAME=ctssane
goto oem
)
if "%OEM%" equ "hgneu" (
set OEM_DIR=huagaoneu
set CL=/DOEM_HUAGAO_NEU /DBACKEND_NAME=hgsane
if "%OEM%" equ "neu" (
set OEM_DIR=neutral
set CL=/DOEM_NEUTRAL /DBACKEND_NAME=hgsane
goto oem
)
echo "Parameter 1:oem is fail"

8
build_ds.bat
View File

@ -50,10 +50,10 @@ if "%OEM%" equ "cts" (
set NAME=cumtenn%NAME%
goto oem
)
if "%OEM%" equ "hgneu" (
set OEM_DIR=huagaoneu
set CL=/DOEM_HUAGAO_NEU /DPRODUCT_ID=%PID%
set NAME=%NAME%
if "%OEM%" equ "neu" (
set OEM_DIR=neutral
set CL=/DOEM_NEUTRAL /DPRODUCT_ID=%PID%
set NAME=neu%NAME%
goto oem
)
echo "Parameter 1:oem is fail"

BIN
sln/Release/hgsetver.exe
View File

Binary file not shown.

26
sln/hgsetver/hgsetver.cpp
View File

@ -18,7 +18,7 @@ enum oem
OEM_CANGTIAN,
OEM_ZHONGJING,
OEM_ZIGUANG,
OEM_HUAGAO_NEU
OEM_NEUTRAL
};
#define GET_ENUM_NAME_W(e, v) \
if(e == v) return L###e;
@ -100,8 +100,8 @@ int main()
vendor = OEM_ZHONGJING;
else if (wcsicmp(cmd->parameter(L"-oem"), L"zg") == 0)
vendor = OEM_ZIGUANG;
else if (wcsicmp(cmd->parameter(L"-oem"), L"hgneu") == 0)
vendor = OEM_HUAGAO_NEU;
else if (wcsicmp(cmd->parameter(L"-oem"), L"neu") == 0)
vendor = OEM_NEUTRAL;
else
std::wcout << L" OEM '" << cmd->parameter(L"-oem") << L"' is not supported! set as OEM_NONE.\r\n";
@ -152,7 +152,7 @@ static std::wstring oem_str(oem o)
GET_ENUM_NAME_W(OEM_CANGTIAN, o);
GET_ENUM_NAME_W(OEM_ZHONGJING, o);
GET_ENUM_NAME_W(OEM_ZIGUANG, o);
GET_ENUM_NAME_W(OEM_HUAGAO_NEU, o);
GET_ENUM_NAME_W(OEM_NEUTRAL, o);
}
static oem from_str(const wchar_t* str)
{
@ -163,7 +163,7 @@ static oem from_str(const wchar_t* str)
GET_ENUM_VALUE_W(OEM_CANGTIAN, s);
GET_ENUM_VALUE_W(OEM_ZHONGJING, s);
GET_ENUM_VALUE_W(OEM_ZIGUANG, s);
GET_ENUM_VALUE_W(OEM_HUAGAO_NEU, s);
GET_ENUM_VALUE_W(OEM_NEUTRAL, s);
return OEM_NOT;
}
static int oem_code(oem o)
@ -762,8 +762,8 @@ namespace rc
os = L"microtek";
else if (o == OEM_ZIGUANG)
os = L"unis";
else if (o == OEM_HUAGAO_NEU)
os = L"huagaoneu";
else if (o == OEM_NEUTRAL)
os = L"neutral";
while (len > bgn)
{
bgn += first.length();
@ -795,8 +795,8 @@ namespace rc
os = L"microtek";
else if (o == OEM_ZIGUANG)
os = L"unis";
else if (o == OEM_HUAGAO_NEU)
os = L"huagaoneu";
else if (o == OEM_NEUTRAL)
os = L"neutral";
while (len > bgn)
{
bgn += first.length();
@ -1145,8 +1145,8 @@ namespace rc
target += L"microtek\\";
else if (o == OEM_ZIGUANG)
target += L"unis\\";
else if (o == OEM_HUAGAO_NEU)
target += L"huagaoneu\\";
else if (o == OEM_NEUTRAL)
target += L"neutral\\";
else
target += L"huagao\\";
@ -1182,8 +1182,8 @@ namespace rc
target = L"microtek";
else if (param->o == OEM_ZIGUANG)
target = L"unis";
else if (param->o == OEM_HUAGAO_NEU)
target = L"huagaoneu";
else if (param->o == OEM_NEUTRAL)
target = L"neutral";
target += tail;
while ((bgn = cont.find(first, bgn)) != std::wstring::npos)