Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dosbox-staging/dosbox-staging.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFeralChild64 <unknown>2022-09-20 19:00:45 +0300
committerkcgen <1557255+kcgen@users.noreply.github.com>2022-10-02 20:10:53 +0300
commit3151751c421480e210d416214b5018d579b23a6d (patch)
tree9c407dea23b22de889110e311000dd0b66d72207 /contrib
parentee62ff82f48faf0bdda88e79d4ad93fe6af03f63 (diff)
Handle UTF8 locale support review remarks and compilation warnings
Diffstat (limited to 'contrib')
-rw-r--r--contrib/resources/mapping-wikipedia.org/CP_3021.TXT (renamed from contrib/resources/mapping-wikipedia.org/CP_MIK.TXT)0
-rw-r--r--contrib/resources/mapping-wikipedia.org/CP_3848.TXT (renamed from contrib/resources/mapping-wikipedia.org/CP_ABICOMP.TXT)0
-rw-r--r--contrib/resources/mapping-wikipedia.org/CP_899.TXT (renamed from contrib/resources/mapping-wikipedia.org/CP_ARMSCII-8A.TXT)0
-rw-r--r--contrib/resources/mapping-wikipedia.org/meson.build6
-rw-r--r--contrib/resources/mapping/MAIN.TXT8
5 files changed, 7 insertions, 7 deletions
diff --git a/contrib/resources/mapping-wikipedia.org/CP_MIK.TXT b/contrib/resources/mapping-wikipedia.org/CP_3021.TXT
index ad487ad3c..ad487ad3c 100644
--- a/contrib/resources/mapping-wikipedia.org/CP_MIK.TXT
+++ b/contrib/resources/mapping-wikipedia.org/CP_3021.TXT
diff --git a/contrib/resources/mapping-wikipedia.org/CP_ABICOMP.TXT b/contrib/resources/mapping-wikipedia.org/CP_3848.TXT
index b590481f9..b590481f9 100644
--- a/contrib/resources/mapping-wikipedia.org/CP_ABICOMP.TXT
+++ b/contrib/resources/mapping-wikipedia.org/CP_3848.TXT
diff --git a/contrib/resources/mapping-wikipedia.org/CP_ARMSCII-8A.TXT b/contrib/resources/mapping-wikipedia.org/CP_899.TXT
index c6a329f4f..c6a329f4f 100644
--- a/contrib/resources/mapping-wikipedia.org/CP_ARMSCII-8A.TXT
+++ b/contrib/resources/mapping-wikipedia.org/CP_899.TXT
diff --git a/contrib/resources/mapping-wikipedia.org/meson.build b/contrib/resources/mapping-wikipedia.org/meson.build
index d16a96854..73ea425a1 100644
--- a/contrib/resources/mapping-wikipedia.org/meson.build
+++ b/contrib/resources/mapping-wikipedia.org/meson.build
@@ -4,8 +4,8 @@ resource_files = [
'CP_778.TXT',
'CP_851.TXT',
'CP_853.TXT',
+ 'CP_899.TXT',
'CP_1117.TXT',
- 'CP_ABICOMP.TXT',
- 'CP_ARMSCII-8A.TXT',
- 'CP_MIK.TXT',
+ 'CP_3021.TXT',
+ 'CP_3848.TXT',
]
diff --git a/contrib/resources/mapping/MAIN.TXT b/contrib/resources/mapping/MAIN.TXT
index 47eb7ebd9..ec775d898 100644
--- a/contrib/resources/mapping/MAIN.TXT
+++ b/contrib/resources/mapping/MAIN.TXT
@@ -898,7 +898,7 @@ CODEPAGE 867 # Czech and Slovak, Kamenicky encoding
0xad 0x00a7 #SECTION SIGN
EXTENDS CODEPAGE 437
-CODEPAGE 869 # Greek, with EUR899
+CODEPAGE 869 # Greek, with EUR
0x87 0x20ac #EURO SIGN - FreeDOS specific
EXTENDS FILE mapping-unicode.org CP_869.TXT
@@ -908,7 +908,7 @@ EXTENDS CODEPAGE 855
CODEPAGE 899 # Armenian, ArmSCII-8A encoding
0xff 0x055b #ARMENIAN EMPHASIS MARK - FreeDOS specific
-EXTENDS FILE mapping-wikipedia.org CP_ARMSCII-8A.TXT
+EXTENDS FILE mapping-wikipedia.org CP_899.TXT
CODEPAGE 874 # Thai, with EUR
EXTENDS FILE mapping-unicode.org CP_874.TXT
@@ -1039,7 +1039,7 @@ CODEPAGE 3012 # Latvian and Russian, Cyrillic, RusLat encoding
EXTENDS CODEPAGE 866
CODEPAGE 3021 # Bulgarian, Cyrillic, MIK encoding
-EXTENDS FILE mapping-wikipedia.org CP_MIK.TXT
+EXTENDS FILE mapping-wikipedia.org CP_3021.TXT
CODEPAGE 3845 # Hungarian, CWI-2 encoding
# reference: https://en.wikipedia.org/wiki/CWI-2
@@ -1064,7 +1064,7 @@ CODEPAGE 3846 # Turkish
EXTENDS CODEPAGE 437
CODEPAGE 3848 # Brazilian, ABICOMP encoding
-EXTENDS FILE mapping-wikipedia.org CP_ABICOMP.TXT
+EXTENDS FILE mapping-wikipedia.org CP_3848.TXT
CODEPAGE 30000 # Saami
EXTENDS FILE mapping-freedos.org CP_30000.TXT