aboutsummaryrefslogtreecommitdiff
path: root/dep/g3dlite/source/BinaryInput.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'dep/g3dlite/source/BinaryInput.cpp')
-rw-r--r--dep/g3dlite/source/BinaryInput.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/dep/g3dlite/source/BinaryInput.cpp b/dep/g3dlite/source/BinaryInput.cpp
index c879715c3f0..19ab2722c5c 100644
--- a/dep/g3dlite/source/BinaryInput.cpp
+++ b/dep/g3dlite/source/BinaryInput.cpp
@@ -39,7 +39,9 @@
#include "G3D/Log.h"
#include "G3D/FileSystem.h"
#include <zlib.h>
-#include "zip.h"
+#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
+ #include "zip.h"
+#endif
#include <cstring>
namespace G3D {
@@ -273,6 +275,7 @@ BinaryInput::BinaryInput(
_internal::currentFilesUsed.insert(m_filename);
+#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
std::string zipfile;
if (FileSystem::inZipfile(m_filename, zipfile)) {
// Load from zipfile
@@ -304,6 +307,7 @@ BinaryInput::BinaryInput(
m_freeBuffer = true;
return;
}
+#endif
// Figure out how big the file is and verify that it exists.
m_length = FileSystem::size(m_filename);