From e2dc4c3a66a53109616bff726bb4f4e198af580b Mon Sep 17 00:00:00 2001
From: Shauren <none@none>
Date: Fri, 27 Aug 2010 13:22:05 +0200
Subject: Core/Dep: More hacking on g3d library (updated .diff) should now
 build on windows

--HG--
branch : trunk
---
 dep/g3dlite/source/BinaryInput.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'dep/g3dlite/source/BinaryInput.cpp')

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);
-- 
cgit v1.2.3