linux_build.diff

diff --git a/contrib/extractor/ad b/contrib/extractor/ad
deleted file mode 100755
index 564ecea..0000000
Binary files a/contrib/extractor/ad and /dev/null differ
diff --git a/contrib/mmap/CMakeLists.txt b/contrib/mmap/CMakeLists.txt
index ae81e85..da3f5c9 100644
--- a/contrib/mmap/CMakeLists.txt
+++ b/contrib/mmap/CMakeLists.txt
@@ -77,6 +77,7 @@ add_library(g3dlite
     ../../dep/src/g3dlite/Crypto_md5.cpp
     ../../dep/src/g3dlite/Cylinder.cpp
     ../../dep/src/g3dlite/debugAssert.cpp
+    ../../dep/src/g3dlite/FileSystem.cpp
     ../../dep/src/g3dlite/fileutils.cpp
     ../../dep/src/g3dlite/filter.cpp
     ../../dep/src/g3dlite/format.cpp
diff --git a/contrib/vmap_assembler/CMakeLists.txt b/contrib/vmap_assembler/CMakeLists.txt
index 70b8b28..7d6a905 100644
--- a/contrib/vmap_assembler/CMakeLists.txt
+++ b/contrib/vmap_assembler/CMakeLists.txt
@@ -21,61 +21,66 @@ ADD_DEFINITIONS("-Wall")
 ADD_DEFINITIONS("-ggdb")
 ADD_DEFINITIONS("-O3")
 
-include_directories(../../src/shared)
-include_directories(../../src/game/vmap/)
-include_directories(../../dep/include/g3dlite/)
-include_directories(../../dep/ACE_wrappers/)
-include_directories(../../objdir/dep/ACE_wrappers)
-include_directories(../../src/framework/)
+include_directories(
+    ../../dep/ACE_wrappers/
+    ../../dep/include/g3dlite/
+    ../../src/framework/
+    ../../src/game/vmap/
+    ../../src/shared
+    )
 
-add_library(g3dlite ../../dep/src/g3dlite/AABox.cpp
-  ../../dep/src/g3dlite/Box.cpp
-	../../dep/src/g3dlite/Crypto.cpp
-	../../dep/src/g3dlite/format.cpp
-	../../dep/src/g3dlite/Matrix3.cpp
-	../../dep/src/g3dlite/Plane.cpp
-	../../dep/src/g3dlite/System.cpp
-	../../dep/src/g3dlite/Triangle.cpp
-	../../dep/src/g3dlite/Vector3.cpp
-	../../dep/src/g3dlite/Vector4.cpp
-	../../dep/src/g3dlite/debugAssert.cpp
-	../../dep/src/g3dlite/fileutils.cpp
-	../../dep/src/g3dlite/g3dmath.cpp
-	../../dep/src/g3dlite/g3dfnmatch.cpp
-	../../dep/src/g3dlite/prompt.cpp
-	../../dep/src/g3dlite/stringutils.cpp
-	../../dep/src/g3dlite/Any.cpp
-	../../dep/src/g3dlite/BinaryFormat.cpp
-	../../dep/src/g3dlite/BinaryInput.cpp
-	../../dep/src/g3dlite/BinaryOutput.cpp
-	../../dep/src/g3dlite/Capsule.cpp
-	../../dep/src/g3dlite/CollisionDetection.cpp
-	../../dep/src/g3dlite/CoordinateFrame.cpp
-	../../dep/src/g3dlite/Cylinder.cpp
-	../../dep/src/g3dlite/Line.cpp
-	../../dep/src/g3dlite/LineSegment.cpp
-	../../dep/src/g3dlite/Log.cpp
-	../../dep/src/g3dlite/Matrix4.cpp
-	../../dep/src/g3dlite/MemoryManager.cpp
-	../../dep/src/g3dlite/Quat.cpp
-	../../dep/src/g3dlite/Random.cpp
-	../../dep/src/g3dlite/Ray.cpp
-	../../dep/src/g3dlite/ReferenceCount.cpp
-	../../dep/src/g3dlite/Sphere.cpp
-	../../dep/src/g3dlite/TextInput.cpp
-	../../dep/src/g3dlite/TextOutput.cpp
-	../../dep/src/g3dlite/UprightFrame.cpp
-	../../dep/src/g3dlite/Vector2.cpp
-	)
+add_library(g3dlite	
+    ../../dep/src/g3dlite/AABox.cpp
+    ../../dep/src/g3dlite/Any.cpp
+    ../../dep/src/g3dlite/BinaryFormat.cpp
+    ../../dep/src/g3dlite/BinaryInput.cpp
+    ../../dep/src/g3dlite/BinaryOutput.cpp
+    ../../dep/src/g3dlite/Box.cpp
+    ../../dep/src/g3dlite/Capsule.cpp
+    ../../dep/src/g3dlite/CollisionDetection.cpp
+    ../../dep/src/g3dlite/CoordinateFrame.cpp
+    ../../dep/src/g3dlite/Crypto.cpp
+    ../../dep/src/g3dlite/Cylinder.cpp
+    ../../dep/src/g3dlite/debugAssert.cpp
+    ../../dep/src/g3dlite/FileSystem.cpp
+    ../../dep/src/g3dlite/fileutils.cpp
+    ../../dep/src/g3dlite/format.cpp
+    ../../dep/src/g3dlite/g3dfnmatch.cpp
+    ../../dep/src/g3dlite/g3dmath.cpp
+    ../../dep/src/g3dlite/Line.cpp
+    ../../dep/src/g3dlite/LineSegment.cpp
+    ../../dep/src/g3dlite/Log.cpp
+    ../../dep/src/g3dlite/Matrix3.cpp
+    ../../dep/src/g3dlite/Matrix4.cpp
+    ../../dep/src/g3dlite/MemoryManager.cpp
+    ../../dep/src/g3dlite/PhysicsFrame.cpp
+    ../../dep/src/g3dlite/Plane.cpp
+    ../../dep/src/g3dlite/prompt.cpp
+    ../../dep/src/g3dlite/Quat.cpp
+    ../../dep/src/g3dlite/Random.cpp
+    ../../dep/src/g3dlite/Ray.cpp
+    ../../dep/src/g3dlite/ReferenceCount.cpp
+    ../../dep/src/g3dlite/Sphere.cpp
+    ../../dep/src/g3dlite/stringutils.cpp
+    ../../dep/src/g3dlite/System.cpp
+    ../../dep/src/g3dlite/TextInput.cpp
+    ../../dep/src/g3dlite/TextOutput.cpp
+    ../../dep/src/g3dlite/Triangle.cpp
+    ../../dep/src/g3dlite/uint128.cpp
+    ../../dep/src/g3dlite/UprightFrame.cpp
+    ../../dep/src/g3dlite/Vector2.cpp
+    ../../dep/src/g3dlite/Vector3.cpp
+    ../../dep/src/g3dlite/Vector4.cpp
+    )
 
 add_library(vmap
-	../../src/game/vmap/BIH.cpp
-	../../src/game/vmap/VMapManager2.cpp
-	../../src/game/vmap/MapTree.cpp
-	../../src/game/vmap/TileAssembler.cpp
-	../../src/game/vmap/WorldModel.cpp
-	../../src/game/vmap/ModelInstance.cpp
-	)
+    ../../src/game/vmap/BIH.cpp
+    ../../src/game/vmap/MapTree.cpp
+    ../../src/game/vmap/ModelInstance.cpp
+    ../../src/game/vmap/TileAssembler.cpp
+    ../../src/game/vmap/VMapManager2.cpp
+    ../../src/game/vmap/WorldModel.cpp
+    )
 
 target_link_libraries(vmap g3dlite z)