fixed some compile errors caused by removing some config.h options
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3429 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
1d53ac7649
commit
851032d22a
6 changed files with 33 additions and 9 deletions
|
@ -981,8 +981,6 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
set_uninstall_mode(1);
|
||||
case TOK_PAGE:
|
||||
{
|
||||
SCRIPT_MSG("%sPage: %s", uninstall_mode?"Uninst":"", line.gettoken_str(1));
|
||||
|
||||
if (!uninstall_mode) {
|
||||
enable_last_page_cancel = 0;
|
||||
if (!stricmp(line.gettoken_str(line.getnumtokens()-1),"/ENABLECANCEL"))
|
||||
|
@ -1042,12 +1040,14 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
cur_page->prefunc = ns_func.add(line.gettoken_str(2),0);
|
||||
break;
|
||||
case 2:
|
||||
ERROR_MSG("\nError: custom page must have a creator function!\n");
|
||||
ERROR_MSG("Error: custom page must have a creator function!\n");
|
||||
PRINTHELP();
|
||||
}
|
||||
}
|
||||
#endif//NSIS_SUPPORT_CODECALLBACKS
|
||||
|
||||
SCRIPT_MSG("%sPage: %s", uninstall_mode?"Uninst":"", line.gettoken_str(1));
|
||||
|
||||
#ifdef NSIS_SUPPORT_CODECALLBACKS
|
||||
if (cur_page->prefunc>=0)
|
||||
SCRIPT_MSG(" (%s:%s)", k?"pre":"creator", line.gettoken_str(2));
|
||||
|
@ -2918,6 +2918,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
}
|
||||
SCRIPT_MSG("FileBufSize: %smb (%d bytes)\n",line.gettoken_str(1),build_filebuflen);
|
||||
return PS_OK;
|
||||
#ifdef NSIS_CONFIG_COMPRESSION_SUPPORT
|
||||
case TOK_SETCOMPRESSIONLEVEL:
|
||||
{
|
||||
if (compressor == &lzma_compressor)
|
||||
|
@ -2945,6 +2946,12 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
|
|||
build_compress_dict_size <<= 20;
|
||||
}
|
||||
return PS_OK;
|
||||
#else
|
||||
case TOK_SETCOMPRESSIONLEVEL:
|
||||
case TOK_SETCOMPRESSORDICTSIZE:
|
||||
ERROR_MSG("Error: %s specified, NSIS_CONFIG_COMPRESSION_SUPPORT not defined.\n", line.gettoken_str(0));
|
||||
return PS_ERROR;
|
||||
#endif//NSIS_CONFIG_COMPRESSION_SUPPORT
|
||||
case TOK_ADDSIZE:
|
||||
{
|
||||
int s;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue