Patch #258, Makensisw x64 fixes

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6557 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-10-12 20:09:35 +00:00
parent 6d2adf744d
commit eb5d77214a
4 changed files with 70 additions and 53 deletions

View file

@ -3157,11 +3157,11 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
if (TOK_P_MAKENSIS == which_token)
{
extern const TCHAR *g_argv0;
extern NStreamEncoding g_outputenc;
TCHAR buf[33];
compile=_T("\""), compile+=get_executable_path(g_argv0), compile+= _T("\"");
compile+= _T(" ") OPT_STR _T("v"), wsprintf(buf,_T("%d"),get_verbosity()), compile+=buf;
#ifdef _WIN32 // POSIX does not support -OUTPUTCHARSET
extern NStreamEncoding g_outputenc;
compile+= _T(" ") OPT_STR _T("OCS "), g_outputenc.GetCPDisplayName(buf), compile+=buf;
#endif
if (*exec) compile+= _T(" "), compile+=exec;