Tools/Extractors: Mmap extractors no longer depend on shared and MySQL libraries

4 files changed, 10 insertions, 22 deletions

diff --git a/src/tools/vmap4_extractor/CMakeLists.txt b/src/tools/vmap4_extractor/CMakeLists.txt
index 19798e46475..023f5447f85 100644
--- a/src/tools/vmap4_extractor/CMakeLists.txt
+++ b/src/tools/vmap4_extractor/CMakeLists.txt
@@ -11,26 +11,19 @@
 
 file(GLOB_RECURSE sources *.cpp *.h)
 
-# 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")
-
-if( UNIX )
-  include_directories(
-    ${CMAKE_SOURCE_DIR}/dep/libmpq
-  )
-elseif( WIN32 )
-  include_directories(
+set(include_Dirs
     ${CMAKE_SOURCE_DIR}/dep/libmpq
+)
+
+if( WIN32 )
+  set(include_Dirs
+    ${include_Dirs}
     ${CMAKE_SOURCE_DIR}/dep/libmpq/win
   )
 endif()
 
+include_directories(${include_Dirs})
+
 add_executable(vmap4extractor ${sources})
 
 target_link_libraries(vmap4extractor
@@ -39,8 +32,6 @@ target_link_libraries(vmap4extractor
   ${ZLIB_LIBRARIES}
 )
 
-add_dependencies(vmap4extractor mpq)
-
 if( UNIX )
   install(TARGETS vmap4extractor DESTINATION bin)
 elseif( WIN32 )
diff --git a/src/tools/vmap4_extractor/mpq_libmpq.cpp b/src/tools/vmap4_extractor/mpq_libmpq.cpp
index 528b9679a58..ffa097d9a22 100644
--- a/src/tools/vmap4_extractor/mpq_libmpq.cpp
+++ b/src/tools/vmap4_extractor/mpq_libmpq.cpp
@@ -79,7 +79,7 @@ size_t MPQFile::read(void* dest, size_t bytes)
     if (eof) return 0;
 
     size_t rpos = pointer + bytes;
-    if (rpos > size) {
+    if (rpos > size_t(size)) {
         bytes = size - pointer;
         eof = true;
     }
diff --git a/src/tools/vmap4_extractor/mpq_libmpq04.h b/src/tools/vmap4_extractor/mpq_libmpq04.h
index 89f715e9e87..9f0163067c4 100644
--- a/src/tools/vmap4_extractor/mpq_libmpq04.h
+++ b/src/tools/vmap4_extractor/mpq_libmpq04.h
@@ -1,6 +1,3 @@
-#define _CRT_SECURE_NO_DEPRECATE
-#define _CRT_SECURE_NO_WARNINGS
-
 #ifndef MPQ_H
 #define MPQ_H
 
diff --git a/src/tools/vmap4_extractor/wdtfile.cpp b/src/tools/vmap4_extractor/wdtfile.cpp
index 7420edfee2e..d9216fd77eb 100644
--- a/src/tools/vmap4_extractor/wdtfile.cpp
+++ b/src/tools/vmap4_extractor/wdtfile.cpp
@@ -35,7 +35,7 @@ WDTFile::WDTFile(char* file_name, char* file_name1) : WDT(file_name), gWmoInstan
     filename.append(file_name1,strlen(file_name1));
 }
 
-bool WDTFile::init(char */*map_id*/, unsigned int mapID)
+bool WDTFile::init(char* /*map_id*/, unsigned int mapID)
 {
     if (WDT.isEof())
     {