Merge pull request #3236 from hpwamr/mui

MUI - Extend Compiler switch to allow mono language binary for all languages
This commit is contained in:
Pairi Daiza 2021-03-26 18:22:12 +01:00 committed by GitHub
commit 4ded10be13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 169 additions and 32 deletions

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Kolom 0"
IDS_LEX_CSV_COL_0 "Kolom 0"
IDS_LEX_CSV_COL_1 "Kolom 1"
IDS_LEX_CSV_COL_2 "Kolom 2"
IDS_LEX_CSV_COL_3 "Kolom 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Слупок 0"
IDS_LEX_CSV_COL_0 "Слупок 0"
IDS_LEX_CSV_COL_1 "Слупок 1"
IDS_LEX_CSV_COL_2 "Слупок 2"
IDS_LEX_CSV_COL_3 "Слупок 3"

View File

@ -481,7 +481,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Column 0"
IDS_LEX_CSV_COL_0 "Column 0"
IDS_LEX_CSV_COL_1 "Column 1"
IDS_LEX_CSV_COL_2 "Column 2"
IDS_LEX_CSV_COL_3 "Column 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Column 0"
IDS_LEX_CSV_COL_0 "Column 0"
IDS_LEX_CSV_COL_1 "Column 1"
IDS_LEX_CSV_COL_2 "Column 2"
IDS_LEX_CSV_COL_3 "Column 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Column 0"
IDS_LEX_CSV_COL_0 "Column 0"
IDS_LEX_CSV_COL_1 "Column 1"
IDS_LEX_CSV_COL_2 "Column 2"
IDS_LEX_CSV_COL_3 "Column 3"

View File

@ -481,7 +481,7 @@ END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Column 0"
IDS_LEX_CSV_COL_0 "Column 0"
IDS_LEX_CSV_COL_1 "Column 1"
IDS_LEX_CSV_COL_2 "Column 2"
IDS_LEX_CSV_COL_3 "Column 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Columna 0"
IDS_LEX_CSV_COL_0 "Columna 0"
IDS_LEX_CSV_COL_1 "Columna 1"
IDS_LEX_CSV_COL_2 "Columna 2"
IDS_LEX_CSV_COL_3 "Columna 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Columna 0"
IDS_LEX_CSV_COL_0 "Columna 0"
IDS_LEX_CSV_COL_1 "Columna 1"
IDS_LEX_CSV_COL_2 "Columna 2"
IDS_LEX_CSV_COL_3 "Columna 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Colonne 0"
IDS_LEX_CSV_COL_0 "Colonne 0"
IDS_LEX_CSV_COL_1 "Colonne 1"
IDS_LEX_CSV_COL_2 "Colonne 2"
IDS_LEX_CSV_COL_3 "Colonne 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "खंड 0"
IDS_LEX_CSV_COL_0 "खंड 0"
IDS_LEX_CSV_COL_1 "खंड 1"
IDS_LEX_CSV_COL_2 "खंड 2"
IDS_LEX_CSV_COL_3 "खंड 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Oszlop 0"
IDS_LEX_CSV_COL_0 "Oszlop 0"
IDS_LEX_CSV_COL_1 "Oszlop 1"
IDS_LEX_CSV_COL_2 "Oszlop 2"
IDS_LEX_CSV_COL_3 "Oszlop 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Column 0"
IDS_LEX_CSV_COL_0 "Column 0"
IDS_LEX_CSV_COL_1 "Column 1"
IDS_LEX_CSV_COL_2 "Column 2"
IDS_LEX_CSV_COL_3 "Column 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Colonna 0"
IDS_LEX_CSV_COL_0 "Colonna 0"
IDS_LEX_CSV_COL_1 "Colonna 1"
IDS_LEX_CSV_COL_2 "Colonna 2"
IDS_LEX_CSV_COL_3 "Colonna 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "列 0"
IDS_LEX_CSV_COL_0 "列 0"
IDS_LEX_CSV_COL_1 "列 1"
IDS_LEX_CSV_COL_2 "列 2"
IDS_LEX_CSV_COL_3 "列 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "데코레이터"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "열 0"
IDS_LEX_CSV_COL_0 "열 0"
IDS_LEX_CSV_COL_1 "열 1"
IDS_LEX_CSV_COL_2 "열 2"
IDS_LEX_CSV_COL_3 "열 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Kolom 0"
IDS_LEX_CSV_COL_0 "Kolom 0"
IDS_LEX_CSV_COL_1 "Kolom 1"
IDS_LEX_CSV_COL_2 "Kolom 2"
IDS_LEX_CSV_COL_3 "Kolom 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Kolumna 0"
IDS_LEX_CSV_COL_0 "Kolumna 0"
IDS_LEX_CSV_COL_1 "Kolumna 1"
IDS_LEX_CSV_COL_2 "Kolumna 2"
IDS_LEX_CSV_COL_3 "Kolumna 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Coluna 0"
IDS_LEX_CSV_COL_0 "Coluna 0"
IDS_LEX_CSV_COL_1 "Coluna 1"
IDS_LEX_CSV_COL_2 "Coluna 2"
IDS_LEX_CSV_COL_3 "Coluna 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Coluna 0"
IDS_LEX_CSV_COL_0 "Coluna 0"
IDS_LEX_CSV_COL_1 "Coluna 1"
IDS_LEX_CSV_COL_2 "Coluna 2"
IDS_LEX_CSV_COL_3 "Coluna 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Колонка 0"
IDS_LEX_CSV_COL_0 "Колонка 0"
IDS_LEX_CSV_COL_1 "Колонка 1"
IDS_LEX_CSV_COL_2 "Колонка 2"
IDS_LEX_CSV_COL_3 "Колонка 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Stĺpec 0"
IDS_LEX_CSV_COL_0 "Stĺpec 0"
IDS_LEX_CSV_COL_1 "Stĺpec 1"
IDS_LEX_CSV_COL_2 "Stĺpec 2"
IDS_LEX_CSV_COL_3 "Stĺpec 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Kolumn 0"
IDS_LEX_CSV_COL_0 "Kolumn 0"
IDS_LEX_CSV_COL_1 "Kolumn 1"
IDS_LEX_CSV_COL_2 "Kolumn 2"
IDS_LEX_CSV_COL_3 "Kolumn 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Column 0"
IDS_LEX_CSV_COL_0 "Column 0"
IDS_LEX_CSV_COL_1 "Column 1"
IDS_LEX_CSV_COL_2 "Column 2"
IDS_LEX_CSV_COL_3 "Column 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Column 0"
IDS_LEX_CSV_COL_0 "Column 0"
IDS_LEX_CSV_COL_1 "Column 1"
IDS_LEX_CSV_COL_2 "Column 2"
IDS_LEX_CSV_COL_3 "Column 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Column 0"
IDS_LEX_CSV_COL_0 "Column 0"
IDS_LEX_CSV_COL_1 "Column 1"
IDS_LEX_CSV_COL_2 "Column 2"
IDS_LEX_CSV_COL_3 "Column 3"

View File

@ -476,11 +476,12 @@ END
STRINGTABLE
BEGIN
IDS_LEX_STR_63372 "Decorator"
IDS_LEX_STR_63373 "Task Marker"
END
STRINGTABLE
BEGIN
IDS_LEX_CSV_COL_0 "Column 0"
IDS_LEX_CSV_COL_0 "Column 0"
IDS_LEX_CSV_COL_1 "Column 1"
IDS_LEX_CSV_COL_2 "Column 2"
IDS_LEX_CSV_COL_3 "Column 3"

View File

@ -39,10 +39,54 @@ BEGIN
"#include ""../language/np3_en_us/np3_en_us.rc""\r\n"
#elif defined(MUI_BASE_LNG_AF_ZA)
"#include ""../language/np3_af_za/np3_af_za.rc""\r\n"
#elif defined(MUI_BASE_LNG_BE_BY)
"#include ""../language/np3_be_by/np3_be_by.rc""\r\n"
#elif defined(MUI_BASE_LNG_DE_DE)
"#include ""../language/np3_de_de/np3_de_de.rc""\r\n"
#elif defined(MUI_BASE_LNG_EL_GR)
"#include ""../language/np3_el_gr/np3_el_gr.rc""\r\n"
#elif defined(MUI_BASE_LNG_EN_GB)
"#include ""../language/np3_en_gb/np3_en_gb.rc""\r\n"
#elif defined(MUI_BASE_LNG_ES_419)
"#include ""../language/np3_es_419/np3_es_419.rc""\r\n"
#elif defined(MUI_BASE_LNG_ES_ES)
"#include ""../language/np3_es_es/np3_es_es.rc""\r\n"
#elif defined(MUI_BASE_LNG_FR_FR)
"#include ""../language/np3_fr_fr/np3_fr_fr.rc""\r\n"
#elif defined(MUI_BASE_LNG_HI_IN)
"#include ""../language/np3_fr_fr/np3_fr_fr.rc""\r\n"
#elif defined(MUI_BASE_LNG_HU_HU)
"#include ""../language/np3_hu_hu/np3_hu_hu.rc""\r\n"
#elif defined(MUI_BASE_LNG_ID_ID)
"#include ""../language/np3_id_id/np3_id_id.rc""\r\n"
#elif defined(MUI_BASE_LNG_IT_IT)
"#include ""../language/np3_it_it/np3_it_it.rc""\r\n"
#elif defined(MUI_BASE_LNG_JA_JP)
"#include ""../language/np3_ja_jp/np3_ja_jp.rc""\r\n"
#elif defined(MUI_BASE_LNG_KO_KR)
"#include ""../language/np3_ko_kr/np3_ko_kr.rc""\r\n"
#elif defined(MUI_BASE_LNG_NL_NL)
"#include ""../language/np3_nl_nl/np3_nl_nl.rc""\r\n"
#elif defined(MUI_BASE_LNG_PL_PL)
"#include ""../language/np3_pl_pl/np3_pl_pl.rc""\r\n"
#elif defined(MUI_BASE_LNG_PT_BR)
"#include ""../language/np3_pt_br/np3_pt_br.rc""\r\n"
#elif defined(MUI_BASE_LNG_PT_PT)
"#include ""../language/np3_pr_pt/np3_pt-pt.rc""\r\n"
#elif defined(MUI_BASE_LNG_RU_RU)
"#include ""../language/np3_ru_ru/np3_ru_ru.rc""\r\n"
#elif defined(MUI_BASE_LNG_SK_SK)
"#include ""../language/np3_sk_sk/np3_sk_sk.rc""\r\n"
#elif defined(MUI_BASE_LNG_SV_SE)
"#include ""../language/np3_sv_se/np3_sv_se.rc""\r\n"
#elif defined(MUI_BASE_LNG_TR_TR)
"#include ""../language/np3_tr_tr/np3_tr_tr.rc""\r\n"
#elif defined(MUI_BASE_LNG_VI_VN)
"#include ""../language/np3_vi_vn/np3_vi_vn.rc""\r\n"
#elif defined(MUI_BASE_LNG_ZH_CN)
"#include ""../language/np3_zh_cn/np3_zh_cn.rc""\r\n"
#elif defined(MUI_BASE_LNG_ZH_TW)
"#include ""../language/np3_zh_tw/np3_zh_tw.rc""\r\n"
#endif
"\0"
@ -429,14 +473,59 @@ END
// Generated from the TEXTINCLUDE 3 resource.
//
#include "Notepad3.ver"
#if defined(MUI_BASE_LNG_EN_US)
#include "../language/np3_en_us/np3_en_us.rc"
#include "../language/np3_en_us/np3_en_us.rc"
#elif defined(MUI_BASE_LNG_AF_ZA)
#include "../language/np3_af_za/np3_af_za.rc"
#include "../language/np3_af_za/np3_af_za.rc"
#elif defined(MUI_BASE_LNG_BE_BY)
#include "../language/np3_be_by/np3_be_by.rc"
#elif defined(MUI_BASE_LNG_DE_DE)
#include "../language/np3_de_de/np3_de_de.rc"
#include "../language/np3_de_de/np3_de_de.rc"
#elif defined(MUI_BASE_LNG_EL_GR)
#include "../language/np3_el_gr/np3_el_gr.rc"
#elif defined(MUI_BASE_LNG_EN_GB)
#include "../language/np3_en_gb/np3_en_gb.rc"
#elif defined(MUI_BASE_LNG_ES_419)
#include "../language/np3_es_419/np3_es_419.rc"
#elif defined(MUI_BASE_LNG_ES_ES)
#include "../language/np3_es_es/np3_es_es.rc"
#elif defined(MUI_BASE_LNG_FR_FR)
#include "../language/np3_fr_fr/np3_fr_fr.rc"
#include "../language/np3_fr_fr/np3_fr_fr.rc"
#elif defined(MUI_BASE_LNG_HI_IN)
#include "../language/np3_fr_fr/np3_fr_fr.rc"
#elif defined(MUI_BASE_LNG_HU_HU)
#include "../language/np3_hu_hu/np3_hu_hu.rc"
#elif defined(MUI_BASE_LNG_ID_ID)
#include "../language/np3_id_id/np3_id_id.rc"
#elif defined(MUI_BASE_LNG_IT_IT)
#include "../language/np3_it_it/np3_it_it.rc"
#elif defined(MUI_BASE_LNG_JA_JP)
#include "../language/np3_ja_jp/np3_ja_jp.rc"
#elif defined(MUI_BASE_LNG_KO_KR)
#include "../language/np3_ko_kr/np3_ko_kr.rc"
#elif defined(MUI_BASE_LNG_NL_NL)
#include "../language/np3_nl_nl/np3_nl_nl.rc"
#elif defined(MUI_BASE_LNG_PL_PL)
#include "../language/np3_pl_pl/np3_pl_pl.rc"
#elif defined(MUI_BASE_LNG_PT_BR)
#include "../language/np3_pt_br/np3_pt_br.rc"
#elif defined(MUI_BASE_LNG_PT_PT)
#include "../language/np3_pr_pt/np3_pt-pt.rc"
#elif defined(MUI_BASE_LNG_RU_RU)
#include "../language/np3_ru_ru/np3_ru_ru.rc"
#elif defined(MUI_BASE_LNG_SK_SK)
#include "../language/np3_sk_sk/np3_sk_sk.rc"
#elif defined(MUI_BASE_LNG_SV_SE)
#include "../language/np3_sv_se/np3_sv_se.rc"
#elif defined(MUI_BASE_LNG_TR_TR)
#include "../language/np3_tr_tr/np3_tr_tr.rc"
#elif defined(MUI_BASE_LNG_VI_VN)
#include "../language/np3_vi_vn/np3_vi_vn.rc"
#elif defined(MUI_BASE_LNG_ZH_CN)
#include "../language/np3_zh_cn/np3_zh_cn.rc"
#elif defined(MUI_BASE_LNG_ZH_TW)
#include "../language/np3_zh_tw/np3_zh_tw.rc"
#endif
/////////////////////////////////////////////////////////////////////////////

View File

@ -10,20 +10,44 @@
#endif
// ==========================================
// 1. To build a NON MUI Notepad3, Comment-Out the following line
#define HAVE_DYN_LOAD_LIBS_MUI_LNGS 1
// ------------------------------------------
/// - extent Notepad3.rc file accordingly
// - extent Notepad3.rc file accordingly
// ------------------------------------------
#ifdef HAVE_DYN_LOAD_LIBS_MUI_LNGS
// currently only en-US allowed
// for Base-Lng in MUI env
#define MUI_BASE_LNG_EN_US 1
#else
// 2. To build a NON MUI Notepad3, Comment-Out the following line
#define MUI_BASE_LNG_EN_US 1
// 3. And Uncommentt one of the following lines
//#define MUI_BASE_LNG_AF_ZA 1
//#define MUI_BASE_LNG_BE_BY 1
//#define MUI_BASE_LNG_DE_DE 1
//#define MUI_BASE_LNG_EL_GR 1
//#define MUI_BASE_LNG_EN_GB 1
//#define MUI_BASE_LNG_ES_419 1
//#define MUI_BASE_LNG_ES_ES 1
//#define MUI_BASE_LNG_FR_FR 1
//#define MUI_BASE_LNG_HI_IN 1
//#define MUI_BASE_LNG_HU_HU 1
//#define MUI_BASE_LNG_ID_ID 1
//#define MUI_BASE_LNG_IT_IT 1
//#define MUI_BASE_LNG_JA_JP 1
//#define MUI_BASE_LNG_KO_KR 1
//#define MUI_BASE_LNG_NL_NL 1
//#define MUI_BASE_LNG_PL_PL 1
//#define MUI_BASE_LNG_PT_BR 1
//#define MUI_BASE_LNG_PT_PT 1
//#define MUI_BASE_LNG_RU_RU 1
//#define MUI_BASE_LNG_SK_SK 1
//#define MUI_BASE_LNG_SV_SE 1
//#define MUI_BASE_LNG_TR_TR 1
//#define MUI_BASE_LNG_VI_VN 1
//#define MUI_BASE_LNG_ZH_CN 1
//#define MUI_BASE_LNG_ZH_TW 1
#endif
// ==========================================