From 9d8790bddad6871eacc2984f32c9a355e7bb3083 Mon Sep 17 00:00:00 2001
From: crazyZhang <917724035@qq.com>
Date: Sat, 15 Feb 2020 19:17:36 +0800
Subject: [PATCH] [misc] fix VS2019 compilation for non western locales
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* VS2019 produces C2001 when compiling ext2fs due to the /utf-8 option
being missing → Add it.
* Closes #1456
---
.vs/ext2fs.vcxproj | 1 +
src/rufus.rc | 10 +++++-----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.vs/ext2fs.vcxproj b/.vs/ext2fs.vcxproj
index 3ff9300e..87de4579 100644
--- a/.vs/ext2fs.vcxproj
+++ b/.vs/ext2fs.vcxproj
@@ -324,6 +324,7 @@
..\src;..\src\msvc-missing
CompileAsC
4018;4146;4244;4267;4996
+ /utf-8 %(AdditionalOptions)
true
diff --git a/src/rufus.rc b/src/rufus.rc
index f0a9b6f3..14090df2 100644
--- a/src/rufus.rc
+++ b/src/rufus.rc
@@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES
-CAPTION "Rufus 3.9.1613"
+CAPTION "Rufus 3.9.1614"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@@ -394,8 +394,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,9,1613,0
- PRODUCTVERSION 3,9,1613,0
+ FILEVERSION 3,9,1614,0
+ PRODUCTVERSION 3,9,1614,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -413,13 +413,13 @@ BEGIN
VALUE "Comments", "https://rufus.ie"
VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus"
- VALUE "FileVersion", "3.9.1613"
+ VALUE "FileVersion", "3.9.1614"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
VALUE "OriginalFilename", "rufus-3.9.exe"
VALUE "ProductName", "Rufus"
- VALUE "ProductVersion", "3.9.1613"
+ VALUE "ProductVersion", "3.9.1614"
END
END
BLOCK "VarFileInfo"