diff --git a/build.bat b/build.bat
index 61fe668..db6c3f6 100644
--- a/build.bat
+++ b/build.bat
@@ -118,7 +118,7 @@ goto end
call %dev%\..\..\..\vc\auxiliary\build\vcvars32.bat
)
-"%~dp0\sln\release\hgsetver.exe" "%~dp0\twain\brand.h" -oem %OEM% -cpu %CPU% -pid %PID% %COMPILE_RANGE% %NOT_INCREASE_VER%
+"%~dp0\sln\release\hgsetver.exe" "%~dp0\..\sdk\include\huagao\brand.h" -oem %OEM% -cpu %CPU% -pid %PID% %COMPILE_RANGE% %NOT_INCREASE_VER%
if %COMPILE_RANGE%=="" (
MSBuild.exe "%~dp0\device\scanner.vcxproj" /p:Configuration=Release /p:Platform=x86
MSBuild.exe "%~dp0\sane\sane.vcxproj" /p:Configuration=Release /p:Platform=x86
diff --git a/build_all.bat b/build_all.bat
index e423dd6..e92804f 100644
--- a/build_all.bat
+++ b/build_all.bat
@@ -11,29 +11,29 @@ if "%1"=="nov" (
if "%OEM%"=="hw" (
build.bat hw x86 0x1000 %NOV%
-build.bat hw onlytwain 0x1002 %NOV%
-build.bat hw onlytwain 0x7000 %NOV%
-build.bat hw onlytwain 0x7002 %NOV%
-build.bat hw onlytwain 0x7039 %NOV%
-build.bat hw onlytwain 0x8000 %NOV%
-build.bat hw onlytwain 0x9000 %NOV%
+build.bat hw onlytwain 0x1002 nov
+build.bat hw onlytwain 0x7000 nov
+build.bat hw onlytwain 0x7002 nov
+build.bat hw onlytwain 0x7039 nov
+build.bat hw onlytwain 0x8000 nov
+build.bat hw onlytwain 0x9000 nov
) else if "%OEM%" == "lsc" (
build.bat lsc x86 0x8200 %NOV%
-build.bat lsc onlytwain 0x8420 %NOV%
-build.bat lsc onlytwain 0x8429 %NOV%
-build.bat lsc onlytwain 0x8520 %NOV%
-build.bat lsc onlytwain 0x8529 %NOV%
-build.bat lsc onlytwain 0x8620 %NOV%
-build.bat lsc onlytwain 0x8629 %NOV%
-build.bat lsc onlytwain 0x8730 %NOV%
-build.bat lsc onlytwain 0x8739 %NOV%
+build.bat lsc onlytwain 0x8420 nov
+build.bat lsc onlytwain 0x8429 nov
+build.bat lsc onlytwain 0x8520 nov
+build.bat lsc onlytwain 0x8529 nov
+build.bat lsc onlytwain 0x8620 nov
+build.bat lsc onlytwain 0x8629 nov
+build.bat lsc onlytwain 0x8730 nov
+build.bat lsc onlytwain 0x8739 nov
) else (
build.bat x86 0x100 %NOV%
-build.bat onlytwain 0x200 %NOV%
-build.bat onlytwain 0x300 %NOV%
-build.bat onlytwain 0x400 %NOV%
-build.bat onlytwain 0x139 %NOV%
-build.bat onlytwain 0x239 %NOV%
-build.bat onlytwain 0x439 %NOV%
-build.bat onlytwain 0x402 %NOV%
+build.bat onlytwain 0x200 nov
+build.bat onlytwain 0x300 nov
+build.bat onlytwain 0x400 nov
+build.bat onlytwain 0x139 nov
+build.bat onlytwain 0x239 nov
+build.bat onlytwain 0x439 nov
+build.bat onlytwain 0x402 nov
)
diff --git a/device/scanner.rc b/device/scanner.rc
index f04662f..ba7e981 100644
--- a/device/scanner.rc
+++ b/device/scanner.rc
@@ -51,8 +51,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,1030,2022,7271
- PRODUCTVERSION 4,1030,2022,7271
+ FILEVERSION 4,1032,2022,7281
+ PRODUCTVERSION 4,1032,2022,7281
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -69,12 +69,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Äþ²¨»ª¸ßÐÅÏ¢¿Æ¼¼ÓÐÏÞ¹«Ë¾"
VALUE "FileDescription", "»ª¸ßɨÃèÒÇÓ¦ÓóÌÐò"
- VALUE "FileVersion", "4.1030.2022.7271"
+ VALUE "FileVersion", "4.1032.2022.7281"
VALUE "InternalName", "scanner.dll"
VALUE "LegalCopyright", "Copyright (C) 2022"
VALUE "OriginalFilename", "scanner.dll"
VALUE "ProductName", "HUAGOScan"
- VALUE "ProductVersion", "4.1030.2022.7271"
+ VALUE "ProductVersion", "4.1032.2022.7281"
END
END
BLOCK "VarFileInfo"
diff --git a/device/scanner.vcxproj b/device/scanner.vcxproj
index e71fa37..1c0adda 100644
--- a/device/scanner.vcxproj
+++ b/device/scanner.vcxproj
@@ -119,11 +119,12 @@
- mkdir $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)
+ set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)\..\oem\huagao
+mkdir %FINAL_DIR%
copy "$(TargetPath)" "$(SolutionDir)..\..\release\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(ProjectName).exp" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(ProjectName).lib" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(ProjectName).pdb" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
+move /Y "$(OutDirFullPath)$(ProjectName).exp" "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(ProjectName).lib" "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
@@ -151,10 +152,11 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "$(SolutionDir)..\..\sdk\lib\win\$
- mkdir $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)
-move /Y "$(OutDirFullPath)$(ProjectName).exp" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(ProjectName).lib" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(ProjectName).pdb" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
+ set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)\..\oem\huagao
+mkdir %FINAL_DIR%
+move /Y "$(OutDirFullPath)$(ProjectName).exp" "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(ProjectName).lib" "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
@@ -174,10 +176,12 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "$(SolutionDir)..\..\sdk\lib\win\$
opencv_world3414.lib;IlmImf.lib;ittnotify.lib;leptonica.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libtiff.lib;libwebp.lib;log4cplusS.lib;quirc.lib;tiff.lib;zlib.lib;user32.lib
- mkdir $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)
-move /Y "$(OutDirFullPath)$(ProjectName).exp" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(ProjectName).lib" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(ProjectName).pdb" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
+ set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)\..\oem\huagao
+mkdir %FINAL_DIR%
+copy "$(TargetPath)" "$(SolutionDir)..\..\release\win\$(PlatformTarget)\$(Configuration)"
+move /Y "$(OutDirFullPath)$(ProjectName).exp" "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(ProjectName).lib" "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
@@ -201,10 +205,11 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "$(SolutionDir)..\..\sdk\lib\win\$
opencv_world3414.lib;IlmImf.lib;ittnotify.lib;leptonica.lib;libjasper.lib;libjpeg-turbo.lib;libpng.lib;libtiff.lib;libwebp.lib;log4cplusS.lib;quirc.lib;tiff.lib;zlib.lib;user32.lib
- mkdir $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)
-move /Y "$(OutDirFullPath)$(ProjectName).exp" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(ProjectName).lib" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(ProjectName).pdb" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
+ set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)\..\oem\huagao
+mkdir %FINAL_DIR%
+move /Y "$(OutDirFullPath)$(ProjectName).exp" "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(ProjectName).lib" "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
diff --git a/sane/sane.rc b/sane/sane.rc
index 10aaee5..a0452c9 100644
--- a/sane/sane.rc
+++ b/sane/sane.rc
@@ -248,8 +248,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,1030,2022,7271
- PRODUCTVERSION 4,1030,2022,7271
+ FILEVERSION 4,1032,2022,7281
+ PRODUCTVERSION 4,1032,2022,7281
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -266,12 +266,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Äþ²¨»ª¸ßÐÅÏ¢¿Æ¼¼ÓÐÏÞ¹«Ë¾"
VALUE "FileDescription", "»ª¸ßɨÃèÒÇÓ¦ÓóÌÐò"
- VALUE "FileVersion", "4.1030.2022.7271"
+ VALUE "FileVersion", "4.1032.2022.7281"
VALUE "InternalName", "sane.dll"
VALUE "LegalCopyright", "Copyright (C) 2022"
VALUE "OriginalFilename", "sane.dll"
VALUE "ProductName", "HUAGOScan"
- VALUE "ProductVersion", "4.1030.2022.7271"
+ VALUE "ProductVersion", "4.1032.2022.7281"
END
END
BLOCK "VarFileInfo"
diff --git a/sane/sane.vcxproj b/sane/sane.vcxproj
index 2fde2bf..ef17d2f 100644
--- a/sane/sane.vcxproj
+++ b/sane/sane.vcxproj
@@ -74,14 +74,14 @@
true
$(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\include\;$(IncludePath)
- $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\;$(LibraryPath)
+ $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\;$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\OEM\huagao;$(LibraryPath)
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\
false
$(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\include\;$(IncludePath)
- $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\;$(LibraryPath)
+ $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\;$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\OEM\huagao;$(LibraryPath)
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\
@@ -90,14 +90,14 @@
$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
$(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\include\;$(IncludePath)
- $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\;$(LibraryPath)
+ $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\;$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\OEM\huagao;$(LibraryPath)
false
$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
$(SolutionDir)..\..\sdk\include;$(SolutionDir)..\..\code_device\include\;$(IncludePath)
- $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\;$(LibraryPath)
+ $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\;$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\OEM\huagao;$(LibraryPath)
@@ -115,11 +115,12 @@
$(ProjectDir)sane.def
- mkdir $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)
+ set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)\..\oem\huagao
+mkdir %FINAL_DIR%
copy "$(TargetPath)" "$(SolutionDir)..\..\release\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(ProjectName).exp" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(ProjectName).lib" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(ProjectName).pdb" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
+move /Y "$(OutDirFullPath)$(ProjectName).exp" "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(ProjectName).lib" "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
@@ -143,10 +144,11 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "$(SolutionDir)..\..\sdk\lib\win\$
$(ProjectDir)sane.def
- mkdir $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)
-move /Y "$(OutDirFullPath)$(ProjectName).exp" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(ProjectName).lib" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(ProjectName).pdb" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
+ set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)\..\oem\huagao
+mkdir %FINAL_DIR%
+move /Y "$(OutDirFullPath)$(ProjectName).exp" "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(ProjectName).lib" "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
@@ -162,10 +164,12 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "$(SolutionDir)..\..\sdk\lib\win\$
true
- mkdir $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)
-move /Y "$(OutDirFullPath)$(ProjectName).exp" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(ProjectName).lib" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(ProjectName).pdb" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
+ set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)\..\oem\huagao
+mkdir %FINAL_DIR%
+copy "$(TargetPath)" "$(SolutionDir)..\..\release\win\$(PlatformTarget)\$(Configuration)"
+move /Y "$(OutDirFullPath)$(ProjectName).exp" "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(ProjectName).lib" "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
@@ -185,10 +189,11 @@ move /Y "$(OutDirFullPath)$(ProjectName).pdb" "$(SolutionDir)..\..\sdk\lib\win\$
true
- mkdir $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)
-move /Y "$(OutDirFullPath)$(ProjectName).exp" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(ProjectName).lib" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(ProjectName).pdb" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
+ set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)\..\oem\huagao
+mkdir %FINAL_DIR%
+move /Y "$(OutDirFullPath)$(ProjectName).exp" "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(ProjectName).lib" "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(ProjectName).pdb" "%FINAL_DIR%"
diff --git a/sln/Release/hgsetver.exe b/sln/Release/hgsetver.exe
index 005bfa8..023feed 100644
Binary files a/sln/Release/hgsetver.exe and b/sln/Release/hgsetver.exe differ
diff --git a/sln/hgsetver/hgsetver.cpp b/sln/hgsetver/hgsetver.cpp
index d9b641b..2feecde 100644
--- a/sln/hgsetver/hgsetver.cpp
+++ b/sln/hgsetver/hgsetver.cpp
@@ -245,13 +245,13 @@ static bool change_build(std::wstring& brand, int build)
{
wchar_t ver[20] = { 0 };
int next = 0,
- bgn = find_line(brand, L"#define VERSION_BUILD", &next);
+ bgn = find_line(brand, L"#define VERSION_BUILD1", &next);
bool ret = false;
swprintf_s(ver, _countof(ver) - 1, L"%d\r\n", build);
if (bgn >= 0)
{
- bgn += lstrlenW(L"#define VERSION_BUILD");
+ bgn += lstrlenW(L"#define VERSION_BUILD1");
while (brand[bgn] == L'\t' || brand[bgn] == L' ')
bgn++;
if (brand[bgn] >= L'0' && brand[bgn] <= L'9')
@@ -262,7 +262,7 @@ static bool change_build(std::wstring& brand, int build)
}
if (!ret)
- std::wcout << L" change VERSION_BUILD to '" << ver << L"+' failed.\r\n";
+ std::wcout << L" change VERSION_BUILD1 to '" << ver << L"+' failed.\r\n";
return ret;
}
@@ -393,7 +393,7 @@ namespace rc
*v2 = _wtoi(cont.c_str() + bgn);
}
- tag = L"#define VERSION_BUILD";
+ tag = L"#define VERSION_BUILD1";
if (v3)
{
bgn = find_line(cont, tag.c_str(), &end);
@@ -614,6 +614,93 @@ namespace rc
return ret;
}
+ static void change_post_command_dir(std::wstring& cont, const std::wstring& o)
+ {
+ std::wstring target(L"\\$(Configuration)");
+ size_t pos = cont.find(target);
+
+ if (pos != std::wstring::npos)
+ {
+ pos += target.length();
+
+ size_t end = cont.find(L"\"", pos);
+ if (cont.find(L"\r\n", pos) < end)
+ end = cont.find(L"\r\n", pos);
+ if (end == std::wstring::npos)
+ end = cont.length();
+ cont.replace(pos, end - pos, L"\\..\\oem\\" + o);
+ }
+ }
+ static void change_post_lib_dir(std::wstring& cont, const std::wstring& o)
+ {
+ std::wstring target(L"\\OEM");
+ size_t pos = cont.find(target);
+
+ if (pos != std::wstring::npos)
+ {
+ pos += target.length();
+
+ size_t end = cont.find(L";", pos);
+ if (cont.find(L"", pos) < end)
+ end = cont.find(L"", pos);
+ if (end == std::wstring::npos)
+ end = cont.length();
+ cont.replace(pos, end - pos, L"\\" + o);
+ }
+ }
+
+ bool __stdcall change_lib_outdir(std::wstring& cont, oem o)
+ {
+ std::wstring first(L""), end(L""), post(L""), os(L"huagao");
+ size_t bgn = cont.find(first), len = cont.find(end);
+
+ if (o == OEM_HANWANG)
+ os = L"hanvon";
+ else if (o == OEM_LISICHENG)
+ os = L"lanxum";
+
+ while (len > bgn)
+ {
+ bgn += first.length();
+ len -= bgn;
+ post = cont.substr(bgn, len);
+
+ change_post_command_dir(post, os);
+
+ cont.replace(bgn, len, post);
+ bgn += post.length() + end.length();
+ bgn = cont.find(first, bgn);
+ len = cont.find(end, bgn);
+ }
+
+ return true;
+ }
+ bool __stdcall change_lib_indir(std::wstring& cont, oem o)
+ {
+ std::wstring first(L""), end(L""), post(L""), os(L"huagao");
+ size_t bgn = cont.find(first), len = cont.find(end);
+
+ if (o == OEM_HANWANG)
+ os = L"hanvon";
+ else if (o == OEM_LISICHENG)
+ os = L"lanxum";
+
+ while (len > bgn)
+ {
+ bgn += first.length();
+ len -= bgn;
+ post = cont.substr(bgn, len);
+
+ change_post_lib_dir(post, os);
+
+ cont.replace(bgn, len, post);
+ bgn += post.length() + end.length();
+ bgn = cont.find(first, bgn);
+ len = cont.find(end, bgn);
+ }
+
+ return true;
+ }
bool set_rc_ver(const wchar_t* file, int v_1, int v_2, int v_3, int v_4, const wchar_t* company_name, const wchar_t* short_company_name, const wchar_t* vender)
{
@@ -794,6 +881,8 @@ namespace rc
}
change_out_dir(cont, o);
+ change_lib_outdir(cont, o);
+ change_lib_indir(cont, o);
std::string bomstr("");
if (bm == BOM_UNICODE)
@@ -940,6 +1029,7 @@ namespace rc
if (ok && param->change_out_dir)
ok = change_out_dir(cont, param->o);
+ change_lib_outdir(cont, param->o);
return ok;
}
@@ -1012,6 +1102,8 @@ static bool set_ver(const wchar_t* file, oem vendor, bool x86, int pid, int main
param.o = vendor;
param.product_id = pid;
STR_PARENT_FOLDER(base);
+ base += L"\\..\\..\\..\\code_twain\\twain";
+ STR_TO_ABSOLUTE_PATH(base);
if (rc::get_version_from_file(file, &main, &sub, &build, &patch, &cn, &scn, &vs))
{
if (!twain_only)
diff --git a/twain/brand.h b/twain/brand.h
deleted file mode 100644
index 6133be8..0000000
--- a/twain/brand.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-
-// Definitions for all versions ...
-//
-//
-
-#define OEM_NONE
-#define VERSION_MAIN 4
-#define VERSION_SUB 1030
-#define VERSION_BUILD 2022
-#define VERSION_PATCH 7271
-
-#define TO_STR(a) #a
-#define TO_VER_STR(vs) TO_STR(v##vs)
-#define VERSION_STR(a, b, c, d) TO_VER_STR(a.b.c.d)
-
-#define PRODUCT_ID 239
-#define MAKE_PID(pid) 0x##pid
-#define PASTE_DEF(a, b) a##b
-#define FINAL_STR(a, b, c) TO_STR(a##b##c)
-#define MAKE_NAME(pid) FULL_NAME(PASTE_DEF(G, pid))
-#define FULL_FAMILY(a) FINAL_STR(a, \x20, Series)
-#define MAKE_FAMILY(pid) FULL_FAMILY(PASTE_DEF(G, pid))
-
-#ifdef OEM_HANWANG
-
-#define OEM_NAME L"\u6C49\u738B\u79D1\u6280\u80A1\u4EFD\u6709\u9650\u516C\u53F8"
-#define OEM_SHORT_NAME L"\u6c49\u738b"
-#define FULL_NAME(a) FINAL_STR(HANVONSCAN\x20, a, \x20TWAIN)
-#define PRODUCT_VID 0x2903
-#define PRODUCT_VENDOR "Hanvon"
-
-#elif defined(OEM_LISICHENG)
-
-#define OEM_NAME L"\u5317\u4EAC\u7ACB\u601D\u8FB0\u8BA1\u7B97\u673A\u6280\u672F\u6709\u9650\u516C\u53F8"
-#define OEM_SHORT_NAME L"\u7acb\u601d\u8fb0"
-#define FULL_NAME(a) FINAL_STR(LANXUMSCAN\x20, a, \x20TWAIN)
-#define PRODUCT_VID 0x31c9
-#define PRODUCT_VENDOR "Lanxum"
-
-#else
-
-#define OEM_NAME L"\u5B81\u6CE2\u534E\u9AD8\u4FE1\u606F\u79D1\u6280\u6709\u9650\u516C\u53F8"
-#define OEM_SHORT_NAME L"\u534e\u9ad8"
-#define FULL_NAME(a) FINAL_STR(HUAGOSCAN\x20, a, \x20TWAIN)
-#define PRODUCT_VID 0x3072
-#define PRODUCT_VENDOR "HUAGO"
-
-#endif
-
-
-#define PRODUCT_PID MAKE_PID(PRODUCT_ID)
-#define PRODUCT_FAMILY MAKE_FAMILY(PRODUCT_ID)
-#define PRODUCT_NAME MAKE_NAME(PRODUCT_ID)
diff --git a/twain/twain.vcxproj b/twain/twain.vcxproj
index c44c49e..671de31 100644
--- a/twain/twain.vcxproj
+++ b/twain/twain.vcxproj
@@ -49,7 +49,7 @@
$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
$(LibraryPath)
- huagaotwain239.ds
+ huagaotwain402.ds
false
@@ -57,7 +57,7 @@
$(SolutionDir)..\..\release\win\$(PlatformTarget)\OEM\huagao\
$(SolutionDir)..\..\tmp\$(PlatformTarget)\$(Configuration)\$(ProjectName)\
$(LibraryPath)
- huagaotwain239.ds
+ huagaotwain402.ds
@@ -78,10 +78,11 @@
- mkdir $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)
-move /Y "$(OutDirFullPath)$(TargetName).exp" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(TargetName).lib" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(TargetName).pdb" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
+ set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)\..\oem\huagao
+mkdir "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(TargetName).exp" "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(TargetName).lib" "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(TargetName).pdb" "%FINAL_DIR%"
move /Y "$(TargetPath)" "$(OutDirFullPath)$(TargetName)"
copy "$(OutDirFullPath)$(TargetName)" "$(WinDir)\twain_32\HuaGoScan" /y
@@ -108,16 +109,17 @@ copy "$(OutDirFullPath)$(TargetName)" "$(WinDir)\twain_32\HuaGoScan" /y
- mkdir $(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)
-move /Y "$(OutDirFullPath)$(TargetName).exp" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(TargetName).lib" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
-move /Y "$(OutDirFullPath)$(TargetName).pdb" "$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)"
+ set FINAL_DIR=$(SolutionDir)..\..\sdk\lib\win\$(PlatformTarget)\$(Configuration)\..\oem\huagao
+mkdir "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(TargetName).exp" "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(TargetName).lib" "%FINAL_DIR%"
+move /Y "$(OutDirFullPath)$(TargetName).pdb" "%FINAL_DIR%"
move /Y "$(TargetPath)" "$(OutDirFullPath)$(TargetName)"
+
-
diff --git a/twain/twain.vcxproj.filters b/twain/twain.vcxproj.filters
index 10ebab4..5d8a932 100644
--- a/twain/twain.vcxproj.filters
+++ b/twain/twain.vcxproj.filters
@@ -171,7 +171,7 @@
Headers
-
+
Headers
diff --git a/twain/twain/huagaods.cpp b/twain/twain/huagaods.cpp
index d618be8..7a61d95 100644
--- a/twain/twain/huagaods.cpp
+++ b/twain/twain/huagaods.cpp
@@ -577,10 +577,10 @@ float trans_range(float val, float min_from, float max_from, float min_to, float
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// huagao_ds ...
-#include "../brand.h"
+#include "../../../sdk/include/huagao/brand.h"
static Identity* srcIdent = new Identity(
- Version(VERSION_MAIN, VERSION_SUB, Language::English, Country::China, VERSION_STR(VERSION_MAIN, VERSION_SUB, VERSION_BUILD, VERSION_PATCH)),
+ Version(VERSION_MAIN, VERSION_SUB, Language::English, Country::China, VERSION_STR(VERSION_MAIN, VERSION_SUB, VERSION_BUILD1, VERSION_PATCH)),
DataGroup::Image, PRODUCT_VENDOR, PRODUCT_FAMILY, PRODUCT_NAME);
static const SCANNERID scanner_guid = MAKE_SCANNER_ID(PRODUCT_PID, PRODUCT_VID);