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 similarity index 100% rename from src/tools/vmap3_extractor/vmapextract/adtfile.cpp rename to src/tools/vmap3_extractor/adtfile.cpp diff --git a/src/tools/vmap3_extractor/vmapextract/adtfile.h b/src/tools/vmap3_extractor/adtfile.h similarity index 100% rename from src/tools/vmap3_extractor/vmapextract/adtfile.h rename to src/tools/vmap3_extractor/adtfile.h diff --git a/src/tools/vmap3_extractor/vmapextract/dbcfile.cpp b/src/tools/vmap3_extractor/dbcfile.cpp similarity index 100% rename from src/tools/vmap3_extractor/vmapextract/dbcfile.cpp rename to src/tools/vmap3_extractor/dbcfile.cpp diff --git a/src/tools/vmap3_extractor/vmapextract/dbcfile.h b/src/tools/vmap3_extractor/dbcfile.h similarity index 100% rename from src/tools/vmap3_extractor/vmapextract/dbcfile.h rename to 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 similarity index 100% rename from src/tools/vmap3_extractor/vmapextract/loadlib/loadlib.h rename to src/tools/vmap3_extractor/loadlib/loadlib.h diff --git a/src/tools/vmap3_extractor/vmapextract/model.cpp b/src/tools/vmap3_extractor/model.cpp similarity index 100% rename from src/tools/vmap3_extractor/vmapextract/model.cpp rename to src/tools/vmap3_extractor/model.cpp diff --git a/src/tools/vmap3_extractor/vmapextract/model.h b/src/tools/vmap3_extractor/model.h similarity index 100% rename from src/tools/vmap3_extractor/vmapextract/model.h rename to src/tools/vmap3_extractor/model.h diff --git a/src/tools/vmap3_extractor/vmapextract/modelheaders.h b/src/tools/vmap3_extractor/modelheaders.h similarity index 100% rename from src/tools/vmap3_extractor/vmapextract/modelheaders.h rename to 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 similarity index 100% rename from src/tools/vmap3_extractor/vmapextract/mpq_libmpq.cpp rename to 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 similarity index 100% rename from src/tools/vmap3_extractor/vmapextract/mpq_libmpq04.h rename to src/tools/vmap3_extractor/mpq_libmpq04.h diff --git a/src/tools/vmap3_extractor/vmapextract/vec3d.h b/src/tools/vmap3_extractor/vec3d.h similarity index 100% rename from src/tools/vmap3_extractor/vmapextract/vec3d.h rename to src/tools/vmap3_extractor/vec3d.h diff --git a/src/tools/vmap3_extractor/vmapextract/vmapexport.cpp b/src/tools/vmap3_extractor/vmapexport.cpp similarity index 100% rename from src/tools/vmap3_extractor/vmapextract/vmapexport.cpp rename to src/tools/vmap3_extractor/vmapexport.cpp diff --git a/src/tools/vmap3_extractor/vmapextract/vmapexport.h b/src/tools/vmap3_extractor/vmapexport.h similarity index 100% rename from src/tools/vmap3_extractor/vmapextract/vmapexport.h rename to 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 -# -# 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 similarity index 100% rename from src/tools/vmap3_extractor/vmapextract/wdtfile.cpp rename to src/tools/vmap3_extractor/wdtfile.cpp diff --git a/src/tools/vmap3_extractor/vmapextract/wdtfile.h b/src/tools/vmap3_extractor/wdtfile.h similarity index 100% rename from src/tools/vmap3_extractor/vmapextract/wdtfile.h rename to src/tools/vmap3_extractor/wdtfile.h diff --git a/src/tools/vmap3_extractor/vmapextract/wmo.cpp b/src/tools/vmap3_extractor/wmo.cpp similarity index 100% rename from src/tools/vmap3_extractor/vmapextract/wmo.cpp rename to src/tools/vmap3_extractor/wmo.cpp diff --git a/src/tools/vmap3_extractor/vmapextract/wmo.h b/src/tools/vmap3_extractor/wmo.h similarity index 100% rename from src/tools/vmap3_extractor/vmapextract/wmo.h rename to src/tools/vmap3_extractor/wmo.h