made bzip2 not get compiled when compression is disabled
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1035 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
e327e8681a
commit
634b923901
6 changed files with 15 additions and 4 deletions
|
@ -1,3 +1,5 @@
|
|||
#include "../exehead/config.h"
|
||||
#if (defined(EXEHEAD) && defined(NSIS_COMPRESS_USE_BZIP2)) || !defined(EXEHEAD)
|
||||
/*-------------------------------------------------------------*/
|
||||
/*--- Block sorting machinery ---*/
|
||||
/*--- blocksort.c ---*/
|
||||
|
@ -1098,3 +1100,5 @@ void BZ2_blockSort ( EState* s )
|
|||
/*-------------------------------------------------------------*/
|
||||
/*--- end blocksort.c ---*/
|
||||
/*-------------------------------------------------------------*/
|
||||
|
||||
#endif
|
|
@ -1,5 +1,5 @@
|
|||
#include "../exehead/config.h"
|
||||
#if (defined(EXEHEAD) && defined(NSIS_COMPRESS_USE_BZIP2)) || !defined(EXEHEAD)
|
||||
#if (defined(NSIS_COMPRESS_USE_BZIP2) && defined(NSIS_CONFIG_COMPRESSION_SUPPORT)) || !defined(EXEHEAD)
|
||||
/*-------------------------------------------------------------*/
|
||||
/*--- Library top-level functions. ---*/
|
||||
/*--- bzlib.c ---*/
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
#include "../exehead/config.h"
|
||||
#if !defined(EXEHEAD)
|
||||
/*-------------------------------------------------------------*/
|
||||
/*--- Compression machinery (not incl block sorting) ---*/
|
||||
/*--- compress.c ---*/
|
||||
|
@ -679,3 +681,5 @@ void BZ2_compressBlock ( EState* s, Bool is_last_block )
|
|||
/*-------------------------------------------------------------*/
|
||||
/*--- end compress.c ---*/
|
||||
/*-------------------------------------------------------------*/
|
||||
|
||||
#endif
|
|
@ -1,5 +1,5 @@
|
|||
#include "../exehead/config.h"
|
||||
#ifdef NSIS_COMPRESS_USE_BZIP2
|
||||
#if (defined(NSIS_COMPRESS_USE_BZIP2) && defined(NSIS_CONFIG_COMPRESSION_SUPPORT)) || !defined(EXEHEAD)
|
||||
|
||||
/*-------------------------------------------------------------*/
|
||||
/*--- Decompression machinery ---*/
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
#include "../exehead/config.h"
|
||||
#if (defined(NSIS_COMPRESS_USE_BZIP2) && defined(NSIS_CONFIG_COMPRESSION_SUPPORT)) || !defined(EXEHEAD)
|
||||
/*-------------------------------------------------------------*/
|
||||
/*--- Huffman coding low-level stuff ---*/
|
||||
/*--- huffman.c ---*/
|
||||
|
@ -226,4 +228,5 @@ void BZ2_hbCreateDecodeTables ( Int32 *limit,
|
|||
|
||||
/*-------------------------------------------------------------*/
|
||||
/*--- end huffman.c ---*/
|
||||
/*-------------------------------------------------------------*/
|
||||
/*-------------------------------------------------------------*/
|
||||
#endif
|
|
@ -1,5 +1,5 @@
|
|||
#include "../exehead/config.h"
|
||||
#ifdef NSIS_COMPRESS_USE_BZIP2
|
||||
#if (defined(NSIS_COMPRESS_USE_BZIP2) && defined(NSIS_CONFIG_COMPRESSION_SUPPORT)) || !defined(EXEHEAD)
|
||||
|
||||
/*-------------------------------------------------------------*/
|
||||
/*--- Table for randomising repetitive blocks ---*/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue