[sword-svn] r3043 - trunk/src/mgr

[scribe at crosswire.org]

Author: scribe
Date: 2014-03-01 17:26:10 -0700 (Sat, 01 Mar 2014)
New Revision: 3043

Modified:
   trunk/src/mgr/swmgr.cpp
Log:
more fixes to conditional compile of other compression types


Modified: trunk/src/mgr/swmgr.cpp
===================================================================
--- trunk/src/mgr/swmgr.cpp	2014-03-02 00:18:48 UTC (rev 3042)
+++ trunk/src/mgr/swmgr.cpp	2014-03-02 00:26:10 UTC (rev 3043)
@@ -93,7 +93,11 @@
 
 #ifndef EXCLUDEZLIB
 #include "zipcomprs.h"
+#endif
+#ifndef EXCLUDEBZIP2
 #include "bz2comprs.h"
+#endif
+#ifndef EXCLUDEXZ
 #include "xzcomprs.h"
 #endif
 
@@ -944,17 +948,24 @@
 			blockType = BOOKBLOCKS;
 		
 		misc1 = ((entry = section.find("CompressType")) != section.end()) ? (*entry).second : (SWBuf)"LZSS";
+
+		if (false) {}
 #ifndef EXCLUDEZLIB
+		else
 		if (!stricmp(misc1.c_str(), "ZIP"))
 			compress = new ZipCompress();
+#endif
+#ifndef EXCLUDEBZIP2
 		else
 		if (!stricmp(misc1.c_str(), "BZIP2_UNSUPPORTED"))
 			compress = new Bzip2Compress();
+#endif
+#ifndef EXCLUDEXZ
 		else
 		if (!stricmp(misc1.c_str(), "XZ_UNSUPPORTED"))
 			compress = new XzCompress();
+#endif
 		else
-#endif
 		if (!stricmp(misc1.c_str(), "LZSS"))
 			compress = new LZSSCompress();