API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Apr 28th, 2017
67
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 11.05 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/contrib/mmap/CMakeLists.txt b/contrib/mmap/CMakeLists.txt
  2. index 980585e..034d69c 100644
  3. --- a/contrib/mmap/CMakeLists.txt
  4. +++ b/contrib/mmap/CMakeLists.txt
  5. @@ -10,8 +10,6 @@
  6.  
  7. cmake_minimum_required (VERSION 2.6)
  8.  
  9. -message ("Mmap extractor included")
  10. -
  11. project( MoveMapGen )
  12.  
  13. ADD_DEFINITIONS(-DMMAP_GENERATOR -DNO_CORE_FUNCS -DDEBUG)
  14. @@ -19,16 +17,15 @@ ADD_DEFINITIONS(-DMMAP_GENERATOR -DNO_CORE_FUNCS -DDEBUG)
  15. # zlib
  16. ADD_DEFINITIONS( -DNO_vsnprintf )
  17.  
  18. -if(!WIN32)
  19. - ADD_DEFINITIONS("-ggdb")
  20. - ADD_DEFINITIONS("-O3")
  21. -endif()
  22. +ADD_DEFINITIONS("-ggdb")
  23. +ADD_DEFINITIONS("-O3")
  24.  
  25. include_directories(
  26. ../../src
  27. ../../src/shared
  28. ../../src/game
  29. ../../src/game/vmap
  30. + ../../src/game/Commands
  31. ../../dep/include/g3dlite
  32. ../../src/framework
  33. ../../dep/ACE_wrappers
  34. @@ -38,18 +35,122 @@ include_directories(
  35. ../../dep/src/zlib
  36. )
  37.  
  38. +add_library(zlib
  39. + ../../dep/src/zlib/adler32.c
  40. + ../../dep/src/zlib/compress.c
  41. + ../../dep/src/zlib/crc32.c
  42. + ../../dep/src/zlib/deflate.c
  43. + ../../dep/src/zlib/example.c
  44. + ../../dep/src/zlib/gzio.c
  45. + ../../dep/src/zlib/infback.c
  46. + ../../dep/src/zlib/inffast.c
  47. + ../../dep/src/zlib/inflate.c
  48. + ../../dep/src/zlib/inftrees.c
  49. + ../../dep/src/zlib/trees.c
  50. + ../../dep/src/zlib/uncompr.c
  51. + ../../dep/src/zlib/zutil.c
  52. +)
  53. +
  54. +add_library(g3dlite
  55. + ../../dep/src/g3dlite/AABox.cpp
  56. + ../../dep/src/g3dlite/Any.cpp
  57. + ../../dep/src/g3dlite/AnyVal.cpp
  58. + ../../dep/src/g3dlite/AreaMemoryManager.cpp
  59. + ../../dep/src/g3dlite/BinaryFormat.cpp
  60. + ../../dep/src/g3dlite/BinaryInput.cpp
  61. + ../../dep/src/g3dlite/BinaryOutput.cpp
  62. + ../../dep/src/g3dlite/Box.cpp
  63. + ../../dep/src/g3dlite/Box2D.cpp
  64. + ../../dep/src/g3dlite/BumpMapPreprocess.cpp
  65. + ../../dep/src/g3dlite/Capsule.cpp
  66. + ../../dep/src/g3dlite/CollisionDetection.cpp
  67. + ../../dep/src/g3dlite/Color1.cpp
  68. + ../../dep/src/g3dlite/Color1uint8.cpp
  69. + ../../dep/src/g3dlite/Color3.cpp
  70. + ../../dep/src/g3dlite/Color3uint8.cpp
  71. + ../../dep/src/g3dlite/Color4.cpp
  72. + ../../dep/src/g3dlite/Color4uint8.cpp
  73. + ../../dep/src/g3dlite/Cone.cpp
  74. + ../../dep/src/g3dlite/constants.cpp
  75. + ../../dep/src/g3dlite/ConvexPolyhedron.cpp
  76. + ../../dep/src/g3dlite/CoordinateFrame.cpp
  77. + ../../dep/src/g3dlite/Crypto.cpp
  78. + ../../dep/src/g3dlite/Crypto_md5.cpp
  79. + ../../dep/src/g3dlite/Cylinder.cpp
  80. + ../../dep/src/g3dlite/debugAssert.cpp
  81. + ../../dep/src/g3dlite/fileutils.cpp
  82. + ../../dep/src/g3dlite/filter.cpp
  83. + ../../dep/src/g3dlite/format.cpp
  84. + ../../dep/src/g3dlite/g3dfnmatch.cpp
  85. + ../../dep/src/g3dlite/g3dmath.cpp
  86. + ../../dep/src/g3dlite/GCamera.cpp
  87. + ../../dep/src/g3dlite/GLight.cpp
  88. + ../../dep/src/g3dlite/GThread.cpp
  89. + ../../dep/src/g3dlite/GUniqueID.cpp
  90. + ../../dep/src/g3dlite/Intersect.cpp
  91. + ../../dep/src/g3dlite/license.cpp
  92. + ../../dep/src/g3dlite/Line.cpp
  93. + ../../dep/src/g3dlite/LineSegment.cpp
  94. + ../../dep/src/g3dlite/Log.cpp
  95. + ../../dep/src/g3dlite/Matrix.cpp
  96. + ../../dep/src/g3dlite/Matrix3.cpp
  97. + ../../dep/src/g3dlite/Matrix4.cpp
  98. + ../../dep/src/g3dlite/MemoryManager.cpp
  99. + ../../dep/src/g3dlite/MeshAlg.cpp
  100. + ../../dep/src/g3dlite/MeshAlgAdjacency.cpp
  101. + ../../dep/src/g3dlite/MeshAlgWeld.cpp
  102. + ../../dep/src/g3dlite/MeshBuilder.cpp
  103. + ../../dep/src/g3dlite/NetAddress.cpp
  104. + ../../dep/src/g3dlite/PhysicsFrame.cpp
  105. + ../../dep/src/g3dlite/Plane.cpp
  106. + ../../dep/src/g3dlite/PrecomputedRandom.cpp
  107. + ../../dep/src/g3dlite/prompt.cpp
  108. + ../../dep/src/g3dlite/Quat.cpp
  109. + ../../dep/src/g3dlite/Random.cpp
  110. + ../../dep/src/g3dlite/Ray.cpp
  111. + ../../dep/src/g3dlite/Rect2D.cpp
  112. + ../../dep/src/g3dlite/ReferenceCount.cpp
  113. + ../../dep/src/g3dlite/RegistryUtil.cpp
  114. + ../../dep/src/g3dlite/Sphere.cpp
  115. + ../../dep/src/g3dlite/SplineBase.cpp
  116. + ../../dep/src/g3dlite/stringutils.cpp
  117. + ../../dep/src/g3dlite/System.cpp
  118. + ../../dep/src/g3dlite/TextInput.cpp
  119. + ../../dep/src/g3dlite/TextOutput.cpp
  120. + ../../dep/src/g3dlite/ThreadSet.cpp
  121. + ../../dep/src/g3dlite/Triangle.cpp
  122. + ../../dep/src/g3dlite/uint128.cpp
  123. + ../../dep/src/g3dlite/UprightFrame.cpp
  124. + ../../dep/src/g3dlite/Vector2.cpp
  125. + ../../dep/src/g3dlite/Vector2int16.cpp
  126. + ../../dep/src/g3dlite/Vector3.cpp
  127. + ../../dep/src/g3dlite/Vector3int16.cpp
  128. + ../../dep/src/g3dlite/Vector3int32.cpp
  129. + ../../dep/src/g3dlite/Vector4.cpp
  130. + ../../dep/src/g3dlite/Vector4int8.cpp
  131. +)
  132.  
  133. add_library(vmap
  134. - ../../src/game/vmap/BIH.cpp
  135. - ../../src/game/vmap/VMapManager2.cpp
  136. - ../../src/game/vmap/MapTree.cpp
  137. - ../../src/game/vmap/TileAssembler.cpp
  138. - ../../src/game/vmap/WorldModel.cpp
  139. - ../../src/game/vmap/ModelInstance.cpp
  140. + ../../src/game/vmap/BIH.cpp
  141. + ../../src/game/vmap/VMapManager2.cpp
  142. + ../../src/game/vmap/MapTree.cpp
  143. + ../../src/game/vmap/TileAssembler.cpp
  144. + ../../src/game/vmap/WorldModel.cpp
  145. + ../../src/game/vmap/ModelInstance.cpp
  146. )
  147.  
  148. +target_compile_options(vmap PRIVATE -std=c++11)
  149. target_link_libraries(vmap g3dlite zlib)
  150.  
  151. +add_library(Detour
  152. + ../../dep/recastnavigation/Detour/Source/DetourAlloc.cpp
  153. + ../../dep/recastnavigation/Detour/Source/DetourCommon.cpp
  154. + ../../dep/recastnavigation/Detour/Source/DetourNavMesh.cpp
  155. + ../../dep/recastnavigation/Detour/Source/DetourNavMeshBuilder.cpp
  156. + ../../dep/recastnavigation/Detour/Source/DetourNavMeshQuery.cpp
  157. + ../../dep/recastnavigation/Detour/Source/DetourNode.cpp
  158. +)
  159. +
  160. add_library(Recast
  161. ../../dep/recastnavigation/Recast/Source/Recast.cpp
  162. ../../dep/recastnavigation/Recast/Source/RecastAlloc.cpp
  163. @@ -72,4 +173,6 @@ set(SOURCES
  164.  
  165. add_executable( MoveMapGen ${SOURCES} )
  166.  
  167. -target_link_libraries( MoveMapGen g3dlite vmap Detour Recast zlib )
  168. +target_compile_options(MoveMapGen PRIVATE -std=c++11)
  169. +target_link_libraries( MoveMapGen g3dlite vmap Detour Recast zlib ACE)
  170. +
  171. diff --git a/contrib/mmap/src/TerrainBuilder.h b/contrib/mmap/src/TerrainBuilder.h
  172. index 221025d..207a432 100644
  173. --- a/contrib/mmap/src/TerrainBuilder.h
  174. +++ b/contrib/mmap/src/TerrainBuilder.h
  175. @@ -23,7 +23,7 @@
  176.  
  177. #include "MMapCommon.h"
  178. #include "MangosMap.h"
  179. -#include "../../src/game/MoveMapSharedDefines.h"
  180. +#include "../../src/game/Maps/MoveMapSharedDefines.h"
  181.  
  182. #include "WorldModel.h"
  183. #include "VMapManager2.h"
  184. diff --git a/contrib/vmap_assembler/CMakeLists.txt b/contrib/vmap_assembler/CMakeLists.txt
  185. index de384f3..d45a8c1 100644
  186. --- a/contrib/vmap_assembler/CMakeLists.txt
  187. +++ b/contrib/vmap_assembler/CMakeLists.txt
  188. @@ -21,6 +21,7 @@ ADD_DEFINITIONS("-DNO_CORE_FUNCS")
  189. ADD_DEFINITIONS("-Wall")
  190. ADD_DEFINITIONS("-ggdb")
  191. ADD_DEFINITIONS("-O3")
  192. +ADD_DEFINITIONS("-std=c++11")
  193.  
  194. include_directories(../../src/shared)
  195. include_directories(../../src/game/vmap/)
  196. @@ -28,6 +29,8 @@ include_directories(../../dep/include/g3dlite/)
  197. include_directories(../../dep/ACE_wrappers/)
  198. include_directories(../../objdir/dep/ACE_wrappers)
  199. include_directories(../../src/framework/)
  200. +include_directories(../../src/game/)
  201. +include_directories(../../src/game/Commands/)
  202.  
  203. add_library(g3dlite ../../dep/src/g3dlite/AABox.cpp
  204. ../../dep/src/g3dlite/Box.cpp
  205. diff --git a/contrib/vmap_extractor/vmapextract/CMakeLists.txt b/contrib/vmap_extractor/vmapextract/CMakeLists.txt
  206. index 40bb1b9..88110ec 100644
  207. --- a/contrib/vmap_extractor/vmapextract/CMakeLists.txt
  208. +++ b/contrib/vmap_extractor/vmapextract/CMakeLists.txt
  209. @@ -18,5 +18,29 @@ cmake_minimum_required (VERSION 2.6)
  210. project (MANGOS_IOMAP_EXTRACTOR)
  211.  
  212. LINK_DIRECTORIES( ${LINK_DIRECTORIES} ../../../dep/libmpq/libmpq/.libs/ )
  213. +
  214. +ADD_DEFINITIONS( -DNO_vsnprintf )
  215. +
  216. +include_directories(
  217. + ../../../dep/src/zlib
  218. +)
  219. +
  220. +
  221. +add_library(zlib
  222. + ../../../dep/src/zlib/adler32.c
  223. + ../../../dep/src/zlib/compress.c
  224. + ../../../dep/src/zlib/crc32.c
  225. + ../../../dep/src/zlib/deflate.c
  226. + ../../../dep/src/zlib/example.c
  227. + ../../../dep/src/zlib/gzio.c
  228. + ../../../dep/src/zlib/infback.c
  229. + ../../../dep/src/zlib/inffast.c
  230. + ../../../dep/src/zlib/inflate.c
  231. + ../../../dep/src/zlib/inftrees.c
  232. + ../../../dep/src/zlib/trees.c
  233. + ../../../dep/src/zlib/uncompr.c
  234. + ../../../dep/src/zlib/zutil.c
  235. +)
  236. +
  237. add_executable(vmapextractor adtfile.cpp dbcfile.cpp gameobject_extract.cpp model.cpp mpq_libmpq.cpp vmapexport.cpp wdtfile.cpp wmo.cpp)
  238. -target_link_libraries(vmapextractor libmpq.a bz2 z)
  239. +target_link_libraries(vmapextractor libmpq.a bz2 zlib)
  240. diff --git a/contrib/vmap_extractor/vmapextract/vmapexport.cpp b/contrib/vmap_extractor/vmapextract/vmapexport.cpp
  241. index 38939e5..733d33a 100644
  242. --- a/contrib/vmap_extractor/vmapextract/vmapexport.cpp
  243. +++ b/contrib/vmap_extractor/vmapextract/vmapexport.cpp
  244. @@ -494,7 +494,7 @@ int main(int argc, char** argv)
  245.  
  246.  
  247. delete dbc;
  248. - //ParsMapFiles();
  249. + ParsMapFiles();
  250. delete [] map_ids;
  251. //nError = ERROR_SUCCESS;
  252. // Extract models, listed in DameObjectDisplayInfo.dbc
  253. diff --git a/dep/libmpq/autogen.sh b/dep/libmpq/autogen.sh
  254. old mode 100644
  255. new mode 100755
  256. diff --git a/dep/recastnavigation/Detour/CMakeLists.txt b/dep/recastnavigation/Detour/CMakeLists.txt
  257. index eec47ef..a9d7dd4 100644
  258. --- a/dep/recastnavigation/Detour/CMakeLists.txt
  259. +++ b/dep/recastnavigation/Detour/CMakeLists.txt
  260. @@ -16,3 +16,4 @@
  261. # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  262. #
  263. add_subdirectory(Source)
  264. +include_directories(../Include)
  265. diff --git a/dep/recastnavigation/Detour/Source/CMakeLists.txt b/dep/recastnavigation/Detour/Source/CMakeLists.txt
  266. index d3a7106..bc994f7 100644
  267. --- a/dep/recastnavigation/Detour/Source/CMakeLists.txt
  268. +++ b/dep/recastnavigation/Detour/Source/CMakeLists.txt
  269. @@ -29,6 +29,7 @@ include_directories(
  270. ${CMAKE_SOURCE_DIR}/dep/recastnavigation
  271. ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour
  272. ${CMAKE_SOURCE_DIR}/dep/recastnavigation/Detour/Include
  273. + ../Include
  274. )
  275.  
  276. add_library(detour STATIC
  277. diff --git a/dep/src/g3dlite/CMakeLists.txt b/dep/src/g3dlite/CMakeLists.txt
  278. index f2615c4..c25862e 100644
  279. --- a/dep/src/g3dlite/CMakeLists.txt
  280. +++ b/dep/src/g3dlite/CMakeLists.txt
  281. @@ -64,6 +64,7 @@ include_directories(
  282. ${CMAKE_SOURCE_DIR}/dep/include
  283. ${CMAKE_SOURCE_DIR}/dep/include/g3dlite
  284. ${CMAKE_SOURCE_DIR}/dep/include/zlib
  285. + ../../include/g3dlite
  286. )
  287.  
  288. add_library(g3dlite STATIC
  289. diff --git a/src/game/Maps/MoveMapSharedDefines.h b/src/game/Maps/MoveMapSharedDefines.h
  290. index c9cfb23..e83ce46 100644
  291. --- a/src/game/Maps/MoveMapSharedDefines.h
  292. +++ b/src/game/Maps/MoveMapSharedDefines.h
  293. @@ -20,7 +20,7 @@
  294. #define _MOVE_MAP_SHARED_DEFINES_H
  295.  
  296. #include "Platform/Define.h"
  297. -#include "../recastnavigation/Detour/Include/DetourNavMesh.h"
  298. +#include "DetourNavMesh.h"
  299.  
  300. #define MMAP_MAGIC 0x4d4d4150 // 'MMAP'
  301. #define MMAP_VERSION 3
  302. diff --git a/src/game/vmap/VMapManager2.cpp b/src/game/vmap/VMapManager2.cpp
  303. index 737e4ea..c22f943 100644
  304. --- a/src/game/vmap/VMapManager2.cpp
  305. +++ b/src/game/vmap/VMapManager2.cpp
  306. @@ -311,7 +311,7 @@ void VMapManager2::releaseModelInstance(const std::string& filename)
  307. return;
  308. }
  309. int decreasedValue = model->second.decRefCount();
  310. - if (sWorld.getConfig(CONFIG_BOOL_COLLISION_MODELS_UNLOAD) && decreasedValue <= 0)
  311. + if (decreasedValue <= 0)
  312. {
  313. m_modelsLock.release();
  314. m_modelsLock.acquire_write();
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!