From 872d6ab93767d146554ff86705ff03404fd5c7bc Mon Sep 17 00:00:00 2001 From: YX Hao Date: Fri, 2 Feb 2024 22:14:49 +0800 Subject: [PATCH] change .gitattributes encoding UTF-16 to UTF-8 and set it for lang files For UTF-16, git converts back to UTF-16BE BOM, but MSVC silently takes it. MSVC compiler recognizes UTF-8 BOM. VS2022 stores UTF-8 rc file with `#pragma` instead of BOM. --- .gitattributes | 7 ++++--- src/Resources/grepWin.rc | 2 ++ src/Resources/grepWin.rc2 | 2 +- src/resource.h | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitattributes b/.gitattributes index bc5f4b90..7fe29640 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,3 +1,4 @@ -/src/Resources/grepWin.rc2 text working-tree-encoding=UTF-16 -/src/Resources/grepWin.rc text working-tree-encoding=UTF-16 -/src/resource.h text working-tree-encoding=UTF-16 +/src/Resources/grepWin.rc text working-tree-encoding=UTF-8 +/src/Resources/grepWin.rc2 text working-tree-encoding=UTF-8 +/src/resource.h text working-tree-encoding=UTF-8 +/translations/*.lang text working-tree-encoding=UTF-8 diff --git a/src/Resources/grepWin.rc b/src/Resources/grepWin.rc index fcb2a553..cab48128 100644 --- a/src/Resources/grepWin.rc +++ b/src/Resources/grepWin.rc @@ -1,5 +1,7 @@ // Microsoft Visual C++ generated resource script. // +#pragma code_page(65001) + #include "..\resource.h" #define APSTUDIO_READONLY_SYMBOLS diff --git a/src/Resources/grepWin.rc2 b/src/Resources/grepWin.rc2 index 0ef9ec23..84cecc22 100644 --- a/src/Resources/grepWin.rc2 +++ b/src/Resources/grepWin.rc2 @@ -1,4 +1,4 @@ -// +// // grepWin.rc2 - resources Microsoft Visual C++ does not edit directly // diff --git a/src/resource.h b/src/resource.h index 5a83e0f7..36058777 100644 --- a/src/resource.h +++ b/src/resource.h @@ -1,4 +1,4 @@ -//{{NO_DEPENDENCIES}} +//{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by D:\Development\grepWin\src\Resources\grepWin.rc //