fixed bug #1075363 - nsisconf.nsh not included when using makensisw
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3798 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
3df8dedd0c
commit
0e74cc0391
4 changed files with 22 additions and 29 deletions
|
@ -475,25 +475,6 @@ definedlist.add("NSIS_SUPPORT_LANG_IN_STRINGS");
|
|||
m_ShellConstants.add("CDBURN_AREA", CSIDL_CDBURN_AREA, CSIDL_CDBURN_AREA);
|
||||
}
|
||||
|
||||
namespace {
|
||||
string get_executable_path(const char* argv0) {
|
||||
#ifdef _WIN32
|
||||
char temp_buf[1024];
|
||||
temp_buf[0] = '\0';
|
||||
int rc = GetModuleFileName(NULL,temp_buf,1024);
|
||||
assert(rc != 0);
|
||||
return string(temp_buf);
|
||||
#else
|
||||
return get_full_path(argv0);
|
||||
#endif
|
||||
}
|
||||
|
||||
string get_executable_dir(const char *argv0) {
|
||||
return get_dir_name(get_executable_path(argv0));
|
||||
}
|
||||
|
||||
} // end anonymous namespace
|
||||
|
||||
void CEXEBuild::setdirs(const char *argv0)
|
||||
{
|
||||
string nsis_dir = get_executable_dir(argv0);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue