dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Win64 fixes

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6413 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2013-09-06 23:48:59 +00:00
parent e23b3db418
commit e63fa6c53b
38 changed files with 389 additions and 331 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Source/script.cpp
View file

@ -877,8 +877,8 @@ int CEXEBuild::includeScript(const TCHAR *f, NStreamEncoding&enc)
{
NIStream incstrm;
const bool openok = incstrm.OpenFileForReading(f,enc);
if ( // !include defaults to UTF-8 after "Unicode true"
NStreamEncoding::AUTO == enc.GetCodepage() && build_unicode &&
if (NStreamEncoding::AUTO == enc.GetCodepage() && // !include defaults to UTF-8 after "Unicode true"
build_unicode && !enc.IsUnicodeCodepage(enc.GetPlatformDefaultCodepage()) &&
enc.GetPlatformDefaultCodepage() == incstrm.StreamEncoding().GetCodepage()
) incstrm.StreamEncoding().SetCodepage(NStreamEncoding::UTF8);
enc = incstrm.StreamEncoding();