Fix some typos and remove parent merged cmake file

--HG--
branch : trunk

3 files changed, 4 insertions, 16 deletions

diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index feb1c07f26b..4f9b0a8c855 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -16,10 +16,11 @@ file(GLOB sources *.cpp)
 file(GLOB loadlib_sources loadlib/*.cpp)
 
 include_directories (${CMAKE_SOURCE_DIR}/externals/libmpq)
-include_directories (${CMAKE_SOURCE_DIR}/src/tools/map-extractor/loadlib)
+include_directories (${CMAKE_SOURCE_DIR}/src/tools/map_extractor)
+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)
+link_directories (${CMAKE_SOURCE_DIR}}/src/tools/map_extractor/loadlib)
 
 add_library (loadlib ${loadlib_sources})
 target_link_libraries (loadlib zlib)
diff --git a/src/tools/map_extractor/loadlib/CMakeLists.txt b/src/tools/map_extractor/loadlib/CMakeLists.txt
deleted file mode 100644
index 5680c61d424..00000000000
--- a/src/tools/map_extractor/loadlib/CMakeLists.txt
+++ /dev/null
@@ -1,13 +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.
-
-add_library (loadlib loadlib.cpp  adt.cpp  wdt.cpp)
-# link loadlib with zlib
-target_link_libraries (loadlib z)
diff --git a/src/tools/map_extractor/loadlib/loadlib.cpp b/src/tools/map_extractor/loadlib/loadlib.cpp
index ed5bd9acb71..90d95ebfe35 100644
--- a/src/tools/map_extractor/loadlib/loadlib.cpp
+++ b/src/tools/map_extractor/loadlib/loadlib.cpp
@@ -1,7 +1,7 @@
 #define _CRT_SECURE_NO_DEPRECATE
 
 #include "loadlib.h"
-#include "../mpq_libmpq.h"
+#include "mpq_libmpq.h"
 
 class MPQFile;