From 453b78cbb68f481ba6ecd989b695ed871e31b771 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 19 Nov 2021 14:20:02 +0100 Subject: [PATCH] Resolve charset .idtx/.idt confusion NMake inline files are always created using ACP. The "1252" in the .idtx header has no effect on this. However, we must encode the .idt files using correct charset/codepage regardless the ACP being used on the building machine. Signed-off-by: Simon Rozman --- MSI/MSIBuild | 2 +- MSI/MSICA | 2 +- MSI/ZRCola/Main/Makefile | Bin 293544 -> 292118 bytes Updater | 2 +- ZRCola/MSIBuild/Makefile | Bin 12810 -> 25398 bytes 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/MSI/MSIBuild b/MSI/MSIBuild index f68cad5..a53c4e2 160000 --- a/MSI/MSIBuild +++ b/MSI/MSIBuild @@ -1 +1 @@ -Subproject commit f68cad560a265068d13a0149617fa29a83974a17 +Subproject commit a53c4e2b8786023fd3afdb89932d84129521710d diff --git a/MSI/MSICA b/MSI/MSICA index 5a67199..b9dbb7f 160000 --- a/MSI/MSICA +++ b/MSI/MSICA @@ -1 +1 @@ -Subproject commit 5a67199179607eb1ae2523440f7b20c5e4c20325 +Subproject commit b9dbb7f904f8dc2db2a7ca11ea8eed71fccdbf3a diff --git a/MSI/ZRCola/Main/Makefile b/MSI/ZRCola/Main/Makefile index 272fd60ad53fed030cb0812cc97912e8f9b68bb1..41306d908c32c955c50d5e749ea9094761e97c24 100644 GIT binary patch delta 331 zcmZ4SRdCuX!3{Ya(?2=0m`pa|5Mm8r@Mo}{J~xrYa5|eZi@;<94wmU!0xUB&b8se! zPyZ&w!q?oS(B7oL2*gawn-rK|PJiRgVldr+i$!YsA5NAaMuo|YGU8x!G^d|TWH~)u zO@L+9_B%W*eDc#xv{}@qOX;wrKsD*I$W4Es%Mvk}Nk$A!%be}E^jYRHZErGS;bDd- ze`m^)gVlJTS__sWmFZbgENa_xVp$rPAQ}WBf#(0?WHFi!WXVilpvA(5Zqv35mId2g rl3AR1rx)e12yI_fz|z48(Or-W(+yS+rOI9%*K- delta 613 zcmbRCN^r$j!3{Ya)0c^`%-KAJGfAA&kim$-6o@&SzbdqURbT{SrtM!9nE78$U!uVx z!)QDGpazThFlcVJLrvKw%5t{yimxX0|oG6RSAR&dxef%~c zL$szBShGynzK)k=k}NyaSgwXbW0~TIp3^$xHX34=~A5b_CyV=`;W+$m2 znJXK`vYZLS+*zT(;L?hO_$>sB4JZo2aM<-Cj>U}^$u8X-mf4ILc4cL<$bh2HWIB+g SfWqUB(q}x diff --git a/Updater b/Updater index 8bf3810..5b1c1fc 160000 --- a/Updater +++ b/Updater @@ -1 +1 @@ -Subproject commit 8bf3810032caccebe02269340d01208ddfb156db +Subproject commit 5b1c1fc23d603c5aa8192baca6e09f3aab0d18ac diff --git a/ZRCola/MSIBuild/Makefile b/ZRCola/MSIBuild/Makefile index 2810103567c9c8b02ed05be13c9831818a35b877..46d68aa47938507d43f0f501237d9090d4040d93 100644 GIT binary patch literal 25398 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 Z;H+^DI)DPho{c{Io{xJmtDK&S{y#ew=js3e literal 12810 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