From 5bfd937bd2e2826c136b22c1d788429f98196129 Mon Sep 17 00:00:00 2001 From: kichik Date: Sat, 19 Jul 2014 05:22:47 +0000 Subject: [PATCH] another fix for mingw build git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6529 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/script.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/script.cpp b/Source/script.cpp index e0d77107..a3f59d15 100644 --- a/Source/script.cpp +++ b/Source/script.cpp @@ -3232,7 +3232,8 @@ int CEXEBuild::doCommand(int which_token, LineParser &line) TCHAR *incdir = include_dirs.get(); int incdirs = include_dirs.getnum(); 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 dr( new_dir_reader() ); dr->read(curincdir); @@ -3242,7 +3243,8 @@ int CEXEBuild::doCommand(int which_token, LineParser &line) { 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) return PS_ERROR; else