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

another fix for mingw build

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6529 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2014-07-19 05:22:47 +00:00
parent bd07bbcb9e
commit 5bfd937bd2
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Source/script.cpp
View file

@ -3232,7 +3232,8 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
TCHAR *incdir = include_dirs.get(); TCHAR *incdir = include_dirs.get();
int incdirs = include_dirs.getnum(); int incdirs = include_dirs.getnum();
for (int i = 0; i < incdirs; i++, incdir += _tcslen(incdir) + 1) { for (int i = 0; i < incdirs; i++, incdir += _tcslen(incdir) + 1) {
tstring curincdir = path_append(tstring(incdir), dir); tstring curincdir(incdir);
path_append(curincdir, dir);
boost::scoped_ptr<dir_reader> dr( new_dir_reader() ); boost::scoped_ptr<dir_reader> dr( new_dir_reader() );
dr->read(curincdir); dr->read(curincdir);
@ -3242,7 +3243,8 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
{ {
if (!dir_reader::matches(*incdir_itr, spec)) continue; if (!dir_reader::matches(*incdir_itr, spec)) continue;
tstring incfile = path_append(tstring(incdir), basedir) + *incdir_itr; tstring incfile(incdir);
incfile = path_append(incfile, basedir) + *incdir_itr;
if (includeScript(incfile.c_str(), enc) != PS_OK) if (includeScript(incfile.c_str(), enc) != PS_OK)
return PS_ERROR; return PS_ERROR;
else else