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:
justin1014 2002-09-18 21:20:59 +00:00
parent e327e8681a
commit 634b923901
6 changed files with 15 additions and 4 deletions

View file

@ -1,3 +1,5 @@
#include "../exehead/config.h"
#if (defined(EXEHEAD) && defined(NSIS_COMPRESS_USE_BZIP2)) || !defined(EXEHEAD)
/*-------------------------------------------------------------*/ /*-------------------------------------------------------------*/
/*--- Block sorting machinery ---*/ /*--- Block sorting machinery ---*/
/*--- blocksort.c ---*/ /*--- blocksort.c ---*/
@ -1098,3 +1100,5 @@ void BZ2_blockSort ( EState* s )
/*-------------------------------------------------------------*/ /*-------------------------------------------------------------*/
/*--- end blocksort.c ---*/ /*--- end blocksort.c ---*/
/*-------------------------------------------------------------*/ /*-------------------------------------------------------------*/
#endif

View file

@ -1,5 +1,5 @@
#include "../exehead/config.h" #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. ---*/ /*--- Library top-level functions. ---*/
/*--- bzlib.c ---*/ /*--- bzlib.c ---*/

View file

@ -1,3 +1,5 @@
#include "../exehead/config.h"
#if !defined(EXEHEAD)
/*-------------------------------------------------------------*/ /*-------------------------------------------------------------*/
/*--- Compression machinery (not incl block sorting) ---*/ /*--- Compression machinery (not incl block sorting) ---*/
/*--- compress.c ---*/ /*--- compress.c ---*/
@ -679,3 +681,5 @@ void BZ2_compressBlock ( EState* s, Bool is_last_block )
/*-------------------------------------------------------------*/ /*-------------------------------------------------------------*/
/*--- end compress.c ---*/ /*--- end compress.c ---*/
/*-------------------------------------------------------------*/ /*-------------------------------------------------------------*/
#endif

View file

@ -1,5 +1,5 @@
#include "../exehead/config.h" #include "../exehead/config.h"
#ifdef NSIS_COMPRESS_USE_BZIP2 #if (defined(NSIS_COMPRESS_USE_BZIP2) && defined(NSIS_CONFIG_COMPRESSION_SUPPORT)) || !defined(EXEHEAD)
/*-------------------------------------------------------------*/ /*-------------------------------------------------------------*/
/*--- Decompression machinery ---*/ /*--- Decompression machinery ---*/

View file

@ -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 coding low-level stuff ---*/
/*--- huffman.c ---*/ /*--- huffman.c ---*/
@ -227,3 +229,4 @@ void BZ2_hbCreateDecodeTables ( Int32 *limit,
/*-------------------------------------------------------------*/ /*-------------------------------------------------------------*/
/*--- end huffman.c ---*/ /*--- end huffman.c ---*/
/*-------------------------------------------------------------*/ /*-------------------------------------------------------------*/
#endif

View file

@ -1,5 +1,5 @@
#include "../exehead/config.h" #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 ---*/ /*--- Table for randomising repetitive blocks ---*/