More fixes for tools/ cmake files

--HG--
branch : trunk

2 files changed, 16 insertions, 67 deletions

diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index 2e9cb3591f1..feb1c07f26b 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -13,8 +13,7 @@ cmake_minimum_required (VERSION 2.6)
 project (TRINITY_MAP_EXTRACTOR)
 
 file(GLOB sources *.cpp)
-
-add_subdirectory (loadlib)
+file(GLOB loadlib_sources loadlib/*.cpp)
 
 include_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
 include_directories (${CMAKE_SOURCE_DIR}/src/tools/map-extractor/loadlib)
@@ -22,6 +21,9 @@ include_directories (${CMAKE_SOURCE_DIR}/src/tools/map-extractor/loadlib)
 link_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
 link_directories (${CMAKE_SOURCE_DIR}}/src/tools/map-extractor/loadlib)
 
+add_library (loadlib ${loadlib_sources})
+target_link_libraries (loadlib zlib)
+
 add_executable (trinity-map_extractor ${sources})
 
 target_link_libraries (trinity-map_extractor libmpq loadlib)
diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index 42f9a972a25..c604334c830 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright (C) 2005-2009 MaNGOS project <http://getmangos.com/>
+# Copyright (C) 2005-2009 MaNGOS Trinity <http://www,trinitycore.org/>
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -9,76 +10,22 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 cmake_minimum_required (VERSION 2.6)
-project (MANGOS_VMAP_ASSEMB_IO)
+#project (MANGOS_VMAP_ASSEMB_IO)
 
-set(CMAKE_VERBOSE_MAKEFILE true)
+#set(CMAKE_VERBOSE_MAKEFILE true)
 
 # uncomment next line to disable debug mode
-ADD_DEFINITIONS("-DIOMAP_DEBUG")
+#ADD_DEFINITIONS("-DIOMAP_DEBUG")
+#ADD_DEFINITIONS("-Wall")
+#ADD_DEFINITIONS("-ggdb")
+#ADD_DEFINITIONS("-O3")
 
-ADD_DEFINITIONS("-Wall")
-ADD_DEFINITIONS("-ggdb")
-ADD_DEFINITIONS("-O3")
+include_directories(${CMAKE_SOURCE_FILE}/src/server/collision)
+include_directories(${CMAKE_SOURCE_FILE}/externals/g3dlite)
+include_directories(${ACE_INCLUDE_DIR})
 
-include_directories(../../src/server/shared/vmap/)
-include_directories(../../dep/include/g3dlite/)
-include_directories(../../dep/ACE_wrappers/)
-include_directories(../../objdir/dep/ACE_wrappers)
-include_directories(../../src/server/framework/)
-
-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(vmap
-	../../src/shared/vmap/BoundingIntervalHierarchy.cpp
-	../../src/shared/vmap/VMapManager2.cpp
-	../../src/shared/vmap/MapTree.cpp
-	../../src/shared/vmap/TileAssembler.cpp
-	../../src/shared/vmap/WorldModel.cpp
-	../../src/shared/vmap/ModelInstance.cpp
-	)
-
-target_link_libraries(vmap g3dlite z)
-
-add_executable(vmap_assembler VMapAssembler.cpp)
-target_link_libraries(vmap_assembler vmap)
+add_executable(trinity-collision_assembler VMapAssembler.cpp)
+target_link_libraries(trinity-collision_assembler collision g3dlite)
 
 # add_executable(vmap_test coordinate_test.cpp)
 # target_link_libraries(vmap_test vmap)