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

Compiles without NSIS_CONFIG_ENHANCEDUI_SUPPORT

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1299 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-10-04 14:45:20 +00:00
parent 210e2d4e5e
commit 5f34882a62
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/build.cpp
View file

@ -261,7 +261,9 @@ CEXEBuild::CEXEBuild()
ubuild_strlist.add("",0); ubuild_strlist.add("",0);
build_header.install_directory_ptr=0; build_header.install_directory_ptr=0;
build_header.install_reg_key_ptr=0; build_header.install_reg_key_ptr=0;
#ifdef NSIS_CONFIG_COMPONENTPAGE
memset(build_header.install_types_ptr,0,sizeof(build_header.install_types_ptr)); memset(build_header.install_types_ptr,0,sizeof(build_header.install_types_ptr));
#endif
// Changed by Amir Szekely 11th July 2002 // Changed by Amir Szekely 11th July 2002
// Changed to fit the new format in which uninstaller icons are saved // Changed to fit the new format in which uninstaller icons are saved

13
Source/script.cpp
View file

@ -3428,8 +3428,8 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
return PS_ERROR; return PS_ERROR;
#endif//!NSIS_CONFIG_COMPONENTPAGE #endif//!NSIS_CONFIG_COMPONENTPAGE
// Added by Amir Szekely 29th July 2002 // Added by Amir Szekely 29th July 2002
#ifdef NSIS_CONFIG_ENHANCEDUI_SUPPORT
case TOK_SETBRANDINGIMAGE: case TOK_SETBRANDINGIMAGE:
#ifdef NSIS_CONFIG_VISIBLE_SUPPORT
{ {
SCRIPT_MSG("SetBrandingImage: "); SCRIPT_MSG("SetBrandingImage: ");
if (!branding_image_found) { if (!branding_image_found) {
@ -3460,12 +3460,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
SCRIPT_MSG("\n"); SCRIPT_MSG("\n");
} }
return add_entry(&ent); return add_entry(&ent);
#else
ERROR_MSG("Error: %s specified, NSIS_CONFIG_VISIBLE_SUPPORT not defined.\n",line.gettoken_str(0));
return PS_ERROR;
#endif// NSIS_CONFIG_VISIBLE_SUPPORT
case TOK_CREATEFONT: case TOK_CREATEFONT:
#ifdef NSIS_CONFIG_ENHANCEDUI_SUPPORT
ent.which=EW_CREATEFONT; ent.which=EW_CREATEFONT;
ent.offsets[0]=line.gettoken_enum(1,usrvars); ent.offsets[0]=line.gettoken_enum(1,usrvars);
ent.offsets[1]=add_string(line.gettoken_str(2)); ent.offsets[1]=add_string(line.gettoken_str(2));
@ -3516,8 +3511,10 @@ int CEXEBuild::doCommand(int which_token, LineParser &line, FILE *fp, const char
SCRIPT_MSG("\n"); SCRIPT_MSG("\n");
return add_entry(&ent); return add_entry(&ent);
#else//NSIS_CONFIG_ENHANCEDUI_SUPPORT #else//NSIS_CONFIG_ENHANCEDUI_SUPPORT
ERROR_MSG("Error: %s specified, NSIS_CONFIG_ENHANCEDUI_SUPPORT not defined.\n",line.gettoken_str(0)); case TOK_CREATEFONT:
return PS_ERROR; case TOK_SETBRANDINGIMAGE:
ERROR_MSG("Error: %s specified, NSIS_CONFIG_ENHANCEDUI_SUPPORT not defined.\n",line.gettoken_str(0));
return PS_ERROR;
#endif//!NSIS_SUPPORT_CREATEFONT #endif//!NSIS_SUPPORT_CREATEFONT
// end of instructions // end of instructions