From ee355587eda9929e2f17ef25b762093ff5a1f929 Mon Sep 17 00:00:00 2001 From: gb <741021719@qq.com> Date: Fri, 20 Oct 2023 11:31:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=94=B9=E5=90=8D=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E8=B0=83=E6=95=B4=E7=89=88=E6=9C=AC=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sln/Release/hgsetver.exe | Bin 84992 -> 84992 bytes sln/hgsetver/hgsetver.cpp | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sln/Release/hgsetver.exe b/sln/Release/hgsetver.exe index d0a612a638258b949e6535902451f94b0c26b859..f3eacc5099176ed928d8c58e91c5f8478e0a825f 100644 GIT binary patch delta 6131 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 n@|Zn&o=T6+sYXMOeZe9Hd-TE!bQ diff --git a/sln/hgsetver/hgsetver.cpp b/sln/hgsetver/hgsetver.cpp index 8d68f93..80fda1e 100644 --- a/sln/hgsetver/hgsetver.cpp +++ b/sln/hgsetver/hgsetver.cpp @@ -1373,12 +1373,12 @@ static bool set_ver(const wchar_t* file, oem vendor, bool x86, int pid, int main //if (!rc::change_vcxproj_predefine(rcf.c_str(), vendor)) // std::wcout << "change predefines failed: " << rcf.c_str() << std::endl; - rcf = base + L"\\..\\sane\\sane.rc"; + rcf = base + L"\\..\\sane\\sanexy.rc"; STR_SIMPLIFY_PATH(rcf); if (!rc::set_rc_ver(rcf.c_str(), main, sub, build, patch, cn.c_str(), scn.c_str(), vs.c_str())) std::wcout << "change version failed: " << rcf.c_str() << std::endl; - rcf = base + L"\\..\\sane\\sane.def"; + rcf = base + L"\\..\\sane\\sanexy.def"; STR_SIMPLIFY_PATH(rcf); if (!rc::change_file(rcf.c_str(), ¶m, rc::change_sane_def)) std::wcout << "change exporting-definition failed: " << rcf.c_str() << std::endl; @@ -1388,7 +1388,7 @@ static bool set_ver(const wchar_t* file, oem vendor, bool x86, int pid, int main //if (!rc::change_vcxproj_predefine(rcf.c_str(), vendor)) // std::wcout << "change predefines failed: " << rcf.c_str() << std::endl; - rcf = base + L"\\..\\device\\scanner.rc"; + rcf = base + L"\\..\\device\\scannerqd.rc"; STR_SIMPLIFY_PATH(rcf); if (!rc::set_rc_ver(rcf.c_str(), main, sub, build, patch, cn.c_str(), scn.c_str(), vs.c_str())) std::wcout << "change version failed: " << rcf.c_str() << std::endl;