Skip to content

Commit fd8e877

Browse files
committed
ppsspp.rc: remove mingw32 specific code
# Conflicts: # Windows/aboutbox.rc
1 parent 7e2c45e commit fd8e877

File tree

5 files changed

+7
-79
lines changed

5 files changed

+7
-79
lines changed

.editorconfig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ charset = utf-8-bom
2626
# This file may need to force a BOM so compilers treat as utf-8.
2727
charset = utf-8-bom
2828

29-
[Windows/{aboutbox.rc,version.rc}]
30-
charset = utf-8
31-
3229
[ext/at3_standalone/**.{cpp,h}]
3330
indent_style = space
3431
indent_size = 4

Windows/PPSSPP.vcxproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1703,14 +1703,12 @@
17031703
<None Include="zipup.cmd" />
17041704
</ItemGroup>
17051705
<ItemGroup>
1706-
<None Include="aboutbox.rc" />
17071706
<ResourceCompile Include="ppsspp.rc">
17081707
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)</PreprocessorDefinitions>
17091708
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)</PreprocessorDefinitions>
17101709
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">$(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)</PreprocessorDefinitions>
17111710
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">$(EXTERNAL_RC_DEFINITIONS);_VC80_UPGRADE=0x0710;%(PreprocessorDefinitions)</PreprocessorDefinitions>
17121711
</ResourceCompile>
1713-
<None Include="version.rc" />
17141712
</ItemGroup>
17151713
<ItemGroup>
17161714
<ProjectReference Include="..\Common\Common.vcxproj">

Windows/aboutbox.rc

Lines changed: 0 additions & 20 deletions
This file was deleted.

Windows/ppsspp.rc

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ END
103103
// Version
104104
//
105105

106-
// no utf-16 support when using mingw's resource compiler
107-
#ifdef __MINGW32__
106+
#pragma code_page(65001)
107+
108108
// win-version.h is generated by git-version-gen.cmd.
109109
#include "win-version.h"
110110

@@ -126,11 +126,11 @@ BEGIN
126126
BLOCK "040904b0"
127127
BEGIN
128128
VALUE "Comments", "PPSSPP PSP emulator"
129-
VALUE "CompanyName", "Henrik Rydg\xE5rd"
129+
VALUE "CompanyName", "Henrik Rydgård"
130130
VALUE "FileDescription", "PPSSPP"
131131
VALUE "FileVersion", PPSSPP_WIN_VERSION_STRING
132132
VALUE "InternalName", "PPSSPPEmu"
133-
VALUE "LegalCopyright", "Copyright \xA9 2006-2021 by Henrik Rydg\xE5rd"
133+
VALUE "LegalCopyright", "Copyright © 2006-2021 by Henrik Rydgård"
134134
VALUE "LegalTrademarks", "All product names are trademarks of their respective owners."
135135
VALUE "OriginalFilename", "PPSSPP.exe"
136136
VALUE "ProductName", "PPSSPP"
@@ -142,9 +142,6 @@ BEGIN
142142
VALUE "Translation", 0x409, 1200
143143
END
144144
END
145-
#else
146-
#include "version.rc"
147-
#endif
148145

149146
#endif // Neutral (Default) resources
150147
/////////////////////////////////////////////////////////////////////////////
@@ -274,8 +271,8 @@ BEGIN
274271
CONTROL "",IDC_GEDBG_MATRICES,"SysListView32",LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_REPORT | WS_BORDER | WS_TABSTOP,7,7,217,86
275272
END
276273

277-
// no utf-16 support when using mingw's resource compiler
278-
#ifdef __MINGW32__
274+
#pragma code_page(65001)
275+
279276
IDD_ABOUTBOX DIALOGEX 0, 0, 301, 163
280277
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
281278
CAPTION "About"
@@ -284,17 +281,14 @@ BEGIN
284281
DEFPUSHBUTTON "OK",IDOK,243,140,50,14
285282
ICON IDI_PPSSPP,IDC_STATIC,10,9,21,20
286283
LTEXT "PPSSPP",IDC_VERSION,40,8,127,9
287-
LTEXT "Copyright \xA9 by Henrik Rydg\xE5rd the PPSSPP project 2012-",IDC_STATIC,40,33,253,8
284+
LTEXT "Copyright © by Henrik Rydgård the PPSSPP project 2012-",IDC_STATIC,40,33,253,8
288285
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
289286
LTEXT "PSP emulator and debugger",IDC_STATIC,40,19,253,8
290287
LTEXT "CISO decompression code by BOOSTER",IDC_STATIC,48,73,240,8
291288
LTEXT "PSPSDK by #pspdev (freenode)",IDC_STATIC,48,62,240,8
292289
LTEXT "zlib by Jean-loup Gailly (compression) and Mark Adler (decompression)",IDC_STATIC,48,85,240,8
293290
LTEXT "Additional credits:",IDC_STATIC,40,49,253,8
294291
END
295-
#else
296-
#include "aboutbox.rc"
297-
#endif
298292

299293
IDD_MEMORY DIALOGEX 0, 0, 700, 310
300294
STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME

Windows/version.rc

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)