Renamed nsisconf.nsi to nsisconf.nsh since it is really a include file. The NSIS installer will rename the nsisconf.nsi file to nsh if present to prevent upgrade issues.
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1259 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
c9b3214463
commit
0257d4fbc5
5 changed files with 29 additions and 6 deletions
|
@ -247,7 +247,7 @@ int main(int argc, char **argv)
|
|||
while (*p) p++;
|
||||
while (p > exepath && *p != '\\') p=CharPrev(exepath,p);
|
||||
if (p>exepath) p++;
|
||||
strcpy(p,"nsisconf.nsi");
|
||||
strcpy(p,"nsisconf.nsh");
|
||||
FILE *cfg=fopen(exepath,"rt");
|
||||
if (cfg)
|
||||
{
|
||||
|
@ -370,7 +370,7 @@ int main(int argc, char **argv)
|
|||
" /Vx verbosity where x is 4=all,3=no script,2=no info,1=no warnings,0=none\n"
|
||||
" /Ofile specifies a text file to log compiler output (default is stdout)\n"
|
||||
" /PAUSE pauses after execution\n"
|
||||
" /NOCONFIG disables inclusion of <path to makensis.exe>\\nsisconf.nsi\n"
|
||||
" /NOCONFIG disables inclusion of <path to makensis.exe>\\nsisconf.nsh\n"
|
||||
" /CD makes makensis change the current directory to that of the .nsi file\n"
|
||||
" /Ddefine[=value] defines the symbol \"define\" for the script [to value]\n"
|
||||
" /Xscriptcmd executes scriptcmd in script (i.e. \"/XOutFile poop.exe\")\n"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue