Enabled LZMA selection
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3197 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
b77f339455
commit
c70cc031d2
3 changed files with 0 additions and 16 deletions
|
@ -75,9 +75,7 @@ typedef enum {
|
||||||
COMPRESSOR_DEFAULT,
|
COMPRESSOR_DEFAULT,
|
||||||
COMPRESSOR_ZLIB,
|
COMPRESSOR_ZLIB,
|
||||||
COMPRESSOR_BZIP2,
|
COMPRESSOR_BZIP2,
|
||||||
#ifdef LZMA_COMPRESSOR_SUPPORT
|
|
||||||
COMPRESSOR_LZMA,
|
COMPRESSOR_LZMA,
|
||||||
#endif
|
|
||||||
COMPRESSOR_BEST,
|
COMPRESSOR_BEST,
|
||||||
} NCOMPRESSOR;
|
} NCOMPRESSOR;
|
||||||
|
|
||||||
|
@ -85,16 +83,12 @@ typedef enum {
|
||||||
char *compressor_names[] = {"",
|
char *compressor_names[] = {"",
|
||||||
"zlib",
|
"zlib",
|
||||||
"bzip2",
|
"bzip2",
|
||||||
#ifdef LZMA_COMPRESSOR_SUPPORT
|
|
||||||
"lzma",
|
"lzma",
|
||||||
#endif
|
|
||||||
"Best"};
|
"Best"};
|
||||||
WORD compressor_commands[] = {IDM_DEFAULT,
|
WORD compressor_commands[] = {IDM_DEFAULT,
|
||||||
IDM_ZLIB,
|
IDM_ZLIB,
|
||||||
IDM_BZIP2,
|
IDM_BZIP2,
|
||||||
#ifdef LZMA_COMPRESSOR_SUPPORT
|
|
||||||
IDM_LZMA,
|
IDM_LZMA,
|
||||||
#endif
|
|
||||||
IDM_BEST};
|
IDM_BEST};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -102,16 +96,12 @@ WORD compressor_commands[] = {IDM_DEFAULT,
|
||||||
int compressor_bitmaps[] = {IDB_COMPRESSOR_DEFAULT,
|
int compressor_bitmaps[] = {IDB_COMPRESSOR_DEFAULT,
|
||||||
IDB_COMPRESSOR_ZLIB,
|
IDB_COMPRESSOR_ZLIB,
|
||||||
IDB_COMPRESSOR_BZIP2,
|
IDB_COMPRESSOR_BZIP2,
|
||||||
#ifdef LZMA_COMPRESSOR_SUPPORT
|
|
||||||
IDB_COMPRESSOR_LZMA,
|
IDB_COMPRESSOR_LZMA,
|
||||||
#endif
|
|
||||||
IDB_COMPRESSOR_BEST};
|
IDB_COMPRESSOR_BEST};
|
||||||
int compressor_strings[] = {IDS_DEFAULT,
|
int compressor_strings[] = {IDS_DEFAULT,
|
||||||
IDS_ZLIB,
|
IDS_ZLIB,
|
||||||
IDS_BZIP2,
|
IDS_BZIP2,
|
||||||
#ifdef LZMA_COMPRESSOR_SUPPORT
|
|
||||||
IDS_LZMA,
|
IDS_LZMA,
|
||||||
#endif
|
|
||||||
IDS_BEST};
|
IDS_BEST};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -76,9 +76,7 @@
|
||||||
#define IDM_CLEAR_MRU_LIST 40029
|
#define IDM_CLEAR_MRU_LIST 40029
|
||||||
#define IDM_RECOMPILE_TEST 40030
|
#define IDM_RECOMPILE_TEST 40030
|
||||||
#define IDM_BEST 40031
|
#define IDM_BEST 40031
|
||||||
#ifdef LZMA_COMPRESSOR_SUPPORT
|
|
||||||
#define IDM_LZMA 40032
|
#define IDM_LZMA 40032
|
||||||
#endif
|
|
||||||
|
|
||||||
// Next default values for new objects
|
// Next default values for new objects
|
||||||
//
|
//
|
||||||
|
|
|
@ -93,9 +93,7 @@ BEGIN
|
||||||
MENUITEM "Defa&ult", IDM_DEFAULT
|
MENUITEM "Defa&ult", IDM_DEFAULT
|
||||||
MENUITEM "&zlib", IDM_ZLIB
|
MENUITEM "&zlib", IDM_ZLIB
|
||||||
MENUITEM "bzi&p2", IDM_BZIP2
|
MENUITEM "bzi&p2", IDM_BZIP2
|
||||||
#ifdef LZMA_COMPRESSOR_SUPPORT
|
|
||||||
MENUITEM "&lzma", IDM_LZMA
|
MENUITEM "&lzma", IDM_LZMA
|
||||||
#endif
|
|
||||||
MENUITEM "&Best", IDM_BEST
|
MENUITEM "&Best", IDM_BEST
|
||||||
END
|
END
|
||||||
MENUITEM "Edit Script\tCtrl+E", IDM_EDITSCRIPT
|
MENUITEM "Edit Script\tCtrl+E", IDM_EDITSCRIPT
|
||||||
|
@ -273,9 +271,7 @@ BEGIN
|
||||||
IDS_BZIP2 "bzip2"
|
IDS_BZIP2 "bzip2"
|
||||||
IDS_RECOMPILE_TEST "Recompile and run"
|
IDS_RECOMPILE_TEST "Recompile and run"
|
||||||
IDS_BEST "Best"
|
IDS_BEST "Best"
|
||||||
#ifdef LZMA_COMPRESSOR_SUPPORT
|
|
||||||
IDS_LZMA "lzma"
|
IDS_LZMA "lzma"
|
||||||
#endif
|
|
||||||
END
|
END
|
||||||
|
|
||||||
#endif // English (U.S.) resources
|
#endif // English (U.S.) resources
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue