Skip to content

Instantly share code, notes, and snippets.

@SkirnirMaNGOS
Created December 4, 2012 22:30
Show Gist options
  • Save SkirnirMaNGOS/4209579 to your computer and use it in GitHub Desktop.
Save SkirnirMaNGOS/4209579 to your computer and use it in GitHub Desktop.
Fix for VMAP and MMAP extraction.
diff --git a/contrib/mmap/CMakeLists.txt b/contrib/mmap/CMakeLists.txt
index ae81e85..c813cd4 100644
--- a/contrib/mmap/CMakeLists.txt
+++ b/contrib/mmap/CMakeLists.txt
@@ -31,24 +31,24 @@ include_directories(
../../objdir/dep/ACE_wrappers
../../dep/recastnavigation/Detour/Include
../../dep/recastnavigation/Recast/Include
- ../../dep/src/zlib
+ # ../../dep/src/zlib
)
-add_library(zlib
- ../../dep/src/zlib/adler32.c
- ../../dep/src/zlib/compress.c
- ../../dep/src/zlib/crc32.c
- ../../dep/src/zlib/deflate.c
- ../../dep/src/zlib/example.c
- ../../dep/src/zlib/gzio.c
- ../../dep/src/zlib/infback.c
- ../../dep/src/zlib/inffast.c
- ../../dep/src/zlib/inflate.c
- ../../dep/src/zlib/inftrees.c
- ../../dep/src/zlib/trees.c
- ../../dep/src/zlib/uncompr.c
- ../../dep/src/zlib/zutil.c
-)
+#add_library(zlib
+# ../../dep/src/zlib/adler32.c
+# ../../dep/src/zlib/compress.c
+# ../../dep/src/zlib/crc32.c
+# ../../dep/src/zlib/deflate.c
+# ../../dep/src/zlib/example.c
+# ../../dep/src/zlib/gzio.c
+# ../../dep/src/zlib/infback.c
+# ../../dep/src/zlib/inffast.c
+# ../../dep/src/zlib/inflate.c
+# ../../dep/src/zlib/inftrees.c
+# ../../dep/src/zlib/trees.c
+# ../../dep/src/zlib/uncompr.c
+# ../../dep/src/zlib/zutil.c
+#)
add_library(g3dlite
../../dep/src/g3dlite/AABox.cpp
@@ -130,6 +130,7 @@ add_library(g3dlite
../../dep/src/g3dlite/Vector4int8.cpp
../../dep/src/g3dlite/Welder.cpp
../../dep/src/g3dlite/WinMain.cpp
+ ../../dep/src/g3dlite/FileSystem.cpp
)
add_library(vmap
@@ -141,7 +142,7 @@ add_library(vmap
../../src/game/vmap/ModelInstance.cpp
)
-target_link_libraries(vmap g3dlite zlib)
+target_link_libraries(vmap g3dlite z)
add_library(Detour
../../dep/recastnavigation/Detour/Source/DetourAlloc.cpp
@@ -174,4 +175,4 @@ set(SOURCES
add_executable( MoveMapGen ${SOURCES} )
-target_link_libraries( MoveMapGen g3dlite vmap Detour Recast zlib )
+target_link_libraries( MoveMapGen g3dlite vmap Detour Recast z )
diff --git a/contrib/mmap/MoveMapGen b/contrib/mmap/MoveMapGen
new file mode 100755
index 0000000..cc71b9b
Binary files /dev/null and b/contrib/mmap/MoveMapGen differ
diff --git a/contrib/mmap/mmap_extract.py b/contrib/mmap/mmap_extract.py
index 9131e7c..d3e5304 100644
--- a/contrib/mmap/mmap_extract.py
+++ b/contrib/mmap/mmap_extract.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python2
"""
Copyright (C) 2005-2012 MaNGOS <http://getmangos.com/>
diff --git a/contrib/vmap_assembler/CMakeLists.txt b/contrib/vmap_assembler/CMakeLists.txt
index 70b8b28..64cba64 100644
--- a/contrib/vmap_assembler/CMakeLists.txt
+++ b/contrib/vmap_assembler/CMakeLists.txt
@@ -27,6 +27,10 @@ include_directories(../../dep/include/g3dlite/)
include_directories(../../dep/ACE_wrappers/)
include_directories(../../objdir/dep/ACE_wrappers)
include_directories(../../src/framework/)
+#include_directories(
+# ${ACE_INCLUDE_DIR}
+# ${ZLIB_INCLUDE_DIR}
+#)
add_library(g3dlite ../../dep/src/g3dlite/AABox.cpp
../../dep/src/g3dlite/Box.cpp
@@ -66,6 +70,9 @@ add_library(g3dlite ../../dep/src/g3dlite/AABox.cpp
../../dep/src/g3dlite/TextOutput.cpp
../../dep/src/g3dlite/UprightFrame.cpp
../../dep/src/g3dlite/Vector2.cpp
+ ../../dep/src/g3dlite/uint128.cpp
+ ../../dep/src/g3dlite/FileSystem.cpp
+ ../../dep/src/g3dlite/PhysicsFrame.cpp
)
add_library(vmap
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment