From c70cc031d2eeeedeb5004bb26135f921fd406a3d Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Mon, 24 Nov 2003 17:36:42 +0000
Subject: [PATCH] Enabled LZMA selection

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3197 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Makensisw/makensisw.h | 10 ----------
 Contrib/Makensisw/resource.h  |  2 --
 Contrib/Makensisw/resource.rc |  4 ----
 3 files changed, 16 deletions(-)

diff --git a/Contrib/Makensisw/makensisw.h b/Contrib/Makensisw/makensisw.h
index f25eb8d3..ae7170ae 100644
--- a/Contrib/Makensisw/makensisw.h
+++ b/Contrib/Makensisw/makensisw.h
@@ -75,9 +75,7 @@ typedef enum {
   COMPRESSOR_DEFAULT,
   COMPRESSOR_ZLIB,
   COMPRESSOR_BZIP2,
-#ifdef LZMA_COMPRESSOR_SUPPORT
   COMPRESSOR_LZMA,
-#endif
   COMPRESSOR_BEST,
 } NCOMPRESSOR;
 
@@ -85,16 +83,12 @@ typedef enum {
 char *compressor_names[] = {"",
                             "zlib",
                             "bzip2",
-#ifdef LZMA_COMPRESSOR_SUPPORT
                             "lzma",
-#endif
                             "Best"};
 WORD compressor_commands[] = {IDM_DEFAULT,
                               IDM_ZLIB,
                               IDM_BZIP2,
-#ifdef LZMA_COMPRESSOR_SUPPORT
                               IDM_LZMA,
-#endif
                               IDM_BEST};
 #endif
 
@@ -102,16 +96,12 @@ WORD compressor_commands[] = {IDM_DEFAULT,
 int compressor_bitmaps[] = {IDB_COMPRESSOR_DEFAULT, 
                             IDB_COMPRESSOR_ZLIB, 
                             IDB_COMPRESSOR_BZIP2, 
-#ifdef LZMA_COMPRESSOR_SUPPORT
                             IDB_COMPRESSOR_LZMA, 
-#endif
                             IDB_COMPRESSOR_BEST};
 int compressor_strings[] = {IDS_DEFAULT, 
                             IDS_ZLIB, 
                             IDS_BZIP2, 
-#ifdef LZMA_COMPRESSOR_SUPPORT
                             IDS_LZMA, 
-#endif
                             IDS_BEST};
 #endif
 
diff --git a/Contrib/Makensisw/resource.h b/Contrib/Makensisw/resource.h
index 6931846d..0e14992f 100644
--- a/Contrib/Makensisw/resource.h
+++ b/Contrib/Makensisw/resource.h
@@ -76,9 +76,7 @@
 #define IDM_CLEAR_MRU_LIST              40029
 #define IDM_RECOMPILE_TEST              40030
 #define IDM_BEST                        40031
-#ifdef LZMA_COMPRESSOR_SUPPORT
 #define IDM_LZMA                        40032
-#endif
 
 // Next default values for new objects
 // 
diff --git a/Contrib/Makensisw/resource.rc b/Contrib/Makensisw/resource.rc
index ba7f925e..0514368f 100644
--- a/Contrib/Makensisw/resource.rc
+++ b/Contrib/Makensisw/resource.rc
@@ -93,9 +93,7 @@ BEGIN
             MENUITEM "Defa&ult",                    IDM_DEFAULT
             MENUITEM "&zlib",                       IDM_ZLIB
             MENUITEM "bzi&p2",                      IDM_BZIP2
-#ifdef LZMA_COMPRESSOR_SUPPORT
             MENUITEM "&lzma",                       IDM_LZMA
-#endif
             MENUITEM "&Best",                       IDM_BEST
         END
         MENUITEM "Edit Script\tCtrl+E",         IDM_EDITSCRIPT
@@ -273,9 +271,7 @@ BEGIN
     IDS_BZIP2               "bzip2"
     IDS_RECOMPILE_TEST      "Recompile and run"
     IDS_BEST                "Best"
-#ifdef LZMA_COMPRESSOR_SUPPORT
     IDS_LZMA                "lzma"
-#endif
 END
 
 #endif    // English (U.S.) resources