dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fuxing things up making things compile/smaller when lots of options are disabled.

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1034 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
justin1014 2002-09-18 19:08:53 +00:00
parent a79ff40f53
commit e327e8681a
8 changed files with 190 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Source/script.cpp
View file

@ -594,12 +594,12 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
}
return make_sure_not_in_secorfunc(line.gettoken_str(0));
#else//NSIS_CONFIG_COMPONENTPAGE
case TOK_ENABLEDBITMAP:
case TOK_DISABLEDBITMAP:
case TOK_CHECKBITMAP:
ERROR_MSG("Error: %s specified, NSIS_CONFIG_COMPONENTPAGE not defined.\n", line.gettoken_str(0));
return PS_ERROR;
#endif//!NSIS_CONFIG_COMPONENTPAGE
case TOK_DIRTEXT:
#ifdef NSIS_CONFIG_VISIBLE_SUPPORT
{
int a = 1;
WORD lang = 0;
@ -613,6 +613,10 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
SCRIPT_MSG("DirText: \"%s\" \"%s\" \"%s\"\n",line.gettoken_str(a),line.gettoken_str(a+1),line.gettoken_str(a+2));
}
return make_sure_not_in_secorfunc(line.gettoken_str(0));
#else//NSIS_CONFIG_VISIBLE_SUPPORT
ERROR_MSG("Error: %s specified, NSIS_CONFIG_VISIBLE_SUPPORT not defined.\n", line.gettoken_str(0));
return PS_ERROR;
#endif//!NSIS_CONFIG_VISIBLE_SUPPORT
#ifdef NSIS_CONFIG_COMPONENTPAGE
case TOK_COMPTEXT:
{
@ -1326,6 +1330,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
// Added by Amir Szekely 31st July 2002
// Ability to change compression methods from within the script
case TOK_SETCOMPRESSOR:
#ifdef NSIS_CONFIG_COMPRESSION_SUPPORT
{
if (build_compressor_set) {
ERROR_MSG("Error: can't change compressor after data already got compressed or header already changed!\n");
@ -1379,6 +1384,10 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
SCRIPT_MSG("SetCompressor: %s\n", line.gettoken_str(1));
}
return make_sure_not_in_secorfunc(line.gettoken_str(0));
#else//NSIS_CONFIG_COMPRESSION_SUPPORT
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_LOADNLF:
{
SCRIPT_MSG("LoadLanguageFile: %s\n", line.gettoken_str(1));
@ -3599,6 +3608,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
return PS_ERROR;
}
#ifdef NSIS_SUPPORT_FILE
int CEXEBuild::do_add_file(const char *lgss, int attrib, int recurse, int linecnt, int *total_files, const char *name_override)
{
char dir[1024];
@ -3833,3 +3843,4 @@ int CEXEBuild::do_add_file(const char *lgss, int attrib, int recurse, int linecn
}
return PS_OK;
}
#endif