diff --git a/.editorconfig b/.editorconfig
index 20d5c776b5..9533a67b93 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -26,9 +26,6 @@ charset = utf-8-bom
# This file may need to force a BOM so compilers treat as utf-8.
charset = utf-8-bom
-[Windows/{aboutbox.rc,version.rc}]
-charset = utf-8
-
[ext/at3_standalone/**.{cpp,h}]
indent_style = space
indent_size = 4
diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj
index fd5da210ed..804b3cd32e 100644
--- a/Windows/PPSSPP.vcxproj
+++ b/Windows/PPSSPP.vcxproj
@@ -1703,14 +1703,12 @@
-
$(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)
$(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)
$(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)
$(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)
-
diff --git a/Windows/aboutbox.rc b/Windows/aboutbox.rc
deleted file mode 100644
index 43e3b72005..0000000000
--- a/Windows/aboutbox.rc
+++ /dev/null
@@ -1,20 +0,0 @@
-
-//This file is included in ppsspp.rc with "include".
-#pragma code_page(65001)
-
-IDD_ABOUTBOX DIALOGEX 0, 0, 301, 163
-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "About"
-FONT 8, "MS Shell Dlg", 0, 0, 0x0
-BEGIN
- DEFPUSHBUTTON "OK",IDOK,243,140,50,14
- ICON IDI_PPSSPP,IDC_STATIC,10,9,21,20
- LTEXT "PPSSPP",IDC_VERSION,40,8,127,9
- LTEXT "Copyright (c) by Henrik Rydgård the PPSSPP project 2012-",IDC_STATIC,40,33,253,8
- LTEXT "All trademarks are property of their respective owners.\nThe emulator is for educational and development purposes only and it may not be used to play games you do not legally own.",IDC_STATIC,40,102,253,24
- LTEXT "PSP emulator and debugger",IDC_STATIC,40,19,253,8
- LTEXT "CISO decompression code by BOOSTER",IDC_STATIC,48,73,240,8
- LTEXT "PSPSDK by #pspdev (freenode)",IDC_STATIC,48,62,240,8
- LTEXT "zlib by Jean-loup Gailly (compression) and Mark Adler (decompression)",IDC_STATIC,48,85,240,8
- LTEXT "Additional credits:",IDC_STATIC,40,49,253,8
-END
diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
index 38aa996510..ce5a574fb4 100644
--- a/Windows/ppsspp.rc
+++ b/Windows/ppsspp.rc
@@ -103,8 +103,8 @@ END
// Version
//
-// no utf-16 support when using mingw's resource compiler
-#ifdef __MINGW32__
+#pragma code_page(65001)
+
// win-version.h is generated by git-version-gen.cmd.
#include "win-version.h"
@@ -126,11 +126,11 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", "PPSSPP PSP emulator"
- VALUE "CompanyName", "Henrik Rydg\xE5rd"
+ VALUE "CompanyName", "Henrik Rydgård"
VALUE "FileDescription", "PPSSPP"
VALUE "FileVersion", PPSSPP_WIN_VERSION_STRING
VALUE "InternalName", "PPSSPPEmu"
- VALUE "LegalCopyright", "Copyright \xA9 2006-2021 by Henrik Rydg\xE5rd"
+ VALUE "LegalCopyright", "Copyright © 2006-2021 by Henrik Rydgård"
VALUE "LegalTrademarks", "All product names are trademarks of their respective owners."
VALUE "OriginalFilename", "PPSSPP.exe"
VALUE "ProductName", "PPSSPP"
@@ -142,9 +142,6 @@ BEGIN
VALUE "Translation", 0x409, 1200
END
END
-#else
-#include "version.rc"
-#endif
#endif // Neutral (Default) resources
/////////////////////////////////////////////////////////////////////////////
@@ -274,8 +271,8 @@ BEGIN
CONTROL "",IDC_GEDBG_MATRICES,"SysListView32",LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_REPORT | WS_BORDER | WS_TABSTOP,7,7,217,86
END
-// no utf-16 support when using mingw's resource compiler
-#ifdef __MINGW32__
+#pragma code_page(65001)
+
IDD_ABOUTBOX DIALOGEX 0, 0, 301, 163
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
CAPTION "About"
@@ -284,7 +281,7 @@ BEGIN
DEFPUSHBUTTON "OK",IDOK,243,140,50,14
ICON IDI_PPSSPP,IDC_STATIC,10,9,21,20
LTEXT "PPSSPP",IDC_VERSION,40,8,127,9
- LTEXT "Copyright \xA9 by Henrik Rydg\xE5rd the PPSSPP project 2012-",IDC_STATIC,40,33,253,8
+ LTEXT "Copyright © by Henrik Rydgård the PPSSPP project 2012-",IDC_STATIC,40,33,253,8
LTEXT "All trademarks are property of their respective owners.\nThe emulator is for educational and development purposes only and it may not be used to play games you do not legally own.",IDC_STATIC,40,102,253,24
LTEXT "PSP emulator and debugger",IDC_STATIC,40,19,253,8
LTEXT "CISO decompression code by BOOSTER",IDC_STATIC,48,73,240,8
@@ -292,9 +289,6 @@ BEGIN
LTEXT "zlib by Jean-loup Gailly (compression) and Mark Adler (decompression)",IDC_STATIC,48,85,240,8
LTEXT "Additional credits:",IDC_STATIC,40,49,253,8
END
-#else
-#include "aboutbox.rc"
-#endif
IDD_MEMORY DIALOGEX 0, 0, 700, 310
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
diff --git a/Windows/version.rc b/Windows/version.rc
deleted file mode 100644
index fb19eeb0ae..0000000000
--- a/Windows/version.rc
+++ /dev/null
@@ -1,41 +0,0 @@
-
-// This file is included in ppsspp.rc with "include".
-#pragma code_page(65001)
-
-// win-version.h is generated by git-version-gen.cmd.
-#include "win-version.h"
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION PPSSPP_WIN_VERSION_COMMA
- PRODUCTVERSION PPSSPP_WIN_VERSION_COMMA
- FILEFLAGSMASK 0x17L
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x0L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "Comments", "PPSSPP PSP emulator"
- VALUE "CompanyName", "Henrik Rydgård"
- VALUE "FileDescription", "PPSSPP"
- VALUE "FileVersion", PPSSPP_WIN_VERSION_STRING
- VALUE "InternalName", "PPSSPPEmu"
- VALUE "LegalCopyright", "Copyright (C) 2006-2021 by Henrik Rydgård"
- VALUE "LegalTrademarks", "All product names are trademarks of their respective owners."
- VALUE "OriginalFilename", "PPSSPP.exe"
- VALUE "ProductName", "PPSSPP"
- VALUE "ProductVersion", PPSSPP_WIN_VERSION_STRING
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END