19 files changed, 4 insertions, 30 deletions
diff --git a/src/tools/vmap3_extractor/CMakeLists.txt b/src/tools/vmap3_extractor/CMakeLists.txt
index 20e4f7c64ce..51e867ec07e 100644
--- a/src/tools/vmap3_extractor/CMakeLists.txt
+++ b/src/tools/vmap3_extractor/CMakeLists.txt
@@ -9,18 +9,8 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 cmake_minimum_required (VERSION 2.6)
-project (MANGOS_VMAP_EXTRACT_IO)
+project (MANGOS_IOMAP_EXTRACTOR)
 
-
-# uncomment next line to disable debug mode
-ADD_DEFINITIONS("-DIOMAP_DEBUG")
-# build setup currently only supports libmpq 0.4.x
-ADD_DEFINITIONS("-DUSE_LIBMPQ04")
-ADD_DEFINITIONS("-Wall")
-ADD_DEFINITIONS("-ggdb")
-ADD_DEFINITIONS("-O3")
-
-include_directories(../libmpq)
-#add_subdirectory(stormlib)
-
-add_subdirectory(vmapextract)
+LINK_DIRECTORIES( ${LINK_DIRECTORIES} ../../libmpq/libmpq/.libs/ )
+add_executable(vmapextractor adtfile.cpp  dbcfile.cpp  model.cpp  mpq_libmpq.cpp  vmapexport.cpp  wdtfile.cpp  wmo.cpp)
+target_link_libraries(vmapextractor mpq)
diff --git a/src/tools/vmap3_extractor/vmapextract/adtfile.cpp b/src/tools/vmap3_extractor/adtfile.cpp
index 055408edca6..055408edca6 100644
--- a/src/tools/vmap3_extractor/vmapextract/adtfile.cpp
+++ b/src/tools/vmap3_extractor/adtfile.cpp
diff --git a/src/tools/vmap3_extractor/vmapextract/adtfile.h b/src/tools/vmap3_extractor/adtfile.h
index eaf09a9243d..eaf09a9243d 100644
--- a/src/tools/vmap3_extractor/vmapextract/adtfile.h
+++ b/src/tools/vmap3_extractor/adtfile.h
diff --git a/src/tools/vmap3_extractor/vmapextract/dbcfile.cpp b/src/tools/vmap3_extractor/dbcfile.cpp
index 8b8afe9f23c..8b8afe9f23c 100644
--- a/src/tools/vmap3_extractor/vmapextract/dbcfile.cpp
+++ b/src/tools/vmap3_extractor/dbcfile.cpp
diff --git a/src/tools/vmap3_extractor/vmapextract/dbcfile.h b/src/tools/vmap3_extractor/dbcfile.h
index 7381ab9f668..7381ab9f668 100644
--- a/src/tools/vmap3_extractor/vmapextract/dbcfile.h
+++ b/src/tools/vmap3_extractor/dbcfile.h
diff --git a/src/tools/vmap3_extractor/vmapextract/loadlib/loadlib.h b/src/tools/vmap3_extractor/loadlib/loadlib.h
index 53731753425..53731753425 100644
--- a/src/tools/vmap3_extractor/vmapextract/loadlib/loadlib.h
+++ b/src/tools/vmap3_extractor/loadlib/loadlib.h
diff --git a/src/tools/vmap3_extractor/vmapextract/model.cpp b/src/tools/vmap3_extractor/model.cpp
index b914ed96406..b914ed96406 100644
--- a/src/tools/vmap3_extractor/vmapextract/model.cpp
+++ b/src/tools/vmap3_extractor/model.cpp
diff --git a/src/tools/vmap3_extractor/vmapextract/model.h b/src/tools/vmap3_extractor/model.h
index d1be46f3c13..d1be46f3c13 100644
--- a/src/tools/vmap3_extractor/vmapextract/model.h
+++ b/src/tools/vmap3_extractor/model.h
diff --git a/src/tools/vmap3_extractor/vmapextract/modelheaders.h b/src/tools/vmap3_extractor/modelheaders.h
index 776a981ebd8..776a981ebd8 100644
--- a/src/tools/vmap3_extractor/vmapextract/modelheaders.h
+++ b/src/tools/vmap3_extractor/modelheaders.h
diff --git a/src/tools/vmap3_extractor/vmapextract/mpq_libmpq.cpp b/src/tools/vmap3_extractor/mpq_libmpq.cpp
index 4aa59417f81..4aa59417f81 100644
--- a/src/tools/vmap3_extractor/vmapextract/mpq_libmpq.cpp
+++ b/src/tools/vmap3_extractor/mpq_libmpq.cpp
diff --git a/src/tools/vmap3_extractor/vmapextract/mpq_libmpq04.h b/src/tools/vmap3_extractor/mpq_libmpq04.h
index ccbfe37cba7..ccbfe37cba7 100644
--- a/src/tools/vmap3_extractor/vmapextract/mpq_libmpq04.h
+++ b/src/tools/vmap3_extractor/mpq_libmpq04.h
diff --git a/src/tools/vmap3_extractor/vmapextract/vec3d.h b/src/tools/vmap3_extractor/vec3d.h
index d2569bc133b..d2569bc133b 100644
--- a/src/tools/vmap3_extractor/vmapextract/vec3d.h
+++ b/src/tools/vmap3_extractor/vec3d.h
diff --git a/src/tools/vmap3_extractor/vmapextract/vmapexport.cpp b/src/tools/vmap3_extractor/vmapexport.cpp
index 07d5d31d418..07d5d31d418 100644
--- a/src/tools/vmap3_extractor/vmapextract/vmapexport.cpp
+++ b/src/tools/vmap3_extractor/vmapexport.cpp
diff --git a/src/tools/vmap3_extractor/vmapextract/vmapexport.h b/src/tools/vmap3_extractor/vmapexport.h
index 625bc930882..625bc930882 100644
--- a/src/tools/vmap3_extractor/vmapextract/vmapexport.h
+++ b/src/tools/vmap3_extractor/vmapexport.h
diff --git a/src/tools/vmap3_extractor/vmapextract/CMakeLists.txt b/src/tools/vmap3_extractor/vmapextract/CMakeLists.txt
deleted file mode 100644
index 51e867ec07e..00000000000
--- a/src/tools/vmap3_extractor/vmapextract/CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright (C) 2005-2009 MaNGOS project <http://getmangos.com/>
-#
-# This file is free software; as a special exception the author gives
-# unlimited permission to copy and/or distribute it, with or without
-# modifications, as long as this notice is preserved.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-cmake_minimum_required (VERSION 2.6)
-project (MANGOS_IOMAP_EXTRACTOR)
-
-LINK_DIRECTORIES( ${LINK_DIRECTORIES} ../../libmpq/libmpq/.libs/ )
-add_executable(vmapextractor adtfile.cpp  dbcfile.cpp  model.cpp  mpq_libmpq.cpp  vmapexport.cpp  wdtfile.cpp  wmo.cpp)
-target_link_libraries(vmapextractor mpq)
diff --git a/src/tools/vmap3_extractor/vmapextract/wdtfile.cpp b/src/tools/vmap3_extractor/wdtfile.cpp
index 7f81af72931..7f81af72931 100644
--- a/src/tools/vmap3_extractor/vmapextract/wdtfile.cpp
+++ b/src/tools/vmap3_extractor/wdtfile.cpp
diff --git a/src/tools/vmap3_extractor/vmapextract/wdtfile.h b/src/tools/vmap3_extractor/wdtfile.h
index f3d71c41791..f3d71c41791 100644
--- a/src/tools/vmap3_extractor/vmapextract/wdtfile.h
+++ b/src/tools/vmap3_extractor/wdtfile.h
diff --git a/src/tools/vmap3_extractor/vmapextract/wmo.cpp b/src/tools/vmap3_extractor/wmo.cpp
index 508391be675..508391be675 100644
--- a/src/tools/vmap3_extractor/vmapextract/wmo.cpp
+++ b/src/tools/vmap3_extractor/wmo.cpp
diff --git a/src/tools/vmap3_extractor/vmapextract/wmo.h b/src/tools/vmap3_extractor/wmo.h
index 12979bc13d9..12979bc13d9 100644
--- a/src/tools/vmap3_extractor/vmapextract/wmo.h
+++ b/src/tools/vmap3_extractor/wmo.h