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

Defines cleared up and added to NSIS define list

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2726 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-07-16 21:13:13 +00:00
parent 2f47369166
commit 6981f2a107
2 changed files with 26 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Source/build.cpp
View file

@ -77,6 +77,9 @@ CEXEBuild::CEXEBuild()
#ifdef NSIS_BZIP2_COMPRESS_WHOLE
definedlist.add("NSIS_BZIP2_COMPRESS_WHOLE");
#endif
#ifdef NSIS_COMPRESS_BZIP2_SMALLMODE
definedlist.add("NSIS_COMPRESS_BZIP2_SMALLMODE");
#endif
{
char bzip_level[32];
@ -224,6 +227,18 @@ CEXEBuild::CEXEBuild()
// Added by Sunil Kamath 11 June 2003
definedlist.add("NSIS_SUPPORT_STANDARD_PREDEFINES");
#endif
#ifdef NSIS_SUPPORT_NAMED_USERVARS
definedlist.add("NSIS_SUPPORT_NAMED_USERVARS");
#endif
#ifdef NSIS_SUPPORT_VERSION_INFO
definedlist.add("NSIS_SUPPORT_VERSION_INFO");
#endif
#ifdef NSIS_SUPPORT_LANG_IN_STRINGS
definedlist.add("NSIS_SUPPORT_LANG_IN_STRINGS");
#endif
#ifdef NSIS_FIX_DEFINES_IN_STRINGS
definedlist.add("NSIS_FIX_DEFINES_IN_STRINGS");
#endif
db_opt_save=db_comp_save=db_full_size=db_opt_save_u=db_comp_save_u=db_full_size_u=0;

18
Source/exehead/config.h
View file

@ -205,8 +205,17 @@
// NSIS_SUPPORT_LANG_IN_STRINGS enables support for language strings inside other strings
#define NSIS_SUPPORT_LANG_IN_STRINGS
// NSIS_FIX_DEFINES_IN_STRINGS fix defines inside defines and handles chars $ perfectly
//#define NSIS_FIX_DEFINES_IN_STRINGS
// NSIS_FIX_DEFINES_IN_STRINGS fixes defines inside defines and handles chars $ perfectly
// #define NSIS_FIX_DEFINES_IN_STRINGS
// NSIS_SUPPORT_STANDARD_PREDEFINES enables standard predefines in NSIS.
// The defines enabled are:
// __FILE__ - current script name
// __LINE__ - current line number
// __DATE__ - date according to the current locale
// __TIME__ - time according to the current locale
// __TIMESTAMP__ - date & time according to the current locale
#define NSIS_SUPPORT_STANDARD_PREDEFINES
// Added by Ximon Eighteen 5th August 2002
// If this is uncommented the following changes/new features are
@ -349,11 +358,6 @@
#define INVALID_FILE_ATTRIBUTES ((DWORD)-1)
#endif
// Added by Sunil Kamath 11 June 2003
#ifndef NSIS_SUPPORT_STANDARD_PREDEFINES
#define NSIS_SUPPORT_STANDARD_PREDEFINES
#endif
// This is the old static var count that occupies memory
// From $0 to $PLUGINSDIR
#define USER_VARS_COUNT 26