[sword-svn] r3052 - trunk/utilities

[chrislit at crosswire.org]

Author: chrislit
Date: 2014-03-03 06:54:52 -0700 (Mon, 03 Mar 2014)
New Revision: 3052

Modified:
   trunk/utilities/addld.cpp
   trunk/utilities/imp2ld.cpp
   trunk/utilities/imp2vs.cpp
   trunk/utilities/mod2zmod.cpp
   trunk/utilities/osis2mod.cpp
   trunk/utilities/tei2mod.cpp
Log:
fixed compile errors when building without external compression libraries


Modified: trunk/utilities/addld.cpp
===================================================================
--- trunk/utilities/addld.cpp	2014-03-03 12:47:28 UTC (rev 3051)
+++ trunk/utilities/addld.cpp	2014-03-03 13:54:52 UTC (rev 3052)
@@ -40,11 +40,15 @@
 #include <rawld.h>
 #include <rawld4.h>
 #include <zld.h>
+#ifndef EXCLUDEZLIB
 #include <zipcomprs.h>
+#endif
 
 #ifndef NO_SWORD_NAMESPACE
 using sword::SWMgr;
+#ifndef EXCLUDEZLIB
 using sword::ZipCompress;
+#endif
 using sword::RawLD4;
 using sword::SWKey;
 using sword::zLD;

Modified: trunk/utilities/imp2ld.cpp
===================================================================
--- trunk/utilities/imp2ld.cpp	2014-03-03 12:47:28 UTC (rev 3051)
+++ trunk/utilities/imp2ld.cpp	2014-03-03 13:54:52 UTC (rev 3052)
@@ -32,9 +32,15 @@
 #include <rawld4.h>
 #include <zld.h>
 #include <lzsscomprs.h>
+#ifndef EXCLUDEZLIB
 #include <zipcomprs.h>
+#endif
+#ifndef EXCLUDEBZIP2
 #include <bz2comprs.h>
+#endif
+#ifndef EXCLUDEXZ
 #include <xzcomprs.h>
+#endif
 #include <stdio.h>
 
 using std::string;

Modified: trunk/utilities/imp2vs.cpp
===================================================================
--- trunk/utilities/imp2vs.cpp	2014-03-03 12:47:28 UTC (rev 3051)
+++ trunk/utilities/imp2vs.cpp	2014-03-03 13:54:52 UTC (rev 3052)
@@ -34,9 +34,15 @@
 #include <rawtext4.h>
 #include <ztext.h>
 #include <lzsscomprs.h>
+#ifndef EXCLUDEZLIB
 #include <zipcomprs.h>
+#endif
+#ifndef EXCLUDEBZIP2
 #include <bz2comprs.h>
+#endif
+#ifndef EXCLUDEXZ
 #include <xzcomprs.h>
+#endif
 #include <localemgr.h>
 
 #ifndef NO_SWORD_NAMESPACE

Modified: trunk/utilities/mod2zmod.cpp
===================================================================
--- trunk/utilities/mod2zmod.cpp	2014-03-03 12:47:28 UTC (rev 3051)
+++ trunk/utilities/mod2zmod.cpp	2014-03-03 13:54:52 UTC (rev 3052)
@@ -42,9 +42,16 @@
 #include <swtext.h>
 #include <swmgr.h>
 #include <lzsscomprs.h>
+#ifndef EXCLUDEZLIB
 #include <zipcomprs.h>
+#endif
+#ifndef EXCLUDEBZIP2
 #include <bz2comprs.h>
+#endif
+#ifndef EXCLUDEXZ
 #include <xzcomprs.h>
+#endif
+
 #include <versekey.h>
 #include <stdio.h>
 #include <cipherfil.h>
@@ -121,9 +128,15 @@
 
 	switch (compType) {	// these are deleted by zText
 	case 1: compressor = new LZSSCompress(); break;
+	#ifndef EXCLUDEZLIB
 	case 2: compressor = new ZipCompress(); break;
+	#endif
+	#ifndef EXCLUDEBZIP2
 	case 3: compressor = new Bzip2Compress(); break;
+	#endif
+	#ifndef EXCLUDEXZ
 	case 4: compressor = new XzCompress(); break;
+	#endif
 	}
 
 	int result = 0;

Modified: trunk/utilities/osis2mod.cpp
===================================================================
--- trunk/utilities/osis2mod.cpp	2014-03-03 12:47:28 UTC (rev 3051)
+++ trunk/utilities/osis2mod.cpp	2014-03-03 13:54:52 UTC (rev 3052)
@@ -45,9 +45,15 @@
 
 #include <ztext.h>
 #include <lzsscomprs.h>
+#ifndef EXCLUDEZLIB
 #include <zipcomprs.h>
+#endif
+#ifndef EXCLUDEBZIP2
 #include <bz2comprs.h>
+#endif
+#ifndef EXCLUDEXZ
 #include <xzcomprs.h>
+#endif
 #include <cipherfil.h>
 
 #ifdef _ICU_

Modified: trunk/utilities/tei2mod.cpp
===================================================================
--- trunk/utilities/tei2mod.cpp	2014-03-03 12:47:28 UTC (rev 3051)
+++ trunk/utilities/tei2mod.cpp	2014-03-03 13:54:52 UTC (rev 3052)
@@ -63,9 +63,15 @@
 #include <rawld4.h>
 #include <zld.h>
 #include <lzsscomprs.h>
+#ifndef EXCLUDEZLIB
 #include <zipcomprs.h>
+#endif
+#ifndef EXCLUDEBZIP2
 #include <bz2comprs.h>
+#endif
+#ifndef EXCLUDEXZ
 #include <xzcomprs.h>
+#endif
 #include <stdio.h>
 #include <cipherfil.h>