Define list fixed

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1897 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-12-05 19:28:45 +00:00
parent 3b7145576b
commit 43b417dc05

View file

@ -61,61 +61,83 @@ CEXEBuild::CEXEBuild()
strcpy(cur_out_path,"$INSTDIR"); strcpy(cur_out_path,"$INSTDIR");
#ifdef NSIS_CONFIG_LOG
definedlist.add("NSIS_CONFIG_LOG");
#endif
#ifdef NSIS_CONFIG_UNINSTALL_SUPPORT
definedlist.add("NSIS_CONFIG_UNINSTALL_SUPPORT");
#endif
#ifdef NSIS_CONFIG_LICENSEPAGE
definedlist.add("NSIS_CONFIG_LICENSEPAGE");
#endif
#ifdef NSIS_CONFIG_SILENT_SUPPORT
definedlist.add("NSIS_CONFIG_SILENT_SUPPORT");
#endif
#ifdef NSIS_CONFIG_COMPRESSION_SUPPORT
definedlist.add("NSIS_CONFIG_COMPRESSION_SUPPORT");
#endif
#ifdef NSIS_ZLIB_COMPRESS_WHOLE
definedlist.add("NSIS_ZLIB_COMPRESS_WHOLE");
#endif
#ifdef NSIS_BZIP2_COMPRESS_WHOLE #ifdef NSIS_BZIP2_COMPRESS_WHOLE
definedlist.add("NSIS_BZIP2_COMPRESS_WHOLE"); definedlist.add("NSIS_BZIP2_COMPRESS_WHOLE");
#endif #endif
{ {
char b[123]; char bzip_level[32];
wsprintf(b,"%d",NSIS_COMPRESS_BZIP2_LEVEL); wsprintf(bzip_level, "%d", NSIS_COMPRESS_BZIP2_LEVEL);
definedlist.add("NSIS_COMPRESS_BZIP2_LEVEL",b); definedlist.add("NSIS_COMPRESS_BZIP2_LEVEL", bzip_level);
} }
#ifdef NSIS_CONFIG_CRC_SUPPORT #ifdef NSIS_CONFIG_COMPONENTPAGE
definedlist.add("NSIS_CONFIG_CRC_SUPPORT"); definedlist.add("NSIS_CONFIG_COMPONENTPAGE");
#endif
#ifdef NSIS_CONFIG_COMPRESSION_SUPPORT
definedlist.add("NSIS_CONFIG_COMPRESSION_SUPPORT");
#endif #endif
#ifdef NSIS_CONFIG_CRC_ANAL #ifdef NSIS_CONFIG_CRC_ANAL
definedlist.add("NSIS_CONFIG_CRC_ANAL"); definedlist.add("NSIS_CONFIG_CRC_ANAL");
#endif #endif
#ifdef NSIS_CONFIG_COMPONENTPAGE #ifdef NSIS_CONFIG_CRC_SUPPORT
definedlist.add("NSIS_CONFIG_COMPONENTPAGE"); definedlist.add("NSIS_CONFIG_CRC_SUPPORT");
#endif
#ifdef NSIS_CONFIG_ENHANCEDUI_SUPPORT
definedlist.add("NSIS_CONFIG_ENHANCEDUI_SUPPORT");
#endif
#ifdef NSIS_CONFIG_LICENSEPAGE
definedlist.add("NSIS_CONFIG_LICENSEPAGE");
#endif
#ifdef NSIS_CONFIG_LOG
definedlist.add("NSIS_CONFIG_LOG");
#endif
#ifdef NSIS_CONFIG_PLUGIN_SUPPORT
definedlist.add("NSIS_CONFIG_PLUGIN_SUPPORT");
#endif
#ifdef NSIS_CONFIG_SILENT_SUPPORT
definedlist.add("NSIS_CONFIG_SILENT_SUPPORT");
#endif
#ifdef NSIS_CONFIG_UNINSTALL_SUPPORT
definedlist.add("NSIS_CONFIG_UNINSTALL_SUPPORT");
#endif #endif
#ifdef NSIS_CONFIG_VISIBLE_SUPPORT #ifdef NSIS_CONFIG_VISIBLE_SUPPORT
definedlist.add("NSIS_CONFIG_VISIBLE_SUPPORT"); definedlist.add("NSIS_CONFIG_VISIBLE_SUPPORT");
#endif #endif
#ifdef NSIS_CONFIG_XPSTYLE_SUPPORT {
definedlist.add("NSIS_CONFIG_XPSTYLE_SUPPORT"); char max_inst_types[32];
wsprintf(max_inst_types, "%d", NSIS_MAX_INST_TYPES);
definedlist.add("NSIS_MAX_INST_TYPES", max_inst_types);
}
{
char max_strlen[32];
wsprintf(max_strlen, "%d", NSIS_MAX_STRLEN);
definedlist.add("NSIS_MAX_STRLEN", max_strlen);
}
#ifdef NSIS_SUPPORT_ACTIVEXREG
definedlist.add("NSIS_SUPPORT_ACTIVEXREG");
#endif #endif
#ifdef NSIS_SUPPORT_BGBG #ifdef NSIS_SUPPORT_BGBG
definedlist.add("NSIS_SUPPORT_BGBG"); definedlist.add("NSIS_SUPPORT_BGBG");
#endif #endif
#ifdef NSIS_SUPPORT_ACTIVEXREG #ifdef NSIS_SUPPORT_CODECALLBACKS
definedlist.add("NSIS_SUPPORT_ACTIVEXREG"); definedlist.add("NSIS_SUPPORT_CODECALLBACKS");
#endif #endif
#ifdef NSIS_SUPPORT_INTOPTS #ifdef NSIS_SUPPORT_COPYFILES
definedlist.add("NSIS_SUPPORT_INTOPTS"); definedlist.add("NSIS_SUPPORT_COPYFILES");
#endif #endif
#ifdef NSIS_SUPPORT_STROPTS #ifdef NSIS_SUPPORT_CREATESHORTCUT
definedlist.add("NSIS_SUPPORT_STROPTS"); definedlist.add("NSIS_SUPPORT_CREATESHORTCUT");
#endif #endif
#ifdef NSIS_SUPPORT_STACK #ifdef NSIS_SUPPORT_DELETE
definedlist.add("NSIS_SUPPORT_STACK"); definedlist.add("NSIS_SUPPORT_DELETE");
#endif
#ifdef NSIS_SUPPORT_ENVIRONMENT
definedlist.add("NSIS_SUPPORT_ENVIRONMENT");
#endif
#ifdef NSIS_SUPPORT_EXECUTE
definedlist.add("NSIS_SUPPORT_EXECUTE");
#endif
#ifdef NSIS_SUPPORT_FILE
definedlist.add("NSIS_SUPPORT_FILE");
#endif #endif
#ifdef NSIS_SUPPORT_FILEFUNCTIONS #ifdef NSIS_SUPPORT_FILEFUNCTIONS
definedlist.add("NSIS_SUPPORT_FILEFUNCTIONS"); definedlist.add("NSIS_SUPPORT_FILEFUNCTIONS");
@ -123,23 +145,8 @@ CEXEBuild::CEXEBuild()
#ifdef NSIS_SUPPORT_FINDFIRST #ifdef NSIS_SUPPORT_FINDFIRST
definedlist.add("NSIS_SUPPORT_FINDFIRST"); definedlist.add("NSIS_SUPPORT_FINDFIRST");
#endif #endif
#ifdef NSIS_SUPPORT_CREATESHORTCUT #ifdef NSIS_SUPPORT_FNUTIL
definedlist.add("NSIS_SUPPORT_CREATESHORTCUT"); definedlist.add("NSIS_SUPPORT_FNUTIL");
#endif
#ifdef NSIS_SUPPORT_INIFILES
definedlist.add("NSIS_SUPPORT_INIFILES");
#endif
#ifdef NSIS_SUPPORT_REGISTRYFUNCTIONS
definedlist.add("NSIS_SUPPORT_REGISTRYFUNCTIONS");
#endif
#ifdef NSIS_SUPPORT_COPYFILES
definedlist.add("NSIS_SUPPORT_COPYFILES");
#endif
#ifdef NSIS_SUPPORT_EXECUTE
definedlist.add("NSIS_SUPPORT_EXECUTE");
#endif
#ifdef NSIS_SUPPORT_SHELLEXECUTE
definedlist.add("NSIS_SUPPORT_SHELLEXECUTE");
#endif #endif
#ifdef NSIS_SUPPORT_GETDLLVERSION #ifdef NSIS_SUPPORT_GETDLLVERSION
definedlist.add("NSIS_SUPPORT_GETDLLVERSION"); definedlist.add("NSIS_SUPPORT_GETDLLVERSION");
@ -150,38 +157,42 @@ CEXEBuild::CEXEBuild()
#ifdef NSIS_SUPPORT_HWNDS #ifdef NSIS_SUPPORT_HWNDS
definedlist.add("NSIS_SUPPORT_HWNDS"); definedlist.add("NSIS_SUPPORT_HWNDS");
#endif #endif
#ifdef NSIS_SUPPORT_ENVIRONMENT #ifdef NSIS_SUPPORT_INIFILES
definedlist.add("NSIS_SUPPORT_ENVIRONMENT"); definedlist.add("NSIS_SUPPORT_INIFILES");
#endif #endif
#ifdef NSIS_SUPPORT_RMDIR #ifdef NSIS_SUPPORT_INTOPTS
definedlist.add("NSIS_SUPPORT_RMDIR"); definedlist.add("NSIS_SUPPORT_INTOPTS");
#endif
#ifdef NSIS_SUPPORT_FILE
definedlist.add("NSIS_SUPPORT_FILE");
#endif
#ifdef NSIS_SUPPORT_DELETE
definedlist.add("NSIS_SUPPORT_DELETE");
#endif
#ifdef NSIS_SUPPORT_RENAME
definedlist.add("NSIS_SUPPORT_RENAME");
#endif #endif
#ifdef NSIS_SUPPORT_MESSAGEBOX #ifdef NSIS_SUPPORT_MESSAGEBOX
definedlist.add("NSIS_SUPPORT_MESSAGEBOX"); definedlist.add("NSIS_SUPPORT_MESSAGEBOX");
#endif #endif
#ifdef NSIS_SUPPORT_CODECALLBACKS
definedlist.add("NSIS_SUPPORT_CODECALLBACKS");
#endif
#ifdef NSIS_SUPPORT_MOVEONREBOOT #ifdef NSIS_SUPPORT_MOVEONREBOOT
definedlist.add("NSIS_SUPPORT_MOVEONREBOOT"); definedlist.add("NSIS_SUPPORT_MOVEONREBOOT");
#endif #endif
#ifdef NSIS_SUPPORT_REBOOT
{ definedlist.add("NSIS_SUPPORT_REBOOT");
char b[123]; #endif
wsprintf(b,"%d",NSIS_MAX_STRLEN); #ifdef NSIS_SUPPORT_REGISTRYFUNCTIONS
definedlist.add("NSIS_MAX_STRLEN",b); definedlist.add("NSIS_SUPPORT_REGISTRYFUNCTIONS");
wsprintf(b,"%d",NSIS_MAX_INST_TYPES); #endif
definedlist.add("NSIS_MAX_INST_TYPES",b); #ifdef NSIS_SUPPORT_RENAME
} definedlist.add("NSIS_SUPPORT_RENAME");
#endif
#ifdef NSIS_SUPPORT_RMDIR
definedlist.add("NSIS_SUPPORT_RMDIR");
#endif
#ifdef NSIS_SUPPORT_SHELLEXECUTE
definedlist.add("NSIS_SUPPORT_SHELLEXECUTE");
#endif
#ifdef NSIS_SUPPORT_STACK
definedlist.add("NSIS_SUPPORT_STACK");
#endif
#ifdef NSIS_SUPPORT_STROPTS
definedlist.add("NSIS_SUPPORT_STROPTS");
#endif
#ifdef NSIS_ZLIB_COMPRESS_WHOLE
definedlist.add("NSIS_ZLIB_COMPRESS_WHOLE");
#endif
// Added by Amir Szekely 11th July 2002 // Added by Amir Szekely 11th July 2002
// Coded by Robert Rainwater // Coded by Robert Rainwater