From 7e21f8a60c8d508fef62a13c32e5cb1849dd0757 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Tue, 12 Mar 2019 20:15:57 +0000 Subject: [PATCH] [misc] add /utf-8 to MSVC compiler options * Closes #1277 --- .vs/bled.vcxproj | 8 ++++++++ .vs/getopt.vcxproj | 8 ++++++++ .vs/libcdio-driver.vcxproj | 8 ++++++++ .vs/libcdio-iso9660.vcxproj | 8 ++++++++ .vs/libcdio-udf.vcxproj | 8 ++++++++ .vs/ms-sys.vcxproj | 12 ++++++++---- .vs/rufus.vcxproj | 8 ++++++++ .vs/syslinux-libfat.vcxproj | 8 ++++++++ .vs/syslinux-libinstaller.vcxproj | 8 ++++++++ .vs/syslinux-win.vcxproj | 8 ++++++++ src/rufus.rc | 10 +++++----- 11 files changed, 85 insertions(+), 9 deletions(-) diff --git a/.vs/bled.vcxproj b/.vs/bled.vcxproj index bca4b65a..97fd5bdd 100644 --- a/.vs/bled.vcxproj +++ b/.vs/bled.vcxproj @@ -161,6 +161,7 @@ MultiThreadedDebug ..\src CompileAsC + /utf-8 %(AdditionalOptions) true @@ -179,6 +180,7 @@ _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) MultiThreadedDebug ..\src + /utf-8 %(AdditionalOptions) true @@ -197,6 +199,7 @@ _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) MultiThreadedDebug ..\src + /utf-8 %(AdditionalOptions) true @@ -216,6 +219,7 @@ MultiThreadedDebug ..\src CompileAsC + /utf-8 %(AdditionalOptions) true @@ -232,6 +236,7 @@ MultiThreaded ..\src CompileAsC + /utf-8 %(AdditionalOptions) true @@ -250,6 +255,7 @@ _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) MultiThreaded ..\src + /utf-8 %(AdditionalOptions) true @@ -268,6 +274,7 @@ _OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) MultiThreaded ..\src + /utf-8 %(AdditionalOptions) true @@ -286,6 +293,7 @@ MultiThreaded ..\src CompileAsC + /utf-8 %(AdditionalOptions) true diff --git a/.vs/getopt.vcxproj b/.vs/getopt.vcxproj index d44cffe5..0db9725c 100644 --- a/.vs/getopt.vcxproj +++ b/.vs/getopt.vcxproj @@ -126,6 +126,7 @@ 28252;28253 Disabled CompileAsC + /utf-8 %(AdditionalOptions) true @@ -139,6 +140,7 @@ Level3 ProgramDatabase 28252;28253 + /utf-8 %(AdditionalOptions) true @@ -152,6 +154,7 @@ Level3 ProgramDatabase 28252;28253 + /utf-8 %(AdditionalOptions) true @@ -169,6 +172,7 @@ 28252;28253 Disabled CompileAsC + /utf-8 %(AdditionalOptions) true @@ -182,6 +186,7 @@ Level3 28252;28253 CompileAsC + /utf-8 %(AdditionalOptions) true @@ -194,6 +199,7 @@ MultiThreaded Level3 28252;28253 + /utf-8 %(AdditionalOptions) true @@ -206,6 +212,7 @@ MultiThreaded Level3 28252;28253 + /utf-8 %(AdditionalOptions) true @@ -221,6 +228,7 @@ Level3 28252;28253 CompileAsC + /utf-8 %(AdditionalOptions) true diff --git a/.vs/libcdio-driver.vcxproj b/.vs/libcdio-driver.vcxproj index 82a876f9..39cd542e 100644 --- a/.vs/libcdio-driver.vcxproj +++ b/.vs/libcdio-driver.vcxproj @@ -165,6 +165,7 @@ MultiThreadedDebug ProgramDatabase CompileAsC + /utf-8 %(AdditionalOptions) Windows @@ -184,6 +185,7 @@ ..\src;..\src\libcdio;..\src\msvc-missing;%(AdditionalIncludeDirectories) MultiThreadedDebug ProgramDatabase + /utf-8 %(AdditionalOptions) Windows @@ -201,6 +203,7 @@ ..\src;..\src\libcdio;..\src\msvc-missing;%(AdditionalIncludeDirectories) MultiThreadedDebug ProgramDatabase + /utf-8 %(AdditionalOptions) Windows @@ -216,6 +219,7 @@ MultiThreaded ProgramDatabase CompileAsC + /utf-8 %(AdditionalOptions) MachineX86 @@ -232,6 +236,7 @@ ..\src;..\src\libcdio;..\src\msvc-missing;%(AdditionalIncludeDirectories) MultiThreaded ProgramDatabase + /utf-8 %(AdditionalOptions) @@ -246,6 +251,7 @@ ..\src;..\src\libcdio;..\src\msvc-missing;%(AdditionalIncludeDirectories) MultiThreaded ProgramDatabase + /utf-8 %(AdditionalOptions) @@ -258,6 +264,7 @@ MultiThreadedDebug ProgramDatabase CompileAsC + /utf-8 %(AdditionalOptions) Windows @@ -275,6 +282,7 @@ MultiThreaded ProgramDatabase CompileAsC + /utf-8 %(AdditionalOptions) Windows diff --git a/.vs/libcdio-iso9660.vcxproj b/.vs/libcdio-iso9660.vcxproj index f7113c13..e70d1942 100644 --- a/.vs/libcdio-iso9660.vcxproj +++ b/.vs/libcdio-iso9660.vcxproj @@ -157,6 +157,7 @@ MultiThreadedDebug ProgramDatabase CompileAsC + /utf-8 %(AdditionalOptions) Windows @@ -176,6 +177,7 @@ ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) MultiThreadedDebug ProgramDatabase + /utf-8 %(AdditionalOptions) Windows @@ -193,6 +195,7 @@ ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) MultiThreadedDebug ProgramDatabase + /utf-8 %(AdditionalOptions) Windows @@ -208,6 +211,7 @@ MultiThreaded ProgramDatabase CompileAsC + /utf-8 %(AdditionalOptions) MachineX86 @@ -224,6 +228,7 @@ ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) MultiThreaded ProgramDatabase + /utf-8 %(AdditionalOptions) @@ -238,6 +243,7 @@ ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) MultiThreaded ProgramDatabase + /utf-8 %(AdditionalOptions) @@ -250,6 +256,7 @@ MultiThreadedDebug ProgramDatabase CompileAsC + /utf-8 %(AdditionalOptions) Windows @@ -267,6 +274,7 @@ MultiThreaded ProgramDatabase CompileAsC + /utf-8 %(AdditionalOptions) Windows diff --git a/.vs/libcdio-udf.vcxproj b/.vs/libcdio-udf.vcxproj index c3b0b20c..57a4b7e3 100644 --- a/.vs/libcdio-udf.vcxproj +++ b/.vs/libcdio-udf.vcxproj @@ -151,6 +151,7 @@ MultiThreadedDebug ProgramDatabase CompileAsC + /utf-8 %(AdditionalOptions) Windows @@ -170,6 +171,7 @@ ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) MultiThreadedDebug ProgramDatabase + /utf-8 %(AdditionalOptions) Windows @@ -187,6 +189,7 @@ ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) MultiThreadedDebug ProgramDatabase + /utf-8 %(AdditionalOptions) Windows @@ -202,6 +205,7 @@ MultiThreaded ProgramDatabase CompileAsC + /utf-8 %(AdditionalOptions) MachineX86 @@ -218,6 +222,7 @@ ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) MultiThreaded ProgramDatabase + /utf-8 %(AdditionalOptions) @@ -232,6 +237,7 @@ ..\src;..\src\libcdio;..\src\libcdio\driver;..\src\msvc-missing;%(AdditionalIncludeDirectories) MultiThreaded ProgramDatabase + /utf-8 %(AdditionalOptions) @@ -244,6 +250,7 @@ MultiThreadedDebug ProgramDatabase CompileAsC + /utf-8 %(AdditionalOptions) Windows @@ -261,6 +268,7 @@ MultiThreaded ProgramDatabase CompileAsC + /utf-8 %(AdditionalOptions) Windows diff --git a/.vs/ms-sys.vcxproj b/.vs/ms-sys.vcxproj index a044749d..ead1e5ac 100644 --- a/.vs/ms-sys.vcxproj +++ b/.vs/ms-sys.vcxproj @@ -193,6 +193,7 @@ ProgramDatabase 28252;28253 CompileAsC + /utf-8 %(AdditionalOptions) Windows @@ -212,7 +213,7 @@ ..\src\ms-sys\inc;%(AdditionalIncludeDirectories) MultiThreadedDebug ProgramDatabase - /analyze:stacksize32850 %(AdditionalOptions) + /analyze:stacksize32850 /utf-8 %(AdditionalOptions) 28252;28253 @@ -231,7 +232,7 @@ ..\src\ms-sys\inc;%(AdditionalIncludeDirectories) MultiThreadedDebug ProgramDatabase - /analyze:stacksize32850 %(AdditionalOptions) + /analyze:stacksize32850 /utf-8 %(AdditionalOptions) 28252;28253 @@ -249,6 +250,7 @@ ProgramDatabase 28252;28253 CompileAsC + /utf-8 %(AdditionalOptions) MachineX86 @@ -265,7 +267,7 @@ ..\src\ms-sys\inc;%(AdditionalIncludeDirectories) MultiThreaded ProgramDatabase - /analyze:stacksize32850 %(AdditionalOptions) + /analyze:stacksize32850 /utf-8 %(AdditionalOptions) 28252;28253 @@ -281,7 +283,7 @@ ..\src\ms-sys\inc;%(AdditionalIncludeDirectories) MultiThreaded ProgramDatabase - /analyze:stacksize32850 %(AdditionalOptions) + /analyze:stacksize32850 /utf-8 %(AdditionalOptions) 28252;28253 @@ -296,6 +298,7 @@ ProgramDatabase 28252;28253 CompileAsC + /utf-8 %(AdditionalOptions) Windows @@ -314,6 +317,7 @@ ProgramDatabase 28252;28253 CompileAsC + /utf-8 %(AdditionalOptions) Windows diff --git a/.vs/rufus.vcxproj b/.vs/rufus.vcxproj index 370e4c20..b23e7d23 100644 --- a/.vs/rufus.vcxproj +++ b/.vs/rufus.vcxproj @@ -130,6 +130,7 @@ false 4091;28252;28253;%(DisableSpecificWarnings) Disabled + /utf-8 %(AdditionalOptions) advapi32.lib;comctl32.lib;comdlg32.lib;crypt32.lib;gdi32.lib;ole32.lib;setupapi.lib;shell32.lib;shlwapi.lib;wintrust.lib;psapi.lib;%(AdditionalDependencies) @@ -153,6 +154,7 @@ true false 4091;28252;28253;%(DisableSpecificWarnings) + /utf-8 %(AdditionalOptions) advapi32.lib;comctl32.lib;comdlg32.lib;crypt32.lib;gdi32.lib;ole32.lib;setupapi.lib;shell32.lib;shlwapi.lib;wintrust.lib;ole32.lib;advapi32.lib;gdi32.lib;shell32.lib;comdlg32.lib;%(AdditionalDependencies) @@ -178,6 +180,7 @@ true false 4091;28252;28253;%(DisableSpecificWarnings) + /utf-8 %(AdditionalOptions) advapi32.lib;comctl32.lib;comdlg32.lib;crypt32.lib;gdi32.lib;ole32.lib;setupapi.lib;shell32.lib;shlwapi.lib;wintrust.lib;ole32.lib;advapi32.lib;gdi32.lib;shell32.lib;comdlg32.lib;%(AdditionalDependencies) @@ -208,6 +211,7 @@ false 4091;28252;28253;%(DisableSpecificWarnings) Disabled + /utf-8 %(AdditionalOptions) advapi32.lib;comctl32.lib;comdlg32.lib;crypt32.lib;gdi32.lib;ole32.lib;setupapi.lib;shell32.lib;shlwapi.lib;wintrust.lib;psapi.lib;%(AdditionalDependencies) @@ -232,6 +236,7 @@ false 4091;28252;28253;%(DisableSpecificWarnings) NDEBUG + /utf-8 %(AdditionalOptions) advapi32.lib;comctl32.lib;comdlg32.lib;crypt32.lib;gdi32.lib;ole32.lib;setupapi.lib;shell32.lib;shlwapi.lib;wintrust.lib;psapi.lib;%(AdditionalDependencies) @@ -256,6 +261,7 @@ false 4091;28252;28253;%(DisableSpecificWarnings) NDEBUG + /utf-8 %(AdditionalOptions) advapi32.lib;comctl32.lib;comdlg32.lib;crypt32.lib;gdi32.lib;ole32.lib;setupapi.lib;shell32.lib;shlwapi.lib;wintrust.lib;ole32.lib;advapi32.lib;gdi32.lib;shell32.lib;comdlg32.lib;%(AdditionalDependencies) @@ -282,6 +288,7 @@ false 4091;28252;28253;%(DisableSpecificWarnings) NDEBUG + /utf-8 %(AdditionalOptions) advapi32.lib;comctl32.lib;comdlg32.lib;crypt32.lib;gdi32.lib;ole32.lib;setupapi.lib;shell32.lib;shlwapi.lib;wintrust.lib;ole32.lib;advapi32.lib;gdi32.lib;shell32.lib;comdlg32.lib;%(AdditionalDependencies) @@ -311,6 +318,7 @@ false 4091;28252;28253;%(DisableSpecificWarnings) NDEBUG + /utf-8 %(AdditionalOptions) advapi32.lib;comctl32.lib;comdlg32.lib;crypt32.lib;gdi32.lib;ole32.lib;setupapi.lib;shell32.lib;shlwapi.lib;wintrust.lib;psapi.lib;%(AdditionalDependencies) diff --git a/.vs/syslinux-libfat.vcxproj b/.vs/syslinux-libfat.vcxproj index cec54be3..6b8714ef 100644 --- a/.vs/syslinux-libfat.vcxproj +++ b/.vs/syslinux-libfat.vcxproj @@ -148,6 +148,7 @@ ProgramDatabase 4018;4244 CompileAsC + /utf-8 %(AdditionalOptions) Windows @@ -168,6 +169,7 @@ MultiThreadedDebug ProgramDatabase 4018;4244 + /utf-8 %(AdditionalOptions) Windows @@ -186,6 +188,7 @@ MultiThreadedDebug ProgramDatabase 4018;4244 + /utf-8 %(AdditionalOptions) Windows @@ -202,6 +205,7 @@ ProgramDatabase 4018;4244 CompileAsC + /utf-8 %(AdditionalOptions) MachineX86 @@ -219,6 +223,7 @@ MultiThreaded ProgramDatabase 4018;4244 + /utf-8 %(AdditionalOptions) @@ -234,6 +239,7 @@ MultiThreaded ProgramDatabase 4018;4244 + /utf-8 %(AdditionalOptions) @@ -247,6 +253,7 @@ ProgramDatabase 4018;4244 CompileAsC + /utf-8 %(AdditionalOptions) Windows @@ -265,6 +272,7 @@ ProgramDatabase 4018;4244 CompileAsC + /utf-8 %(AdditionalOptions) Windows diff --git a/.vs/syslinux-libinstaller.vcxproj b/.vs/syslinux-libinstaller.vcxproj index 680f522a..e12a94a9 100644 --- a/.vs/syslinux-libinstaller.vcxproj +++ b/.vs/syslinux-libinstaller.vcxproj @@ -148,6 +148,7 @@ ProgramDatabase 4244;4267 CompileAsC + /utf-8 %(AdditionalOptions) Windows @@ -168,6 +169,7 @@ MultiThreadedDebug ProgramDatabase 4244;4267 + /utf-8 %(AdditionalOptions) Windows @@ -186,6 +188,7 @@ MultiThreadedDebug ProgramDatabase 4244;4267 + /utf-8 %(AdditionalOptions) Windows @@ -202,6 +205,7 @@ ProgramDatabase 4244;4267 CompileAsC + /utf-8 %(AdditionalOptions) MachineX86 @@ -219,6 +223,7 @@ MultiThreaded ProgramDatabase 4244;4267 + /utf-8 %(AdditionalOptions) @@ -234,6 +239,7 @@ MultiThreaded ProgramDatabase 4244;4267 + /utf-8 %(AdditionalOptions) @@ -247,6 +253,7 @@ ProgramDatabase 4244;4267 CompileAsC + /utf-8 %(AdditionalOptions) Windows @@ -265,6 +272,7 @@ ProgramDatabase 4244;4267 CompileAsC + /utf-8 %(AdditionalOptions) Windows diff --git a/.vs/syslinux-win.vcxproj b/.vs/syslinux-win.vcxproj index 0a9dbb6c..5e45ec7c 100644 --- a/.vs/syslinux-win.vcxproj +++ b/.vs/syslinux-win.vcxproj @@ -142,6 +142,7 @@ ProgramDatabase 4244;4267;4996 CompileAsC + /utf-8 %(AdditionalOptions) Windows @@ -162,6 +163,7 @@ MultiThreadedDebug ProgramDatabase 4244;4267;4996 + /utf-8 %(AdditionalOptions) Windows @@ -180,6 +182,7 @@ MultiThreadedDebug ProgramDatabase 4244;4267;4996 + /utf-8 %(AdditionalOptions) Windows @@ -196,6 +199,7 @@ ProgramDatabase 4244;4267;4996 CompileAsC + /utf-8 %(AdditionalOptions) MachineX86 @@ -213,6 +217,7 @@ MultiThreaded ProgramDatabase 4244;4267;4996 + /utf-8 %(AdditionalOptions) @@ -228,6 +233,7 @@ MultiThreaded ProgramDatabase 4244;4267;4996 + /utf-8 %(AdditionalOptions) @@ -241,6 +247,7 @@ ProgramDatabase 4244;4267;4996 CompileAsC + /utf-8 %(AdditionalOptions) Windows @@ -259,6 +266,7 @@ ProgramDatabase 4244;4267;4996 CompileAsC + /utf-8 %(AdditionalOptions) Windows diff --git a/src/rufus.rc b/src/rufus.rc index 67b34f1c..6898deeb 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.5.1456" +CAPTION "Rufus 3.5.1457" 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,5,1456,0 - PRODUCTVERSION 3,5,1456,0 + FILEVERSION 3,5,1457,0 + PRODUCTVERSION 3,5,1457,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -413,13 +413,13 @@ BEGIN VALUE "Comments", "https://akeo.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.5.1456" + VALUE "FileVersion", "3.5.1457" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus-3.5.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.5.1456" + VALUE "ProductVersion", "3.5.1457" END END BLOCK "VarFileInfo"