better fix for bug #1096104
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3840 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
8c51026a67
commit
61ae6c590d
1 changed files with 1 additions and 9 deletions
|
@ -5673,7 +5673,7 @@ int CEXEBuild::do_add_file(const char *lgss, int attrib, int recurse, int *total
|
|||
if (basedir == "") {
|
||||
new_dir = *dirs_itr;
|
||||
} else {
|
||||
new_dir = basedir + PLATFORM_PATH_SEPARATOR_STR + *dirs_itr;
|
||||
new_dir = basedir + '\\' + *dirs_itr;
|
||||
}
|
||||
|
||||
string new_spec = dir + PLATFORM_PATH_SEPARATOR_STR + *dirs_itr + PLATFORM_PATH_SEPARATOR_STR;
|
||||
|
@ -5938,14 +5938,6 @@ int CEXEBuild::do_add_file_create_dir(const string& local_dir, const string& dir
|
|||
pos = outdir_s.find('$', pos + 2);
|
||||
}
|
||||
|
||||
#ifndef _WIN32
|
||||
pos = outdir_s.find('/');
|
||||
while (pos != string::npos) {
|
||||
outdir_s[pos] = '\\';
|
||||
pos = outdir_s.find('/');
|
||||
}
|
||||
#endif
|
||||
|
||||
int outdir = add_string(outdir_s.c_str());
|
||||
|
||||
if (add_entry_direct(EW_CREATEDIR, outdir, 1) != PS_OK) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue