Core/Dep: More hacking on g3d library (updated .diff) should now build on windows

--HG--
branch : trunk

4 files changed, 97 insertions, 2 deletions

diff --git a/dep/g3dlite/CMakeLists.txt b/dep/g3dlite/CMakeLists.txt
index 104e7016baf..55d79227d70 100644
--- a/dep/g3dlite/CMakeLists.txt
+++ b/dep/g3dlite/CMakeLists.txt
@@ -22,6 +22,7 @@ set(g3dlib_STAT_SRCS
   source/Crypto.cpp
   source/Cylinder.cpp
   source/debugAssert.cpp
+  source/FileSystem.cpp
   source/fileutils.cpp
   source/format.cpp
   source/g3dfnmatch.cpp
@@ -32,6 +33,7 @@ set(g3dlib_STAT_SRCS
   source/Matrix3.cpp
   source/Matrix4.cpp
   source/MemoryManager.cpp
+  source/PhysicsFrame.cpp
   source/Plane.cpp
   source/prompt.cpp
   source/Quat.cpp
@@ -45,6 +47,7 @@ set(g3dlib_STAT_SRCS
   source/TextInput.cpp
   source/TextOutput.cpp
   source/Triangle.cpp
+  source/uint128.cpp
   source/UprightFrame.cpp
   source/Vector2.cpp
   source/Vector3.cpp
diff --git a/dep/g3dlite/G3D-v8.0.diff b/dep/g3dlite/G3D-v8.0.diff
index 3a6fbbc2782..a82d5378a8b 100644
--- a/dep/g3dlite/G3D-v8.0.diff
+++ b/dep/g3dlite/G3D-v8.0.diff
@@ -141,6 +141,36 @@ diff -urN g3d-beta4/include/G3D/System.h g3d-mangos/include/G3D/System.h
  
  } // namespace
  
+diff -urN g3d-beta4/source/BinaryInput.cpp g3d-mangos/source/BinaryInput.cpp
+--- g3d-beta4/source/BinaryInput.cpp	2010-02-07 23:39:20.000000000 +0100
++++ g3d-mangos/source/BinaryInput.cpp	2010-08-15 11:37:26.000000000 +0200
+@@ -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);
 diff -urN g3d-beta4/source/debugAssert.cpp g3d-mangos/source/debugAssert.cpp
 --- g3d-beta4/source/debugAssert.cpp	2010-02-07 23:39:20.000000000 +0100
 +++ g3d-mangos/source/debugAssert.cpp	2010-08-15 11:37:26.000000000 +0200
@@ -172,6 +202,56 @@ diff -urN g3d-beta4/source/debugAssert.cpp g3d-mangos/source/debugAssert.cpp
      #elif defined(G3D_OSX)
          // TODO: OS X
      #endif
+diff -urN g3d-beta4/source/FileSystem.cpp g3d-mangos/source/FileSystem.cpp
+--- g3d-beta4/source/FileSystem.cpp	2010-02-07 23:39:20.000000000 +0100
++++ g3d-mangos/source/FileSystem.cpp	2010-08-15 11:37:26.000000000 +0200
+@@ -12,7 +12,9 @@
+ #include "G3D/fileutils.h"
+ #include <sys/stat.h>
+ #include <sys/types.h>
+-#include "zip.h"
++#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
++    #include "zip.h"
++#endif
+ #include "G3D/g3dfnmatch.h"
+ #include "G3D/BinaryInput.h"
+ #include "G3D/BinaryOutput.h"
+@@ -78,6 +80,7 @@ bool FileSystem::Dir::contains(const std
+ }
+     
+ void FileSystem::Dir::computeZipListing(const std::string& zipfile, const std::string& pathInsideZipfile) {
++#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
+     struct zip* z = zip_open( FilePath::removeTrailingSlash(zipfile).c_str(), ZIP_CHECKCONS, NULL );
+     debugAssert(z);
+ 
+@@ -126,6 +129,7 @@ void FileSystem::Dir::computeZipListing(
+     
+     zip_close(z);
+     z = NULL;
++#endif
+ }
+ 
+ 
+@@ -522,6 +526,7 @@ int64 FileSystem::_size(const std::strin
+     int result = stat64(filename.c_str(), &st);
+     
+     if (result == -1) {
++#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
+         std::string zip, contents;
+         if (zipfileExists(filename, zip, contents)) {
+             int64 requiredMem;
+@@ -538,8 +543,11 @@ int64 FileSystem::_size(const std::strin
+             zip_close(z);
+             return requiredMem;
+         } else {
++#endif
+             return -1;
++#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
+         }
++#endif
+     }
+     
+     return st.st_size;
 diff -urN g3d-beta4/source/fileutils.cpp g3d-mangos/source/fileutils.cpp
 --- g3d-beta4/source/fileutils.cpp	2010-02-07 23:39:20.000000000 +0100
 +++ g3d-mangos/source/fileutils.cpp	2010-08-15 11:37:26.000000000 +0200
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);
diff --git a/dep/g3dlite/source/FileSystem.cpp b/dep/g3dlite/source/FileSystem.cpp
index 3a1765714b0..2cf890a1cd5 100644
--- a/dep/g3dlite/source/FileSystem.cpp
+++ b/dep/g3dlite/source/FileSystem.cpp
@@ -12,7 +12,9 @@
 #include "G3D/fileutils.h"
 #include <sys/stat.h>
 #include <sys/types.h>
-#include "zip.h"
+#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
+    #include "zip.h"
+#endif
 #include "G3D/g3dfnmatch.h"
 #include "G3D/BinaryInput.h"
 #include "G3D/BinaryOutput.h"
@@ -78,6 +80,7 @@ bool FileSystem::Dir::contains(const std::string& f) const {
 }
     
 void FileSystem::Dir::computeZipListing(const std::string& zipfile, const std::string& pathInsideZipfile) {
+#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
     struct zip* z = zip_open( FilePath::removeTrailingSlash(zipfile).c_str(), ZIP_CHECKCONS, NULL );
     debugAssert(z);
 
@@ -126,6 +129,7 @@ void FileSystem::Dir::computeZipListing(const std::string& zipfile, const std::s
     
     zip_close(z);
     z = NULL;
+#endif
 }
 
 
@@ -522,6 +526,7 @@ int64 FileSystem::_size(const std::string& filename) {
     int result = stat64(filename.c_str(), &st);
     
     if (result == -1) {
+#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
         std::string zip, contents;
         if (zipfileExists(filename, zip, contents)) {
             int64 requiredMem;
@@ -538,8 +543,11 @@ int64 FileSystem::_size(const std::string& filename) {
             zip_close(z);
             return requiredMem;
         } else {
+#endif
             return -1;
+#if _HAVE_ZIP /* G3DFIX: Use ZIP-library only if defined */
         }
+#endif
     }
     
     return st.st_size;