From 55d5eaf112dafe6a3eb09b83290227c61b4f945b Mon Sep 17 00:00:00 2001 From: Antz Date: Tue, 28 Jul 2015 22:02:31 +0100 Subject: [PATCH] [Tools] Fixed movemaps compile --- .../{src => }/IntermediateValues.cpp | 0 .../{src => }/IntermediateValues.h | 0 .../Movemap-Generator/{src => }/MMapCommon.h | 0 .../Movemap-Generator/{src => }/MangosMap.h | 0 .../{src => }/MapBuilder.cpp | 76 +++--- .../Movemap-Generator/{src => }/MapBuilder.h | 0 .../Movemap-Generator/Movemap-Generator.rc | 25 ++ .../{src => }/TerrainBuilder.cpp | 0 .../{src => }/TerrainBuilder.h | 2 +- .../{src => }/VMapExtensions.cpp | 0 .../Movemap-Generator/{src => }/generator.cpp | 0 .../win/MoveMapGen_VC100.sln | 87 ------- .../win/MoveMapGen_VC110.sln | 86 ------- .../win/MoveMapGen_VC120.sln | 86 ------- .../Movemap-Generator/win/VC100/.gitignore | 6 - .../win/VC100/MoveMapGen_VC100.vcxproj | 155 ------------- .../VC100/MoveMapGen_VC100.vcxproj.filters | 99 -------- .../Movemap-Generator/win/VC110/.gitignore | 6 - .../win/VC110/MoveMapGen_VC110.vcxproj | 157 ------------- .../VC110/MoveMapGen_VC110.vcxproj.filters | 99 -------- .../Movemap-Generator/win/VC120/.gitignore | 6 - .../win/VC120/MoveMapGen_VC120.vcxproj | 157 ------------- .../VC120/MoveMapGen_VC120.vcxproj.filters | 99 -------- src/tools/genrevision/genrevision.cpp | 2 +- src/tools/map-extractor/dbcfile.cpp | 16 +- src/tools/map-extractor/dbcfile.h | 188 ++++++++++++--- src/tools/vmap-assembler/VC100/.gitignore | 2 - .../VC100/vmap_assembler.vcxproj | 214 ----------------- src/tools/vmap-assembler/VC110/.gitignore | 2 - .../VC110/vmap_assembler.vcxproj | 218 ------------------ src/tools/vmap-assembler/VC120/.gitignore | 2 - .../VC120/vmap_assembler.vcxproj | 218 ------------------ .../vmap-assembler/vmap_assemblerVC100.sln | 59 ----- .../vmap-assembler/vmap_assemblerVC110.sln | 59 ----- .../vmap-assembler/vmap_assemblerVC120.sln | 59 ----- .../{vmapextract => }/adtfile.cpp | 0 .../{vmapextract => }/adtfile.h | 0 .../{vmapextract => }/dbcfile.cpp | 0 .../{vmapextract => }/dbcfile.h | 0 .../{vmapextract => }/gameobject_extract.cpp | 0 .../{vmapextract => }/loadlib/loadlib.h | 0 .../{vmapextract => }/model.cpp | 0 .../vmap-extractor/{vmapextract => }/model.h | 0 .../{vmapextract => }/modelheaders.h | 0 .../{vmapextract => }/mpqfile.cpp | 0 .../{vmapextract => }/mpqfile.h | 0 .../vmap-extractor/{vmapextract => }/vec3d.h | 0 src/tools/vmap-extractor/vmap-extractor.rc | 25 ++ .../{vmapextract => }/vmapexport.cpp | 0 .../{vmapextract => }/vmapexport.h | 0 .../vmap-extractor/vmapextract/CMakeLists.txt | 17 -- .../{vmapextract => }/wdtfile.cpp | 0 .../{vmapextract => }/wdtfile.h | 0 .../win/VC100/vmapExtractor.vcxproj | 111 --------- .../win/VC100/vmapExtractor.vcxproj.filters | 66 ------ .../win/VC110/vmapExtractor.vcxproj | 113 --------- .../win/VC110/vmapExtractor.vcxproj.filters | 67 ------ .../win/VC120/vmapExtractor.vcxproj | 113 --------- .../win/VC120/vmapExtractor.vcxproj.filters | 67 ------ .../win/vmapExtractor_VC100.sln | 116 ---------- .../win/vmapExtractor_VC110.sln | 116 ---------- .../win/vmapExtractor_VC120.sln | 116 ---------- .../vmap-extractor/{vmapextract => }/wmo.cpp | 0 .../vmap-extractor/{vmapextract => }/wmo.h | 0 64 files changed, 268 insertions(+), 2844 deletions(-) rename src/tools/Movemap-Generator/{src => }/IntermediateValues.cpp (100%) rename src/tools/Movemap-Generator/{src => }/IntermediateValues.h (100%) rename src/tools/Movemap-Generator/{src => }/MMapCommon.h (100%) rename src/tools/Movemap-Generator/{src => }/MangosMap.h (100%) rename src/tools/Movemap-Generator/{src => }/MapBuilder.cpp (95%) rename src/tools/Movemap-Generator/{src => }/MapBuilder.h (100%) create mode 100644 src/tools/Movemap-Generator/Movemap-Generator.rc rename src/tools/Movemap-Generator/{src => }/TerrainBuilder.cpp (100%) rename src/tools/Movemap-Generator/{src => }/TerrainBuilder.h (99%) rename src/tools/Movemap-Generator/{src => }/VMapExtensions.cpp (100%) rename src/tools/Movemap-Generator/{src => }/generator.cpp (100%) delete mode 100644 src/tools/Movemap-Generator/win/MoveMapGen_VC100.sln delete mode 100644 src/tools/Movemap-Generator/win/MoveMapGen_VC110.sln delete mode 100644 src/tools/Movemap-Generator/win/MoveMapGen_VC120.sln delete mode 100644 src/tools/Movemap-Generator/win/VC100/.gitignore delete mode 100644 src/tools/Movemap-Generator/win/VC100/MoveMapGen_VC100.vcxproj delete mode 100644 src/tools/Movemap-Generator/win/VC100/MoveMapGen_VC100.vcxproj.filters delete mode 100644 src/tools/Movemap-Generator/win/VC110/.gitignore delete mode 100644 src/tools/Movemap-Generator/win/VC110/MoveMapGen_VC110.vcxproj delete mode 100644 src/tools/Movemap-Generator/win/VC110/MoveMapGen_VC110.vcxproj.filters delete mode 100644 src/tools/Movemap-Generator/win/VC120/.gitignore delete mode 100644 src/tools/Movemap-Generator/win/VC120/MoveMapGen_VC120.vcxproj delete mode 100644 src/tools/Movemap-Generator/win/VC120/MoveMapGen_VC120.vcxproj.filters delete mode 100644 src/tools/vmap-assembler/VC100/.gitignore delete mode 100644 src/tools/vmap-assembler/VC100/vmap_assembler.vcxproj delete mode 100644 src/tools/vmap-assembler/VC110/.gitignore delete mode 100644 src/tools/vmap-assembler/VC110/vmap_assembler.vcxproj delete mode 100644 src/tools/vmap-assembler/VC120/.gitignore delete mode 100644 src/tools/vmap-assembler/VC120/vmap_assembler.vcxproj delete mode 100644 src/tools/vmap-assembler/vmap_assemblerVC100.sln delete mode 100644 src/tools/vmap-assembler/vmap_assemblerVC110.sln delete mode 100644 src/tools/vmap-assembler/vmap_assemblerVC120.sln rename src/tools/vmap-extractor/{vmapextract => }/adtfile.cpp (100%) rename src/tools/vmap-extractor/{vmapextract => }/adtfile.h (100%) rename src/tools/vmap-extractor/{vmapextract => }/dbcfile.cpp (100%) rename src/tools/vmap-extractor/{vmapextract => }/dbcfile.h (100%) rename src/tools/vmap-extractor/{vmapextract => }/gameobject_extract.cpp (100%) rename src/tools/vmap-extractor/{vmapextract => }/loadlib/loadlib.h (100%) rename src/tools/vmap-extractor/{vmapextract => }/model.cpp (100%) rename src/tools/vmap-extractor/{vmapextract => }/model.h (100%) rename src/tools/vmap-extractor/{vmapextract => }/modelheaders.h (100%) rename src/tools/vmap-extractor/{vmapextract => }/mpqfile.cpp (100%) rename src/tools/vmap-extractor/{vmapextract => }/mpqfile.h (100%) rename src/tools/vmap-extractor/{vmapextract => }/vec3d.h (100%) create mode 100644 src/tools/vmap-extractor/vmap-extractor.rc rename src/tools/vmap-extractor/{vmapextract => }/vmapexport.cpp (100%) rename src/tools/vmap-extractor/{vmapextract => }/vmapexport.h (100%) delete mode 100644 src/tools/vmap-extractor/vmapextract/CMakeLists.txt rename src/tools/vmap-extractor/{vmapextract => }/wdtfile.cpp (100%) rename src/tools/vmap-extractor/{vmapextract => }/wdtfile.h (100%) delete mode 100644 src/tools/vmap-extractor/win/VC100/vmapExtractor.vcxproj delete mode 100644 src/tools/vmap-extractor/win/VC100/vmapExtractor.vcxproj.filters delete mode 100644 src/tools/vmap-extractor/win/VC110/vmapExtractor.vcxproj delete mode 100644 src/tools/vmap-extractor/win/VC110/vmapExtractor.vcxproj.filters delete mode 100644 src/tools/vmap-extractor/win/VC120/vmapExtractor.vcxproj delete mode 100644 src/tools/vmap-extractor/win/VC120/vmapExtractor.vcxproj.filters delete mode 100644 src/tools/vmap-extractor/win/vmapExtractor_VC100.sln delete mode 100644 src/tools/vmap-extractor/win/vmapExtractor_VC110.sln delete mode 100644 src/tools/vmap-extractor/win/vmapExtractor_VC120.sln rename src/tools/vmap-extractor/{vmapextract => }/wmo.cpp (100%) rename src/tools/vmap-extractor/{vmapextract => }/wmo.h (100%) diff --git a/src/tools/Movemap-Generator/src/IntermediateValues.cpp b/src/tools/Movemap-Generator/IntermediateValues.cpp similarity index 100% rename from src/tools/Movemap-Generator/src/IntermediateValues.cpp rename to src/tools/Movemap-Generator/IntermediateValues.cpp diff --git a/src/tools/Movemap-Generator/src/IntermediateValues.h b/src/tools/Movemap-Generator/IntermediateValues.h similarity index 100% rename from src/tools/Movemap-Generator/src/IntermediateValues.h rename to src/tools/Movemap-Generator/IntermediateValues.h diff --git a/src/tools/Movemap-Generator/src/MMapCommon.h b/src/tools/Movemap-Generator/MMapCommon.h similarity index 100% rename from src/tools/Movemap-Generator/src/MMapCommon.h rename to src/tools/Movemap-Generator/MMapCommon.h diff --git a/src/tools/Movemap-Generator/src/MangosMap.h b/src/tools/Movemap-Generator/MangosMap.h similarity index 100% rename from src/tools/Movemap-Generator/src/MangosMap.h rename to src/tools/Movemap-Generator/MangosMap.h diff --git a/src/tools/Movemap-Generator/src/MapBuilder.cpp b/src/tools/Movemap-Generator/MapBuilder.cpp similarity index 95% rename from src/tools/Movemap-Generator/src/MapBuilder.cpp rename to src/tools/Movemap-Generator/MapBuilder.cpp index b06c40e56..5f019e33d 100644 --- a/src/tools/Movemap-Generator/src/MapBuilder.cpp +++ b/src/tools/Movemap-Generator/MapBuilder.cpp @@ -22,15 +22,15 @@ * and lore are copyrighted by Blizzard Entertainment, Inc. */ +#include +#include + #include "MMapCommon.h" #include "MapBuilder.h" #include "MapTree.h" #include "ModelInstance.h" -#include "DetourNavMeshBuilder.h" -#include "DetourCommon.h" - using namespace VMAP; namespace MMAP @@ -127,7 +127,7 @@ namespace MMAP tileID = StaticMapTree::packTileID(tileX, tileY); if (tiles->insert(tileID).second) - count++; + { count++; } } } printf("found %u.\n\n", count); @@ -138,7 +138,7 @@ namespace MMAP { TileList::iterator itr = m_tiles.find(mapID); if (itr != m_tiles.end()) - return (*itr).second; + { return (*itr).second; } set* tiles = new set(); m_tiles.insert(pair*>(mapID, tiles)); @@ -152,7 +152,7 @@ namespace MMAP { uint32 mapID = (*it).first; if (!shouldSkipMap(mapID)) - buildMap(mapID); + { buildMap(mapID); } } } @@ -164,17 +164,20 @@ namespace MMAP minX = INT_MIN; minY = INT_MIN; - float bmin[3], bmax[3], lmin[3], lmax[3]; + float bmin[3] = { 0 }; + float bmax[3] = { 0 }; + float lmin[3] = { 0 }; + float lmax[3] = { 0 }; MeshData meshData; // make sure we process maps which don't have tiles // initialize the static tree, which loads WDT models if (!m_terrainBuilder->loadVMap(mapID, 64, 64, meshData)) - return; + { return; } // get the coord bounds of the model data if (meshData.solidVerts.size() + meshData.liquidVerts.size() == 0) - return; + { return; } // get the coord bounds of the model data if (meshData.solidVerts.size() && meshData.liquidVerts.size()) @@ -185,9 +188,9 @@ namespace MMAP rcVmax(bmax, lmax); } else if (meshData.solidVerts.size()) - rcCalcBounds(meshData.solidVerts.getCArray(), meshData.solidVerts.size() / 3, bmin, bmax); + { rcCalcBounds(meshData.solidVerts.getCArray(), meshData.solidVerts.size() / 3, bmin, bmax); } else - rcCalcBounds(meshData.liquidVerts.getCArray(), meshData.liquidVerts.size() / 3, lmin, lmax); + { rcCalcBounds(meshData.liquidVerts.getCArray(), meshData.liquidVerts.size() / 3, lmin, lmax); } // convert coord bounds to grid bounds maxX = 32 - bmin[0] / GRID_SIZE; @@ -228,11 +231,11 @@ namespace MMAP // add all tiles within bounds to tile list. for (uint32 i = minX; i <= maxX; ++i) for (uint32 j = minY; j <= maxY; ++j) - tiles->insert(StaticMapTree::packTileID(i, j)); + { tiles->insert(StaticMapTree::packTileID(i, j)); } } if (!tiles->size()) - return; + { return; } // build navMesh dtNavMesh* navMesh = NULL; @@ -253,7 +256,7 @@ namespace MMAP StaticMapTree::unpackTileID((*it), tileX, tileY); if (shouldSkipTile(mapID, tileX, tileY)) - continue; + { continue; } buildTile(mapID, tileX, tileY, navMesh); } @@ -278,7 +281,7 @@ namespace MMAP // if there is no data, give up now if (!meshData.solidVerts.size() && !meshData.liquidVerts.size()) - return; + { return; } // remove unused vertices TerrainBuilder::cleanVertices(meshData.solidVerts, meshData.solidTris); @@ -290,7 +293,7 @@ namespace MMAP allVerts.append(meshData.solidVerts); if (!allVerts.size()) - return; + { return; } // get bounds of current tile float bmin[3], bmax[3]; @@ -313,8 +316,8 @@ namespace MMAP //if (tileBits < 1) tileBits = 1; // need at least one bit! //int polyBits = sizeof(dtPolyRef)*8 - SALT_MIN_BITS - tileBits; - int tileBits = STATIC_TILE_BITS; - int polyBits = STATIC_POLY_BITS; + int tileBits = DT_TILE_BITS; + int polyBits = DT_POLY_BITS; int maxTiles = tiles->size(); int maxPolysPerTile = 1 << polyBits; @@ -327,14 +330,14 @@ namespace MMAP StaticMapTree::unpackTileID((*it), tileX, tileY); if (tileX > tileXMax) - tileXMax = tileX; + { tileXMax = tileX; } else if (tileX < tileXMin) - tileXMin = tileX; + { tileXMin = tileX; } if (tileY > tileYMax) - tileYMax = tileY; + { tileYMax = tileY; } else if (tileY < tileYMin) - tileYMin = tileY; + { tileYMin = tileY; } } // use Max because '32 - tileX' is negative for values over 32 @@ -551,6 +554,7 @@ namespace MMAP if (!pmmerge) { printf("%s alloc pmmerge FIALED! \r", tileString); + delete [] tiles; return; } @@ -558,6 +562,7 @@ namespace MMAP if (!dmmerge) { printf("%s alloc dmmerge FIALED! \r", tileString); + delete [] tiles; return; } @@ -580,6 +585,7 @@ namespace MMAP if (!iv.polyMesh) { printf("%s alloc iv.polyMesh FAILED! \r", tileString); + delete [] tiles; return; } rcMergePolyMeshes(m_rcContext, pmmerge, nmerge, *iv.polyMesh); @@ -588,6 +594,7 @@ namespace MMAP if (!iv.polyMeshDetail) { printf("%s alloc m_dmesh FAILED! \r", tileString); + delete [] tiles; return; } rcMergePolyMeshDetails(m_rcContext, dmmerge, nmerge, *iv.polyMeshDetail); @@ -610,7 +617,7 @@ namespace MMAP // TODO: special flags for DYNAMIC polygons, ie surfaces that can be turned on and off for (int i = 0; i < iv.polyMesh->npolys; ++i) if (iv.polyMesh->areas[i] & RC_WALKABLE_AREA) - iv.polyMesh->flags[i] = iv.polyMesh->areas[i]; + { iv.polyMesh->flags[i] = iv.polyMesh->areas[i]; } // setup mesh parameters dtNavMeshCreateParams params; @@ -644,7 +651,8 @@ namespace MMAP rcVcopy(params.bmax, bmax); params.cs = config.cs; params.ch = config.ch; - params.tileSize = VERTEX_PER_MAP; + params.tileLayer = 0; + params.buildBvTree = true; // will hold final navmesh unsigned char* navData = NULL; @@ -674,7 +682,7 @@ namespace MMAP continue; } if (!params.polyCount || !params.polys || - TILES_PER_MAP * TILES_PER_MAP == params.polyCount) + TILES_PER_MAP * TILES_PER_MAP == params.polyCount) { // we have flat tiles with no actual geometry - don't build those, its useless // keep in mind that we do output those into debug info @@ -700,7 +708,7 @@ namespace MMAP // DT_TILE_FREE_DATA tells detour to unallocate memory when the tile // is removed via removeTile() dtStatus dtResult = navMesh->addTile(navData, navDataSize, DT_TILE_FREE_DATA, 0, &tileRef); - if (!tileRef || dtResult != DT_SUCCESS) + if (!tileRef || dtStatusFailed(dtResult)) { printf("%s Failed adding tile to navmesh! \n", tileString); continue; @@ -756,7 +764,7 @@ namespace MMAP { // this is for elevation if (verts && vertCount) - rcCalcBounds(verts, vertCount, bmin, bmax); + { rcCalcBounds(verts, vertCount, bmin, bmax); } else { bmin[1] = FLT_MIN; @@ -802,7 +810,7 @@ namespace MMAP return true; default: if (isTransportMap(mapID)) - return true; + { return true; } break; } @@ -882,7 +890,7 @@ namespace MMAP case 766: // Transport: Gilneas Moving Gunship 02 case 767: // Transport: Gilneas Moving Gunship 03 return true; - default: + default: // no transport maps return false; } } @@ -894,17 +902,17 @@ namespace MMAP sprintf(fileName, "mmaps/%03u%02i%02i.mmtile", mapID, tileY, tileX); FILE* file = fopen(fileName, "rb"); if (!file) - return false; + { return false; } MmapTileHeader header; - fread(&header, sizeof(MmapTileHeader), 1, file); + size_t file_read = fread(&header, sizeof(MmapTileHeader), 1, file); fclose(file); - if (header.mmapMagic != MMAP_MAGIC || header.dtVersion != DT_NAVMESH_VERSION) - return false; + if (header.mmapMagic != MMAP_MAGIC || header.dtVersion != DT_NAVMESH_VERSION || file_read <= 0) + { return false; } if (header.mmapVersion != MMAP_VERSION) - return false; + { return false; } return true; } diff --git a/src/tools/Movemap-Generator/src/MapBuilder.h b/src/tools/Movemap-Generator/MapBuilder.h similarity index 100% rename from src/tools/Movemap-Generator/src/MapBuilder.h rename to src/tools/Movemap-Generator/MapBuilder.h diff --git a/src/tools/Movemap-Generator/Movemap-Generator.rc b/src/tools/Movemap-Generator/Movemap-Generator.rc new file mode 100644 index 000000000..ca98b6d5d --- /dev/null +++ b/src/tools/Movemap-Generator/Movemap-Generator.rc @@ -0,0 +1,25 @@ +/* + * MaNGOS is a full featured server for World of Warcraft, supporting + * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8 + * + * Copyright (C) 2005-2015 MaNGOS project + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * World of Warcraft, and all World of Warcraft or Warcraft art, images, + * and lore are copyrighted by Blizzard Entertainment, Inc. + */ + +IDI_APPICON ICON DISCARDABLE "../tools.ico" diff --git a/src/tools/Movemap-Generator/src/TerrainBuilder.cpp b/src/tools/Movemap-Generator/TerrainBuilder.cpp similarity index 100% rename from src/tools/Movemap-Generator/src/TerrainBuilder.cpp rename to src/tools/Movemap-Generator/TerrainBuilder.cpp diff --git a/src/tools/Movemap-Generator/src/TerrainBuilder.h b/src/tools/Movemap-Generator/TerrainBuilder.h similarity index 99% rename from src/tools/Movemap-Generator/src/TerrainBuilder.h rename to src/tools/Movemap-Generator/TerrainBuilder.h index 2c99ccb69..33b588872 100644 --- a/src/tools/Movemap-Generator/src/TerrainBuilder.h +++ b/src/tools/Movemap-Generator/TerrainBuilder.h @@ -27,7 +27,7 @@ #include "MMapCommon.h" #include "MangosMap.h" -#include "../../src/game/MoveMapSharedDefines.h" +#include "MoveMapSharedDefines.h" #include "WorldModel.h" diff --git a/src/tools/Movemap-Generator/src/VMapExtensions.cpp b/src/tools/Movemap-Generator/VMapExtensions.cpp similarity index 100% rename from src/tools/Movemap-Generator/src/VMapExtensions.cpp rename to src/tools/Movemap-Generator/VMapExtensions.cpp diff --git a/src/tools/Movemap-Generator/src/generator.cpp b/src/tools/Movemap-Generator/generator.cpp similarity index 100% rename from src/tools/Movemap-Generator/src/generator.cpp rename to src/tools/Movemap-Generator/generator.cpp diff --git a/src/tools/Movemap-Generator/win/MoveMapGen_VC100.sln b/src/tools/Movemap-Generator/win/MoveMapGen_VC100.sln deleted file mode 100644 index 7b12ffbf2..000000000 --- a/src/tools/Movemap-Generator/win/MoveMapGen_VC100.sln +++ /dev/null @@ -1,87 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MoveMapGen", "VC100\MoveMapGen_VC100.vcxproj", "{8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}" - ProjectSection(ProjectDependencies) = postProject - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64} = {00B9DC66-96A6-465D-A6C1-5DFF94E48A64} - {8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\..\..\win\VC100\g3dlite.vcxproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}" - ProjectSection(ProjectDependencies) = postProject - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\win\VC100\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Recast", "..\..\..\dep\recastnavigation\Recast\win\VC100\Recast.vcxproj", "{00B9DC66-96A6-465D-A6C1-5DFF94E48A64}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Detour", "..\..\..\dep\recastnavigation\Detour\win\VC100\Detour.vcxproj", "{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_NoPCH|Win32 = Debug_NoPCH|Win32 - Debug_NoPCH|x64 = Debug_NoPCH|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug|Win32.ActiveCfg = Debug|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug|Win32.Build.0 = Debug|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug|x64.ActiveCfg = Debug|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Release|Win32.ActiveCfg = Release|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Release|Win32.Build.0 = Release|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Release|x64.ActiveCfg = Release|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.ActiveCfg = Debug|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.Build.0 = Debug|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.ActiveCfg = Release|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.Build.0 = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.Build.0 = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.Build.0 = Release|x64 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug|Win32.ActiveCfg = Debug|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug|Win32.Build.0 = Debug|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug|x64.ActiveCfg = Debug|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Release|Win32.ActiveCfg = Release|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Release|Win32.Build.0 = Release|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Release|x64.ActiveCfg = Release|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|Win32.ActiveCfg = Debug|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|Win32.Build.0 = Debug|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|x64.ActiveCfg = Debug|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|Win32.ActiveCfg = Release|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|Win32.Build.0 = Release|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|x64.ActiveCfg = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/src/tools/Movemap-Generator/win/MoveMapGen_VC110.sln b/src/tools/Movemap-Generator/win/MoveMapGen_VC110.sln deleted file mode 100644 index ecae91026..000000000 --- a/src/tools/Movemap-Generator/win/MoveMapGen_VC110.sln +++ /dev/null @@ -1,86 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MoveMapGen", "VC110\MoveMapGen_VC110.vcxproj", "{8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}" - ProjectSection(ProjectDependencies) = postProject - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64} = {00B9DC66-96A6-465D-A6C1-5DFF94E48A64} - {8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\..\..\win\VC110\g3dlite.vcxproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}" - ProjectSection(ProjectDependencies) = postProject - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\win\VC110\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Recast", "..\..\..\dep\recastnavigation\Recast\win\VC110\Recast.vcxproj", "{00B9DC66-96A6-465D-A6C1-5DFF94E48A64}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Detour", "..\..\..\dep\recastnavigation\Detour\win\VC110\Detour.vcxproj", "{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_NoPCH|Win32 = Debug_NoPCH|Win32 - Debug_NoPCH|x64 = Debug_NoPCH|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug|Win32.ActiveCfg = Debug|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug|Win32.Build.0 = Debug|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug|x64.ActiveCfg = Debug|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Release|Win32.ActiveCfg = Release|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Release|Win32.Build.0 = Release|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Release|x64.ActiveCfg = Release|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.ActiveCfg = Debug|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.Build.0 = Debug|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.ActiveCfg = Release|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.Build.0 = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.Build.0 = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.Build.0 = Release|x64 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug|Win32.ActiveCfg = Debug|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug|Win32.Build.0 = Debug|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug|x64.ActiveCfg = Debug|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Release|Win32.ActiveCfg = Release|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Release|Win32.Build.0 = Release|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Release|x64.ActiveCfg = Release|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|Win32.ActiveCfg = Debug|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|Win32.Build.0 = Debug|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|x64.ActiveCfg = Debug|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|Win32.ActiveCfg = Release|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|Win32.Build.0 = Release|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|x64.ActiveCfg = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/src/tools/Movemap-Generator/win/MoveMapGen_VC120.sln b/src/tools/Movemap-Generator/win/MoveMapGen_VC120.sln deleted file mode 100644 index bd11c5899..000000000 --- a/src/tools/Movemap-Generator/win/MoveMapGen_VC120.sln +++ /dev/null @@ -1,86 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MoveMapGen", "VC120\MoveMapGen_VC120.vcxproj", "{8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}" - ProjectSection(ProjectDependencies) = postProject - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64} = {00B9DC66-96A6-465D-A6C1-5DFF94E48A64} - {8072769E-CF10-48BF-B9E1-12752A5DAC6E} = {8072769E-CF10-48BF-B9E1-12752A5DAC6E} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\..\..\win\VC120\g3dlite.vcxproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}" - ProjectSection(ProjectDependencies) = postProject - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\win\VC120\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Recast", "..\..\..\dep\recastnavigation\Recast\win\VC120\Recast.vcxproj", "{00B9DC66-96A6-465D-A6C1-5DFF94E48A64}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Detour", "..\..\..\dep\recastnavigation\Detour\win\VC120\Detour.vcxproj", "{72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_NoPCH|Win32 = Debug_NoPCH|Win32 - Debug_NoPCH|x64 = Debug_NoPCH|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug|Win32.ActiveCfg = Debug|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug|Win32.Build.0 = Debug|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Debug|x64.ActiveCfg = Debug|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Release|Win32.ActiveCfg = Release|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Release|Win32.Build.0 = Release|Win32 - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47}.Release|x64.ActiveCfg = Release|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.ActiveCfg = Debug|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.Build.0 = Debug|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.ActiveCfg = Release|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.Build.0 = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.Build.0 = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.Build.0 = Release|x64 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug|Win32.ActiveCfg = Debug|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug|Win32.Build.0 = Debug|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Debug|x64.ActiveCfg = Debug|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Release|Win32.ActiveCfg = Release|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Release|Win32.Build.0 = Release|Win32 - {00B9DC66-96A6-465D-A6C1-5DFF94E48A64}.Release|x64.ActiveCfg = Release|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug_NoPCH|x64.ActiveCfg = Debug|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|Win32.ActiveCfg = Debug|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|Win32.Build.0 = Debug|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Debug|x64.ActiveCfg = Debug|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|Win32.ActiveCfg = Release|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|Win32.Build.0 = Release|Win32 - {72BDF975-4D4A-42C7-B2C4-F9ED90A2ABB6}.Release|x64.ActiveCfg = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/src/tools/Movemap-Generator/win/VC100/.gitignore b/src/tools/Movemap-Generator/win/VC100/.gitignore deleted file mode 100644 index 7d89d1eae..000000000 --- a/src/tools/Movemap-Generator/win/VC100/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ - -*Win32_Debug -*Win32_Release -*x64_Debug -*x64_Release -*.user \ No newline at end of file diff --git a/src/tools/Movemap-Generator/win/VC100/MoveMapGen_VC100.vcxproj b/src/tools/Movemap-Generator/win/VC100/MoveMapGen_VC100.vcxproj deleted file mode 100644 index e63a518b5..000000000 --- a/src/tools/Movemap-Generator/win/VC100/MoveMapGen_VC100.vcxproj +++ /dev/null @@ -1,155 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47} - MoveMapGen_VC100 - MoveMapGen - - - - Application - true - MultiByte - - - Application - false - true - MultiByte - - - - - - - - - - - - - ..\..\bin\$(Platform)_$(Configuration)\ - - - .\$(ProjectName)__$(Platform)_$(Configuration)\ - false - - - ..\..\bin\$(Platform)_$(Configuration)\ - - - .\$(ProjectName)__$(Platform)_$(Configuration)\ - - - - Level3 - Disabled - ..\..\src\;..\..\..\..\dep\recastnavigation\Detour\Include\;..\..\..\..\dep\recastnavigation\Recast\Include\;..\..\..\..\src\game\vmap;..\..\..\..\dep\include\g3dlite;..\..\..\..\src\framework\;..\..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - WIN32;DEBUG;MMAP_GENERATOR;NO_CORE_FUNCS;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - ProgramDatabase - Speed - - - true - - - false - msvcrtd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - true - - - - - - - - - Level3 - MaxSpeed - true - true - ..\..\src\;..\..\..\..\dep\recastnavigation\Detour\Include\;..\..\..\..\dep\recastnavigation\Recast\Include\;..\..\..\..\src\game\vmap;..\..\..\..\dep\include\g3dlite;..\..\..\..\src\framework\;..\..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - Speed - WIN32;NDEBUG;MMAP_GENERATOR;_CRT_SECURE_NO_WARNINGS;NO_CORE_FUNCS;%(PreprocessorDefinitions) - AnySuitable - - - true - true - true - false - msvcrt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - true - true - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {72bdf975-4d4a-42c7-b2c4-f9ed90a2abb6} - - - {00b9dc66-96a6-465d-a6c1-5dff94e48a64} - - - {8072769e-cf10-48bf-b9e1-12752a5dac6e} - - - {8f1dea42-6a5b-4b62-839d-c141a7bfacf2} - - - - - - \ No newline at end of file diff --git a/src/tools/Movemap-Generator/win/VC100/MoveMapGen_VC100.vcxproj.filters b/src/tools/Movemap-Generator/win/VC100/MoveMapGen_VC100.vcxproj.filters deleted file mode 100644 index 79abd60c3..000000000 --- a/src/tools/Movemap-Generator/win/VC100/MoveMapGen_VC100.vcxproj.filters +++ /dev/null @@ -1,99 +0,0 @@ - - - - - {dcfc8b46-b41f-4c19-9f6b-257a463f6c67} - - - {8c2c5f18-4147-4fdb-bd45-aa9664476e6c} - - - - - generator - - - generator - - - generator - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - generator - - - generator - - - - - generator - - - generator - - - generator - - - generator - - - generator - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - generator - - - \ No newline at end of file diff --git a/src/tools/Movemap-Generator/win/VC110/.gitignore b/src/tools/Movemap-Generator/win/VC110/.gitignore deleted file mode 100644 index 7d89d1eae..000000000 --- a/src/tools/Movemap-Generator/win/VC110/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ - -*Win32_Debug -*Win32_Release -*x64_Debug -*x64_Release -*.user \ No newline at end of file diff --git a/src/tools/Movemap-Generator/win/VC110/MoveMapGen_VC110.vcxproj b/src/tools/Movemap-Generator/win/VC110/MoveMapGen_VC110.vcxproj deleted file mode 100644 index f2be0ff9c..000000000 --- a/src/tools/Movemap-Generator/win/VC110/MoveMapGen_VC110.vcxproj +++ /dev/null @@ -1,157 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47} - MoveMapGen_VC110 - MoveMapGen - - - - Application - true - MultiByte - v120 - - - Application - false - true - MultiByte - v120 - - - - - - - - - - - - - ..\..\bin\$(Platform)_$(Configuration)\ - - - .\$(ProjectName)__$(Platform)_$(Configuration)\ - false - - - ..\..\bin\$(Platform)_$(Configuration)\ - - - .\$(ProjectName)__$(Platform)_$(Configuration)\ - - - - Level3 - Disabled - ..\..\src\;..\..\..\..\dep\recastnavigation\Detour\Include\;..\..\..\..\dep\recastnavigation\Recast\Include\;..\..\..\..\src\game\vmap;..\..\..\..\dep\include\g3dlite;..\..\..\..\src\framework\;..\..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - WIN32;DEBUG;MMAP_GENERATOR;NO_CORE_FUNCS;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - ProgramDatabase - Speed - - - true - - - false - msvcrtd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - true - - - - - - - - - Level3 - MaxSpeed - true - true - ..\..\src\;..\..\..\..\dep\recastnavigation\Detour\Include\;..\..\..\..\dep\recastnavigation\Recast\Include\;..\..\..\..\src\game\vmap;..\..\..\..\dep\include\g3dlite;..\..\..\..\src\framework\;..\..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - Speed - WIN32;NDEBUG;MMAP_GENERATOR;_CRT_SECURE_NO_WARNINGS;NO_CORE_FUNCS;%(PreprocessorDefinitions) - AnySuitable - - - true - true - true - false - msvcrt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - true - true - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {72bdf975-4d4a-42c7-b2c4-f9ed90a2abb6} - - - {00b9dc66-96a6-465d-a6c1-5dff94e48a64} - - - {8072769e-cf10-48bf-b9e1-12752a5dac6e} - - - {8f1dea42-6a5b-4b62-839d-c141a7bfacf2} - - - - - - \ No newline at end of file diff --git a/src/tools/Movemap-Generator/win/VC110/MoveMapGen_VC110.vcxproj.filters b/src/tools/Movemap-Generator/win/VC110/MoveMapGen_VC110.vcxproj.filters deleted file mode 100644 index 79abd60c3..000000000 --- a/src/tools/Movemap-Generator/win/VC110/MoveMapGen_VC110.vcxproj.filters +++ /dev/null @@ -1,99 +0,0 @@ - - - - - {dcfc8b46-b41f-4c19-9f6b-257a463f6c67} - - - {8c2c5f18-4147-4fdb-bd45-aa9664476e6c} - - - - - generator - - - generator - - - generator - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - generator - - - generator - - - - - generator - - - generator - - - generator - - - generator - - - generator - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - generator - - - \ No newline at end of file diff --git a/src/tools/Movemap-Generator/win/VC120/.gitignore b/src/tools/Movemap-Generator/win/VC120/.gitignore deleted file mode 100644 index 7d89d1eae..000000000 --- a/src/tools/Movemap-Generator/win/VC120/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ - -*Win32_Debug -*Win32_Release -*x64_Debug -*x64_Release -*.user \ No newline at end of file diff --git a/src/tools/Movemap-Generator/win/VC120/MoveMapGen_VC120.vcxproj b/src/tools/Movemap-Generator/win/VC120/MoveMapGen_VC120.vcxproj deleted file mode 100644 index c8432dc86..000000000 --- a/src/tools/Movemap-Generator/win/VC120/MoveMapGen_VC120.vcxproj +++ /dev/null @@ -1,157 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {8028C1F8-4C3E-44D4-96D7-1D6F51B7AB47} - MoveMapGen_VC120 - MoveMapGen - - - - Application - true - MultiByte - v120 - - - Application - false - true - MultiByte - v120 - - - - - - - - - - - - - ..\..\bin\$(Platform)_$(Configuration)\ - - - .\$(ProjectName)__$(Platform)_$(Configuration)\ - false - - - ..\..\bin\$(Platform)_$(Configuration)\ - - - .\$(ProjectName)__$(Platform)_$(Configuration)\ - - - - Level3 - Disabled - ..\..\src\;..\..\..\..\dep\recastnavigation\Detour\Include\;..\..\..\..\dep\recastnavigation\Recast\Include\;..\..\..\..\src\game\vmap;..\..\..\..\dep\include\g3dlite;..\..\..\..\src\framework\;..\..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - WIN32;DEBUG;MMAP_GENERATOR;NO_CORE_FUNCS;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - ProgramDatabase - Speed - - - true - - - false - msvcrtd.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - true - - - - - - - - - Level3 - MaxSpeed - true - true - ..\..\src\;..\..\..\..\dep\recastnavigation\Detour\Include\;..\..\..\..\dep\recastnavigation\Recast\Include\;..\..\..\..\src\game\vmap;..\..\..\..\dep\include\g3dlite;..\..\..\..\src\framework\;..\..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - Speed - WIN32;NDEBUG;MMAP_GENERATOR;_CRT_SECURE_NO_WARNINGS;NO_CORE_FUNCS;%(PreprocessorDefinitions) - AnySuitable - - - true - true - true - false - msvcrt.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - - - true - true - - - - - - - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {72bdf975-4d4a-42c7-b2c4-f9ed90a2abb6} - - - {00b9dc66-96a6-465d-a6c1-5dff94e48a64} - - - {8072769e-cf10-48bf-b9e1-12752a5dac6e} - - - {8f1dea42-6a5b-4b62-839d-c141a7bfacf2} - - - - - - \ No newline at end of file diff --git a/src/tools/Movemap-Generator/win/VC120/MoveMapGen_VC120.vcxproj.filters b/src/tools/Movemap-Generator/win/VC120/MoveMapGen_VC120.vcxproj.filters deleted file mode 100644 index 79abd60c3..000000000 --- a/src/tools/Movemap-Generator/win/VC120/MoveMapGen_VC120.vcxproj.filters +++ /dev/null @@ -1,99 +0,0 @@ - - - - - {dcfc8b46-b41f-4c19-9f6b-257a463f6c67} - - - {8c2c5f18-4147-4fdb-bd45-aa9664476e6c} - - - - - generator - - - generator - - - generator - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - generator - - - generator - - - - - generator - - - generator - - - generator - - - generator - - - generator - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - vmap - - - generator - - - \ No newline at end of file diff --git a/src/tools/genrevision/genrevision.cpp b/src/tools/genrevision/genrevision.cpp index dccdab969..c75065e02 100644 --- a/src/tools/genrevision/genrevision.cpp +++ b/src/tools/genrevision/genrevision.cpp @@ -95,7 +95,7 @@ void extractDataFromGit(FILE* EntriesFile, std::string path, bool url, RawData& char* acc_str = NULL; char* repo_str = NULL; - // parse URL like git@github.com:mangoszero/server + // parse URL like git@github.com:mangosthree/server char url_buf[200]; int res = sscanf(url_str, "git@%s", url_buf); if (res) diff --git a/src/tools/map-extractor/dbcfile.cpp b/src/tools/map-extractor/dbcfile.cpp index d9519932d..bf71a812f 100644 --- a/src/tools/map-extractor/dbcfile.cpp +++ b/src/tools/map-extractor/dbcfile.cpp @@ -22,11 +22,11 @@ * and lore are copyrighted by Blizzard Entertainment, Inc. */ -#define _CRT_SECURE_NO_DEPRECATE - #include "dbcfile.h" #include "loadlib/loadlib.h" +#include + DBCFile::DBCFile(const std::string& filename): filename(filename), data(0) @@ -43,42 +43,48 @@ bool DBCFile::open() //if (!OpenNewestFile(filename.c_str(), &fileHandle)) // return false; - char header[4]; + unsigned char header[4]; unsigned int na, nb, es, ss; if (!SFileReadFile(fileHandle, header, 4, NULL, NULL)) // Magic header { SFileCloseFile(fileHandle); + printf("Could not read header in DBCFile %s.\n", filename.c_str()); return false; } if (header[0] != 'W' || header[1] != 'D' || header[2] != 'B' || header[3] != 'C') { SFileCloseFile(fileHandle); + printf("The header in DBCFile %s did not match.\n", filename.c_str()); return false; } if (!SFileReadFile(fileHandle, &na, 4, NULL, NULL)) // Number of records { SFileCloseFile(fileHandle); + printf("Could not read number of records from DBCFile %s.\n", filename.c_str()); return false; } if (!SFileReadFile(fileHandle, &nb, 4, NULL, NULL)) // Number of fields { SFileCloseFile(fileHandle); + printf("Could not read number of fields from DBCFile %s.\n", filename.c_str()); return false; } if (!SFileReadFile(fileHandle, &es, 4, NULL, NULL)) // Size of a record { SFileCloseFile(fileHandle); + printf("Could not read record size from DBCFile %s.\n", filename.c_str()); return false; } if (!SFileReadFile(fileHandle, &ss, 4, NULL, NULL)) // String size { SFileCloseFile(fileHandle); + printf("Could not read string block size from DBCFile %s.\n", filename.c_str()); return false; } @@ -89,6 +95,7 @@ bool DBCFile::open() if (fieldCount * 4 != recordSize) { SFileCloseFile(fileHandle); + printf("Field count and record size in DBCFile %s do not match.\n", filename.c_str()); return false; } @@ -100,6 +107,7 @@ bool DBCFile::open() if (!SFileReadFile(fileHandle, data, data_size, NULL, NULL)) { SFileCloseFile(fileHandle); + printf("DBCFile %s did not contain expected amount of data for records.\n", filename.c_str()); return false; } @@ -125,7 +133,7 @@ size_t DBCFile::getMaxId() for (size_t i = 0; i < getRecordCount(); ++i) { if (maxId < getRecord(i).getUInt(0)) - maxId = getRecord(i).getUInt(0); + { maxId = getRecord(i).getUInt(0); } } return maxId; } diff --git a/src/tools/map-extractor/dbcfile.h b/src/tools/map-extractor/dbcfile.h index 8560d1f78..4d596972a 100644 --- a/src/tools/map-extractor/dbcfile.h +++ b/src/tools/map-extractor/dbcfile.h @@ -24,6 +24,7 @@ #ifndef DBCFILE_H #define DBCFILE_H + #include #include @@ -33,54 +34,123 @@ #include "StormLib.h" +/** + * @brief + * + */ class DBCFile { public: + /** + * @brief + * + * @param filename + */ DBCFile(const std::string& filename); DBCFile(HANDLE file); + /** + * @brief + * + */ ~DBCFile(); - // Open database. It must be openened before it can be used. + /** + * @brief Open database. It must be openened before it can be used. + * + * @return bool + */ bool open(); - // Database exceptions + /** + * @brief Database exceptions + * + */ class Exception { public: + /** + * @brief + * + * @param message + */ Exception(const std::string& message): message(message) { } + /** + * @brief + * + */ virtual ~Exception() { } + /** + * @brief + * + * @return const std::string + */ const std::string& getMessage() {return message;} private: - std::string message; + std::string message; /**< TODO */ }; + /** + * @brief + * + */ class NotFound: public Exception { public: + /** + * @brief + * + */ NotFound(): Exception("Key was not found") { } }; - // Iteration over database class Iterator; + /** + * @brief Iteration over database + * + */ class Record { public: + /** + * @brief + * + * @param field + * @return float + */ float getFloat(size_t field) const { assert(field < file.fieldCount); - return *reinterpret_cast(offset + field * 4); + return *reinterpret_cast(offset + (field * 4)); } + /** + * @brief + * + * @param field + * @return unsigned int + */ unsigned int getUInt(size_t field) const { assert(field < file.fieldCount); - return *reinterpret_cast(offset + field * 4); + return *reinterpret_cast(offset + (field * 4)); } + /** + * @brief + * + * @param field + * @return int + */ int getInt(size_t field) const { assert(field < file.fieldCount); - return *reinterpret_cast(offset + field * 4); + return *reinterpret_cast(offset + (field * 4)); } + /** + * @brief + * + * @param field + * @return const char + */ const char* getString(size_t field) const { assert(field < file.fieldCount); @@ -89,64 +159,130 @@ class DBCFile return reinterpret_cast(file.stringTable + stringOffset); } private: + /** + * @brief + * + * @param file + * @param offset + */ Record(DBCFile& file, unsigned char* offset): file(file), offset(offset) {} - unsigned char* offset; - DBCFile& file; + DBCFile& file; /**< TODO */ + unsigned char* offset; /**< TODO */ friend class DBCFile; friend class DBCFile::Iterator; }; - /** Iterator that iterates over records - */ + + /** + * @brief Iterator that iterates over records + * + */ class Iterator { public: + /** + * @brief + * + * @param file + * @param offset + */ Iterator(DBCFile& file, unsigned char* offset): record(file, offset) {} - /// Advance (prefix only) + /** + * @brief Advance (prefix only) + * + * @return Iterator &operator + */ Iterator& operator++() { record.offset += record.file.recordSize; return *this; } - /// Return address of current instance + /** + * @brief Return address of current instance + * + * @return const Record &operator + */ Record const& operator*() const { return record; } + /** + * @brief + * + * @return const Record *operator -> + */ const Record* operator->() const { return &record; } - /// Comparison + /** + * @brief Comparison + * + * @param b + * @return bool operator + */ bool operator==(const Iterator& b) const { return record.offset == b.record.offset; } + /** + * @brief + * + * @param b + * @return bool operator + */ bool operator!=(const Iterator& b) const { return record.offset != b.record.offset; } private: - Record record; + Record record; /**< TODO */ }; - // Get record by id + /** + * @brief Get record by id + * + * @param id + * @return Record + */ Record getRecord(size_t id); - /// Get begin iterator over records + /** + * @brief Get begin iterator over records + * + * @return Iterator + */ Iterator begin(); - /// Get begin iterator over records + /** + * @brief Get begin iterator over records + * + * @return Iterator + */ Iterator end(); - /// Trivial + /** + * @brief Trivial + * + * @return size_t + */ size_t getRecordCount() const { return recordCount;} + /** + * @brief + * + * @return size_t + */ size_t getFieldCount() const { return fieldCount; } + /** + * @brief + * + * @return size_t + */ size_t getMaxId(); private: - std::string filename; + std::string filename; /**< TODO */ HANDLE fileHandle; - size_t recordSize; - size_t recordCount; - size_t fieldCount; - size_t stringSize; - unsigned char* data; - unsigned char* stringTable; + size_t recordSize; /**< TODO */ + size_t recordCount; /**< TODO */ + size_t fieldCount; /**< TODO */ + size_t stringSize; /**< TODO */ + unsigned char* data; /**< TODO */ + unsigned char* stringTable; /**< TODO */ }; #endif diff --git a/src/tools/vmap-assembler/VC100/.gitignore b/src/tools/vmap-assembler/VC100/.gitignore deleted file mode 100644 index a57495c79..000000000 --- a/src/tools/vmap-assembler/VC100/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.user -bin diff --git a/src/tools/vmap-assembler/VC100/vmap_assembler.vcxproj b/src/tools/vmap-assembler/VC100/vmap_assembler.vcxproj deleted file mode 100644 index b24254d30..000000000 --- a/src/tools/vmap-assembler/VC100/vmap_assembler.vcxproj +++ /dev/null @@ -1,214 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {572FFF74-480C-4472-8ABF-81733BB4049D} - vmap_assembler - Win32Proj - - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - Application - MultiByte - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\bin\$(Platform)_$(Configuration)\ - ..\bin\$(Platform)_$(Configuration)\ - .\bin\$(ProjectName)__$(Platform)_$(Configuration)\ - .\bin\$(ProjectName)__$(Platform)_$(Configuration)\ - false - false - ..\bin\$(Platform)_$(Configuration)\ - ..\bin\$(Platform)_$(Configuration)\ - .\bin\$(ProjectName)__$(Platform)_$(Configuration)\ - .\bin\$(ProjectName)__$(Platform)_$(Configuration)\ - false - false - - - - Disabled - ..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - StreamingSIMDExtensions - - - Level3 - ProgramDatabase - - - $(OutDir)vmap_assembler.exe - - - true - $(OutDir)$(TargetName).pdb - Console - false - - - MachineX86 - %(AdditionalDependencies) - true - true - - - - - - - Disabled - ..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - StreamingSIMDExtensions - - - Level3 - ProgramDatabase - - - $(OutDir)vmap_assembler.exe - - - true - $(OutDir)$(TargetName).pdb - Console - false - - - %(AdditionalDependencies) - true - true - - - - - ..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions) - MultiThreadedDLL - StreamingSIMDExtensions - - - Level3 - ProgramDatabase - - - $(OutDir)vmap_assembler.exe - false - Console - true - true - false - - - MachineX86 - - - - - ..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions) - MultiThreadedDLL - StreamingSIMDExtensions - - - Level3 - ProgramDatabase - - - $(OutDir)vmap_assembler.exe - false - Console - true - true - false - - - - - - - - - - - - - - - - - - - - - - - - - {8072769e-cf10-48bf-b9e1-12752a5dac6e} - false - - - {8f1dea42-6a5b-4b62-839d-c141a7bfacf2} - false - - - - - - diff --git a/src/tools/vmap-assembler/VC110/.gitignore b/src/tools/vmap-assembler/VC110/.gitignore deleted file mode 100644 index a57495c79..000000000 --- a/src/tools/vmap-assembler/VC110/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.user -bin diff --git a/src/tools/vmap-assembler/VC110/vmap_assembler.vcxproj b/src/tools/vmap-assembler/VC110/vmap_assembler.vcxproj deleted file mode 100644 index f8cb37ca9..000000000 --- a/src/tools/vmap-assembler/VC110/vmap_assembler.vcxproj +++ /dev/null @@ -1,218 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {572FFF74-480C-4472-8ABF-81733BB4049D} - vmap_assembler - Win32Proj - - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\bin\$(Platform)_$(Configuration)\ - ..\bin\$(Platform)_$(Configuration)\ - .\bin\$(ProjectName)__$(Platform)_$(Configuration)\ - .\bin\$(ProjectName)__$(Platform)_$(Configuration)\ - false - false - ..\bin\$(Platform)_$(Configuration)\ - ..\bin\$(Platform)_$(Configuration)\ - .\bin\$(ProjectName)__$(Platform)_$(Configuration)\ - .\bin\$(ProjectName)__$(Platform)_$(Configuration)\ - false - false - - - - Disabled - ..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - StreamingSIMDExtensions - - - Level3 - ProgramDatabase - - - $(OutDir)vmap_assembler.exe - - - true - $(OutDir)$(TargetName).pdb - Console - false - - - MachineX86 - %(AdditionalDependencies) - true - true - - - - - - - Disabled - ..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - StreamingSIMDExtensions - - - Level3 - ProgramDatabase - - - $(OutDir)vmap_assembler.exe - - - true - $(OutDir)$(TargetName).pdb - Console - false - - - %(AdditionalDependencies) - true - true - - - - - ..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions) - MultiThreadedDLL - StreamingSIMDExtensions - - - Level3 - ProgramDatabase - - - $(OutDir)vmap_assembler.exe - false - Console - true - true - false - - - MachineX86 - - - - - ..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions) - MultiThreadedDLL - StreamingSIMDExtensions - - - Level3 - ProgramDatabase - - - $(OutDir)vmap_assembler.exe - false - Console - true - true - false - - - - - - - - - - - - - - - - - - - - - - - - - {8072769e-cf10-48bf-b9e1-12752a5dac6e} - false - - - {8f1dea42-6a5b-4b62-839d-c141a7bfacf2} - false - - - - - - \ No newline at end of file diff --git a/src/tools/vmap-assembler/VC120/.gitignore b/src/tools/vmap-assembler/VC120/.gitignore deleted file mode 100644 index a57495c79..000000000 --- a/src/tools/vmap-assembler/VC120/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*.user -bin diff --git a/src/tools/vmap-assembler/VC120/vmap_assembler.vcxproj b/src/tools/vmap-assembler/VC120/vmap_assembler.vcxproj deleted file mode 100644 index e9a974473..000000000 --- a/src/tools/vmap-assembler/VC120/vmap_assembler.vcxproj +++ /dev/null @@ -1,218 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {572FFF74-480C-4472-8ABF-81733BB4049D} - vmap_assembler - Win32Proj - - - - Application - MultiByte - v120 - - - Application - MultiByte - v120 - - - Application - MultiByte - v120 - - - Application - MultiByte - v120 - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\bin\$(Platform)_$(Configuration)\ - ..\bin\$(Platform)_$(Configuration)\ - .\bin\$(ProjectName)__$(Platform)_$(Configuration)\ - .\bin\$(ProjectName)__$(Platform)_$(Configuration)\ - false - false - ..\bin\$(Platform)_$(Configuration)\ - ..\bin\$(Platform)_$(Configuration)\ - .\bin\$(ProjectName)__$(Platform)_$(Configuration)\ - .\bin\$(ProjectName)__$(Platform)_$(Configuration)\ - false - false - - - - Disabled - ..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - StreamingSIMDExtensions - - - Level3 - ProgramDatabase - - - $(OutDir)vmap_assembler.exe - - - true - $(OutDir)$(TargetName).pdb - Console - false - - - MachineX86 - %(AdditionalDependencies) - true - true - - - - - - - Disabled - ..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - StreamingSIMDExtensions - - - Level3 - ProgramDatabase - - - $(OutDir)vmap_assembler.exe - - - true - $(OutDir)$(TargetName).pdb - Console - false - - - %(AdditionalDependencies) - true - true - - - - - ..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions) - MultiThreadedDLL - StreamingSIMDExtensions - - - Level3 - ProgramDatabase - - - $(OutDir)vmap_assembler.exe - false - Console - true - true - false - - - MachineX86 - - - - - ..\..\..\dep\include\g3dlite;..\..\..\src\shared;..\..\..\src\game\vmap;..\..\..\src\framework;..\..\..\dep\ACE_wrappers;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;NO_CORE_FUNCS;%(PreprocessorDefinitions) - MultiThreadedDLL - StreamingSIMDExtensions - - - Level3 - ProgramDatabase - - - $(OutDir)vmap_assembler.exe - false - Console - true - true - false - - - - - - - - - - - - - - - - - - - - - - - - - {8072769e-cf10-48bf-b9e1-12752a5dac6e} - false - - - {8f1dea42-6a5b-4b62-839d-c141a7bfacf2} - false - - - - - - \ No newline at end of file diff --git a/src/tools/vmap-assembler/vmap_assemblerVC100.sln b/src/tools/vmap-assembler/vmap_assemblerVC100.sln deleted file mode 100644 index 368858561..000000000 --- a/src/tools/vmap-assembler/vmap_assemblerVC100.sln +++ /dev/null @@ -1,59 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap_assembler", "VC100\vmap_assembler.vcxproj", "{572FFF74-480C-4472-8ABF-81733BB4049D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\win\VC100\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\..\win\VC100\g3dlite.vcxproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_NoPCH|Win32 = Debug_NoPCH|Win32 - Debug_NoPCH|x64 = Debug_NoPCH|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|x64.ActiveCfg = Debug|x64 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|x64.Build.0 = Debug|x64 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.ActiveCfg = Debug|Win32 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.Build.0 = Debug|Win32 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|x64.ActiveCfg = Debug|x64 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|x64.Build.0 = Debug|x64 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.ActiveCfg = Release|Win32 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.Build.0 = Release|Win32 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Release|x64.ActiveCfg = Release|x64 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Release|x64.Build.0 = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.Build.0 = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.Build.0 = Release|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.ActiveCfg = Debug|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.Build.0 = Debug|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.ActiveCfg = Release|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/src/tools/vmap-assembler/vmap_assemblerVC110.sln b/src/tools/vmap-assembler/vmap_assemblerVC110.sln deleted file mode 100644 index fe5609f6a..000000000 --- a/src/tools/vmap-assembler/vmap_assemblerVC110.sln +++ /dev/null @@ -1,59 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap_assembler", "VC110\vmap_assembler.vcxproj", "{572FFF74-480C-4472-8ABF-81733BB4049D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\win\VC110\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\..\win\VC110\g3dlite.vcxproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_NoPCH|Win32 = Debug_NoPCH|Win32 - Debug_NoPCH|x64 = Debug_NoPCH|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|x64.ActiveCfg = Debug|x64 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|x64.Build.0 = Debug|x64 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.ActiveCfg = Debug|Win32 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.Build.0 = Debug|Win32 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|x64.ActiveCfg = Debug|x64 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|x64.Build.0 = Debug|x64 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.ActiveCfg = Release|Win32 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.Build.0 = Release|Win32 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Release|x64.ActiveCfg = Release|x64 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Release|x64.Build.0 = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.Build.0 = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.Build.0 = Release|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.ActiveCfg = Debug|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.Build.0 = Debug|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.ActiveCfg = Release|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/src/tools/vmap-assembler/vmap_assemblerVC120.sln b/src/tools/vmap-assembler/vmap_assemblerVC120.sln deleted file mode 100644 index ef9f6442c..000000000 --- a/src/tools/vmap-assembler/vmap_assemblerVC120.sln +++ /dev/null @@ -1,59 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmap_assembler", "VC120\vmap_assembler.vcxproj", "{572FFF74-480C-4472-8ABF-81733BB4049D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\win\VC120\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dlite", "..\..\win\VC120\g3dlite.vcxproj", "{8072769E-CF10-48BF-B9E1-12752A5DAC6E}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug_NoPCH|Win32 = Debug_NoPCH|Win32 - Debug_NoPCH|x64 = Debug_NoPCH|x64 - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|Win32.ActiveCfg = Debug|Win32 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|Win32.Build.0 = Debug|Win32 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|x64.ActiveCfg = Debug|x64 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug_NoPCH|x64.Build.0 = Debug|x64 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.ActiveCfg = Debug|Win32 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|Win32.Build.0 = Debug|Win32 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|x64.ActiveCfg = Debug|x64 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Debug|x64.Build.0 = Debug|x64 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.ActiveCfg = Release|Win32 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Release|Win32.Build.0 = Release|Win32 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Release|x64.ActiveCfg = Release|x64 - {572FFF74-480C-4472-8ABF-81733BB4049D}.Release|x64.Build.0 = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.Build.0 = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.Build.0 = Release|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.ActiveCfg = Debug_NoPCH|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|Win32.Build.0 = Debug_NoPCH|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.ActiveCfg = Debug_NoPCH|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug_NoPCH|x64.Build.0 = Debug_NoPCH|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.ActiveCfg = Debug|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|Win32.Build.0 = Debug|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.ActiveCfg = Debug|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Debug|x64.Build.0 = Debug|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.ActiveCfg = Release|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|Win32.Build.0 = Release|Win32 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.ActiveCfg = Release|x64 - {8072769E-CF10-48BF-B9E1-12752A5DAC6E}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/src/tools/vmap-extractor/vmapextract/adtfile.cpp b/src/tools/vmap-extractor/adtfile.cpp similarity index 100% rename from src/tools/vmap-extractor/vmapextract/adtfile.cpp rename to src/tools/vmap-extractor/adtfile.cpp diff --git a/src/tools/vmap-extractor/vmapextract/adtfile.h b/src/tools/vmap-extractor/adtfile.h similarity index 100% rename from src/tools/vmap-extractor/vmapextract/adtfile.h rename to src/tools/vmap-extractor/adtfile.h diff --git a/src/tools/vmap-extractor/vmapextract/dbcfile.cpp b/src/tools/vmap-extractor/dbcfile.cpp similarity index 100% rename from src/tools/vmap-extractor/vmapextract/dbcfile.cpp rename to src/tools/vmap-extractor/dbcfile.cpp diff --git a/src/tools/vmap-extractor/vmapextract/dbcfile.h b/src/tools/vmap-extractor/dbcfile.h similarity index 100% rename from src/tools/vmap-extractor/vmapextract/dbcfile.h rename to src/tools/vmap-extractor/dbcfile.h diff --git a/src/tools/vmap-extractor/vmapextract/gameobject_extract.cpp b/src/tools/vmap-extractor/gameobject_extract.cpp similarity index 100% rename from src/tools/vmap-extractor/vmapextract/gameobject_extract.cpp rename to src/tools/vmap-extractor/gameobject_extract.cpp diff --git a/src/tools/vmap-extractor/vmapextract/loadlib/loadlib.h b/src/tools/vmap-extractor/loadlib/loadlib.h similarity index 100% rename from src/tools/vmap-extractor/vmapextract/loadlib/loadlib.h rename to src/tools/vmap-extractor/loadlib/loadlib.h diff --git a/src/tools/vmap-extractor/vmapextract/model.cpp b/src/tools/vmap-extractor/model.cpp similarity index 100% rename from src/tools/vmap-extractor/vmapextract/model.cpp rename to src/tools/vmap-extractor/model.cpp diff --git a/src/tools/vmap-extractor/vmapextract/model.h b/src/tools/vmap-extractor/model.h similarity index 100% rename from src/tools/vmap-extractor/vmapextract/model.h rename to src/tools/vmap-extractor/model.h diff --git a/src/tools/vmap-extractor/vmapextract/modelheaders.h b/src/tools/vmap-extractor/modelheaders.h similarity index 100% rename from src/tools/vmap-extractor/vmapextract/modelheaders.h rename to src/tools/vmap-extractor/modelheaders.h diff --git a/src/tools/vmap-extractor/vmapextract/mpqfile.cpp b/src/tools/vmap-extractor/mpqfile.cpp similarity index 100% rename from src/tools/vmap-extractor/vmapextract/mpqfile.cpp rename to src/tools/vmap-extractor/mpqfile.cpp diff --git a/src/tools/vmap-extractor/vmapextract/mpqfile.h b/src/tools/vmap-extractor/mpqfile.h similarity index 100% rename from src/tools/vmap-extractor/vmapextract/mpqfile.h rename to src/tools/vmap-extractor/mpqfile.h diff --git a/src/tools/vmap-extractor/vmapextract/vec3d.h b/src/tools/vmap-extractor/vec3d.h similarity index 100% rename from src/tools/vmap-extractor/vmapextract/vec3d.h rename to src/tools/vmap-extractor/vec3d.h diff --git a/src/tools/vmap-extractor/vmap-extractor.rc b/src/tools/vmap-extractor/vmap-extractor.rc new file mode 100644 index 000000000..ca98b6d5d --- /dev/null +++ b/src/tools/vmap-extractor/vmap-extractor.rc @@ -0,0 +1,25 @@ +/* + * MaNGOS is a full featured server for World of Warcraft, supporting + * the following clients: 1.12.x, 2.4.3, 3.3.5a, 4.3.4a and 5.4.8 + * + * Copyright (C) 2005-2015 MaNGOS project + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * World of Warcraft, and all World of Warcraft or Warcraft art, images, + * and lore are copyrighted by Blizzard Entertainment, Inc. + */ + +IDI_APPICON ICON DISCARDABLE "../tools.ico" diff --git a/src/tools/vmap-extractor/vmapextract/vmapexport.cpp b/src/tools/vmap-extractor/vmapexport.cpp similarity index 100% rename from src/tools/vmap-extractor/vmapextract/vmapexport.cpp rename to src/tools/vmap-extractor/vmapexport.cpp diff --git a/src/tools/vmap-extractor/vmapextract/vmapexport.h b/src/tools/vmap-extractor/vmapexport.h similarity index 100% rename from src/tools/vmap-extractor/vmapextract/vmapexport.h rename to src/tools/vmap-extractor/vmapexport.h diff --git a/src/tools/vmap-extractor/vmapextract/CMakeLists.txt b/src/tools/vmap-extractor/vmapextract/CMakeLists.txt deleted file mode 100644 index f45371abc..000000000 --- a/src/tools/vmap-extractor/vmapextract/CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ -# This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS. -# -# 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.8) - -project (MANGOS_IOMAP_EXTRACTOR) - -LINK_DIRECTORIES( ${LINK_DIRECTORIES} ${CMAKE_SOURCE_DIR}/../../../dep/StormLib/src ) -add_executable(vmapextractor adtfile.cpp dbcfile.cpp gameobject_extract.cpp model.cpp mpqfile.cpp vmapexport.cpp wdtfile.cpp wmo.cpp) -target_link_libraries(vmapextractor StormLib bzip2 zlib) diff --git a/src/tools/vmap-extractor/vmapextract/wdtfile.cpp b/src/tools/vmap-extractor/wdtfile.cpp similarity index 100% rename from src/tools/vmap-extractor/vmapextract/wdtfile.cpp rename to src/tools/vmap-extractor/wdtfile.cpp diff --git a/src/tools/vmap-extractor/vmapextract/wdtfile.h b/src/tools/vmap-extractor/wdtfile.h similarity index 100% rename from src/tools/vmap-extractor/vmapextract/wdtfile.h rename to src/tools/vmap-extractor/wdtfile.h diff --git a/src/tools/vmap-extractor/win/VC100/vmapExtractor.vcxproj b/src/tools/vmap-extractor/win/VC100/vmapExtractor.vcxproj deleted file mode 100644 index 0edeecc25..000000000 --- a/src/tools/vmap-extractor/win/VC100/vmapExtractor.vcxproj +++ /dev/null @@ -1,111 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393} - vmapExtractor - - - - Application - MultiByte - true - - - Application - MultiByte - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\..\bin\$(Platform)_$(Configuration)\ - ..\bin\$(ProjectName)__$(Platform)_$(Configuration)\ - ..\..\bin\$(Platform)_$(Configuration)\ - ..\bin\$(ProjectName)__$(Platform)_$(Configuration)\ - - - - Disabled - ..\..\..\..\dep\StormLib\src;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - %(AdditionalDependencies) - ..\..\..\..\dep\StormLib\bin\StormLib\$(Platform)\$(Configuration)AD;%(AdditionalLibraryDirectories) - true - MachineX86 - Console - false - - - - - - - MaxSpeed - true - ..\..\..\..\dep\StormLib\src;%(AdditionalIncludeDirectories) - WIN32;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - StormLibRAD.lib;%(AdditionalDependencies) - ..\..\..\..\dep\StormLib\bin\StormLib\$(Platform)\$(Configuration)AD;%(AdditionalLibraryDirectories) - false - true - true - MachineX86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/tools/vmap-extractor/win/VC100/vmapExtractor.vcxproj.filters b/src/tools/vmap-extractor/win/VC100/vmapExtractor.vcxproj.filters deleted file mode 100644 index b493068c3..000000000 --- a/src/tools/vmap-extractor/win/VC100/vmapExtractor.vcxproj.filters +++ /dev/null @@ -1,66 +0,0 @@ - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - {77920bff-80f2-4d57-8efb-d36d461d04a4} - - - {093fdfc3-8861-4d64-9c5e-4a58337b9c7e} - - - \ No newline at end of file diff --git a/src/tools/vmap-extractor/win/VC110/vmapExtractor.vcxproj b/src/tools/vmap-extractor/win/VC110/vmapExtractor.vcxproj deleted file mode 100644 index 3e9de1b84..000000000 --- a/src/tools/vmap-extractor/win/VC110/vmapExtractor.vcxproj +++ /dev/null @@ -1,113 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393} - vmapExtractor - - - - Application - MultiByte - true - v110 - - - Application - MultiByte - v110 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\..\bin\$(Platform)_$(Configuration)\ - ..\bin\$(ProjectName)__$(Platform)_$(Configuration)\ - ..\..\bin\$(Platform)_$(Configuration)\ - ..\bin\$(ProjectName)__$(Platform)_$(Configuration)\ - - - - Disabled - ..\..\..\..\dep\StormLib\src;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - %(AdditionalDependencies) - ..\..\..\..\dep\StormLib\bin\StormLib\$(Platform)\$(Configuration)AD;%(AdditionalLibraryDirectories) - true - MachineX86 - Console - false - - - - - - - MaxSpeed - true - ..\..\..\..\dep\StormLib\src;%(AdditionalIncludeDirectories) - WIN32;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - StormLibRAD.lib;%(AdditionalDependencies) - ..\..\..\..\dep\StormLib\bin\StormLib\$(Platform)\$(Configuration)AD;%(AdditionalLibraryDirectories) - false - true - true - MachineX86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/tools/vmap-extractor/win/VC110/vmapExtractor.vcxproj.filters b/src/tools/vmap-extractor/win/VC110/vmapExtractor.vcxproj.filters deleted file mode 100644 index 5dbd96da6..000000000 --- a/src/tools/vmap-extractor/win/VC110/vmapExtractor.vcxproj.filters +++ /dev/null @@ -1,67 +0,0 @@ - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - {77920bff-80f2-4d57-8efb-d36d461d04a4} - - - {093fdfc3-8861-4d64-9c5e-4a58337b9c7e} - - - \ No newline at end of file diff --git a/src/tools/vmap-extractor/win/VC120/vmapExtractor.vcxproj b/src/tools/vmap-extractor/win/VC120/vmapExtractor.vcxproj deleted file mode 100644 index fee8774fb..000000000 --- a/src/tools/vmap-extractor/win/VC120/vmapExtractor.vcxproj +++ /dev/null @@ -1,113 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393} - vmapExtractor - - - - Application - MultiByte - true - v120 - - - Application - MultiByte - v120 - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\..\bin\$(Platform)_$(Configuration)\ - ..\bin\$(ProjectName)__$(Platform)_$(Configuration)\ - ..\..\bin\$(Platform)_$(Configuration)\ - ..\bin\$(ProjectName)__$(Platform)_$(Configuration)\ - - - - Disabled - ..\..\..\..\dep\StormLib\src;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - Level3 - EditAndContinue - - - %(AdditionalDependencies) - ..\..\..\..\dep\StormLib\bin\StormLib\$(Platform)\$(Configuration)AD;%(AdditionalLibraryDirectories) - true - MachineX86 - Console - false - - - - - - - MaxSpeed - true - ..\..\..\..\dep\StormLib\src;%(AdditionalIncludeDirectories) - WIN32;%(PreprocessorDefinitions) - MultiThreadedDLL - true - Level3 - ProgramDatabase - - - StormLibRAD.lib;%(AdditionalDependencies) - ..\..\..\..\dep\StormLib\bin\StormLib\$(Platform)\$(Configuration)AD;%(AdditionalLibraryDirectories) - false - true - true - MachineX86 - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/tools/vmap-extractor/win/VC120/vmapExtractor.vcxproj.filters b/src/tools/vmap-extractor/win/VC120/vmapExtractor.vcxproj.filters deleted file mode 100644 index 5dbd96da6..000000000 --- a/src/tools/vmap-extractor/win/VC120/vmapExtractor.vcxproj.filters +++ /dev/null @@ -1,67 +0,0 @@ - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - {77920bff-80f2-4d57-8efb-d36d461d04a4} - - - {093fdfc3-8861-4d64-9c5e-4a58337b9c7e} - - - \ No newline at end of file diff --git a/src/tools/vmap-extractor/win/vmapExtractor_VC100.sln b/src/tools/vmap-extractor/win/vmapExtractor_VC100.sln deleted file mode 100644 index 1bcab60c9..000000000 --- a/src/tools/vmap-extractor/win/vmapExtractor_VC100.sln +++ /dev/null @@ -1,116 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmapExtractor", "VC100\vmapExtractor.vcxproj", "{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}" - ProjectSection(ProjectDependencies) = postProject - {78424708-1F6E-4D4B-920C-FB6D26847055} = {78424708-1F6E-4D4B-920C-FB6D26847055} - {B96F612A-C91D-43B3-A4C3-D4294817EC6C} = {B96F612A-C91D-43B3-A4C3-D4294817EC6C} - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\win\VC100\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "..\..\..\win\VC100\bzip2.vcxproj", "{B96F612A-C91D-43B3-A4C3-D4294817EC6C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib", "..\..\..\dep\StormLib\StormLib.vcxproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - DebugAD|Win32 = DebugAD|Win32 - DebugAD|x64 = DebugAD|x64 - DebugAS|Win32 = DebugAS|Win32 - DebugAS|x64 = DebugAS|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - ReleaseAD|Win32 = ReleaseAD|Win32 - ReleaseAD|x64 = ReleaseAD|x64 - ReleaseAS|Win32 = ReleaseAS|Win32 - ReleaseAS|x64 = ReleaseAS|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Debug|Win32.ActiveCfg = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Debug|Win32.Build.0 = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Debug|x64.ActiveCfg = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.DebugAD|Win32.ActiveCfg = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.DebugAD|Win32.Build.0 = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.DebugAD|x64.ActiveCfg = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.DebugAS|Win32.ActiveCfg = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.DebugAS|Win32.Build.0 = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.DebugAS|x64.ActiveCfg = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Release|Win32.ActiveCfg = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Release|Win32.Build.0 = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Release|x64.ActiveCfg = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.ReleaseAD|Win32.ActiveCfg = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.ReleaseAD|Win32.Build.0 = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.ReleaseAD|x64.ActiveCfg = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.ReleaseAS|Win32.ActiveCfg = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.ReleaseAS|Win32.Build.0 = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.ReleaseAS|x64.ActiveCfg = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.Build.0 = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.DebugAD|Win32.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.DebugAD|x64.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.DebugAD|x64.Build.0 = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.DebugAS|Win32.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.DebugAS|x64.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.DebugAS|x64.Build.0 = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.Build.0 = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.ReleaseAD|Win32.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.ReleaseAD|x64.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.ReleaseAD|x64.Build.0 = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.ReleaseAS|Win32.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.ReleaseAS|x64.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.ReleaseAS|x64.Build.0 = Release|x64 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|Win32.ActiveCfg = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|Win32.Build.0 = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|x64.ActiveCfg = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.DebugAD|Win32.ActiveCfg = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.DebugAD|Win32.Build.0 = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.DebugAD|x64.ActiveCfg = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.DebugAS|Win32.ActiveCfg = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.DebugAS|Win32.Build.0 = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.DebugAS|x64.ActiveCfg = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|Win32.ActiveCfg = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|Win32.Build.0 = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|x64.ActiveCfg = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.ReleaseAD|Win32.ActiveCfg = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.ReleaseAD|Win32.Build.0 = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.ReleaseAD|x64.ActiveCfg = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.ReleaseAS|Win32.ActiveCfg = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.ReleaseAS|Win32.Build.0 = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.ReleaseAS|x64.ActiveCfg = Release|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|Win32.ActiveCfg = DebugAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|Win32.Build.0 = DebugAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.ActiveCfg = DebugAS|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.Build.0 = DebugAS|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|Win32.ActiveCfg = DebugAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|Win32.Build.0 = DebugAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|x64.ActiveCfg = DebugAD|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|x64.Build.0 = DebugAD|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|Win32.ActiveCfg = DebugAS|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|Win32.Build.0 = DebugAS|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|x64.ActiveCfg = DebugAS|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|x64.Build.0 = DebugAS|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Release|Win32.ActiveCfg = ReleaseAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Release|Win32.Build.0 = ReleaseAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.ActiveCfg = ReleaseAS|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.Build.0 = ReleaseAS|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|Win32.ActiveCfg = ReleaseAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|Win32.Build.0 = ReleaseAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|x64.ActiveCfg = ReleaseAD|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|x64.Build.0 = ReleaseAD|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|Win32.ActiveCfg = ReleaseAS|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|Win32.Build.0 = ReleaseAS|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|x64.ActiveCfg = ReleaseAS|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|x64.Build.0 = ReleaseAS|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/src/tools/vmap-extractor/win/vmapExtractor_VC110.sln b/src/tools/vmap-extractor/win/vmapExtractor_VC110.sln deleted file mode 100644 index a36da935d..000000000 --- a/src/tools/vmap-extractor/win/vmapExtractor_VC110.sln +++ /dev/null @@ -1,116 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmapExtractor", "VC110\vmapExtractor.vcxproj", "{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}" - ProjectSection(ProjectDependencies) = postProject - {78424708-1F6E-4D4B-920C-FB6D26847055} = {78424708-1F6E-4D4B-920C-FB6D26847055} - {B96F612A-C91D-43B3-A4C3-D4294817EC6C} = {B96F612A-C91D-43B3-A4C3-D4294817EC6C} - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\win\VC110\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "..\..\..\win\VC110\bzip2.vcxproj", "{B96F612A-C91D-43B3-A4C3-D4294817EC6C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib", "..\..\..\dep\StormLib\StormLib_vc110.vcxproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - DebugAD|Win32 = DebugAD|Win32 - DebugAD|x64 = DebugAD|x64 - DebugAS|Win32 = DebugAS|Win32 - DebugAS|x64 = DebugAS|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - ReleaseAD|Win32 = ReleaseAD|Win32 - ReleaseAD|x64 = ReleaseAD|x64 - ReleaseAS|Win32 = ReleaseAS|Win32 - ReleaseAS|x64 = ReleaseAS|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Debug|Win32.ActiveCfg = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Debug|Win32.Build.0 = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Debug|x64.ActiveCfg = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.DebugAD|Win32.ActiveCfg = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.DebugAD|Win32.Build.0 = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.DebugAD|x64.ActiveCfg = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.DebugAS|Win32.ActiveCfg = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.DebugAS|Win32.Build.0 = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.DebugAS|x64.ActiveCfg = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Release|Win32.ActiveCfg = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Release|Win32.Build.0 = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Release|x64.ActiveCfg = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.ReleaseAD|Win32.ActiveCfg = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.ReleaseAD|Win32.Build.0 = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.ReleaseAD|x64.ActiveCfg = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.ReleaseAS|Win32.ActiveCfg = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.ReleaseAS|Win32.Build.0 = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.ReleaseAS|x64.ActiveCfg = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.Build.0 = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.DebugAD|Win32.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.DebugAD|x64.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.DebugAD|x64.Build.0 = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.DebugAS|Win32.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.DebugAS|x64.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.DebugAS|x64.Build.0 = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.Build.0 = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.ReleaseAD|Win32.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.ReleaseAD|x64.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.ReleaseAD|x64.Build.0 = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.ReleaseAS|Win32.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.ReleaseAS|x64.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.ReleaseAS|x64.Build.0 = Release|x64 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|Win32.ActiveCfg = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|Win32.Build.0 = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|x64.ActiveCfg = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.DebugAD|Win32.ActiveCfg = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.DebugAD|Win32.Build.0 = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.DebugAD|x64.ActiveCfg = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.DebugAS|Win32.ActiveCfg = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.DebugAS|Win32.Build.0 = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.DebugAS|x64.ActiveCfg = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|Win32.ActiveCfg = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|Win32.Build.0 = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|x64.ActiveCfg = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.ReleaseAD|Win32.ActiveCfg = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.ReleaseAD|Win32.Build.0 = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.ReleaseAD|x64.ActiveCfg = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.ReleaseAS|Win32.ActiveCfg = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.ReleaseAS|Win32.Build.0 = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.ReleaseAS|x64.ActiveCfg = Release|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|Win32.ActiveCfg = DebugAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|Win32.Build.0 = DebugAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.ActiveCfg = DebugAS|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.Build.0 = DebugAS|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|Win32.ActiveCfg = DebugAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|Win32.Build.0 = DebugAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|x64.ActiveCfg = DebugAD|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|x64.Build.0 = DebugAD|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|Win32.ActiveCfg = DebugAS|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|Win32.Build.0 = DebugAS|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|x64.ActiveCfg = DebugAS|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|x64.Build.0 = DebugAS|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Release|Win32.ActiveCfg = ReleaseAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Release|Win32.Build.0 = ReleaseAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.ActiveCfg = ReleaseAS|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.Build.0 = ReleaseAS|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|Win32.ActiveCfg = ReleaseAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|Win32.Build.0 = ReleaseAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|x64.ActiveCfg = ReleaseAD|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|x64.Build.0 = ReleaseAD|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|Win32.ActiveCfg = ReleaseAS|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|Win32.Build.0 = ReleaseAS|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|x64.ActiveCfg = ReleaseAS|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|x64.Build.0 = ReleaseAS|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/src/tools/vmap-extractor/win/vmapExtractor_VC120.sln b/src/tools/vmap-extractor/win/vmapExtractor_VC120.sln deleted file mode 100644 index 5cf6075a9..000000000 --- a/src/tools/vmap-extractor/win/vmapExtractor_VC120.sln +++ /dev/null @@ -1,116 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vmapExtractor", "VC120\vmapExtractor.vcxproj", "{D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}" - ProjectSection(ProjectDependencies) = postProject - {78424708-1F6E-4D4B-920C-FB6D26847055} = {78424708-1F6E-4D4B-920C-FB6D26847055} - {B96F612A-C91D-43B3-A4C3-D4294817EC6C} = {B96F612A-C91D-43B3-A4C3-D4294817EC6C} - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} = {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "..\..\..\win\VC120\zlib.vcxproj", "{8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bzip2", "..\..\..\win\VC120\bzip2.vcxproj", "{B96F612A-C91D-43B3-A4C3-D4294817EC6C}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StormLib", "..\..\..\dep\StormLib\StormLib_vc120.vcxproj", "{78424708-1F6E-4D4B-920C-FB6D26847055}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - DebugAD|Win32 = DebugAD|Win32 - DebugAD|x64 = DebugAD|x64 - DebugAS|Win32 = DebugAS|Win32 - DebugAS|x64 = DebugAS|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - ReleaseAD|Win32 = ReleaseAD|Win32 - ReleaseAD|x64 = ReleaseAD|x64 - ReleaseAS|Win32 = ReleaseAS|Win32 - ReleaseAS|x64 = ReleaseAS|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Debug|Win32.ActiveCfg = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Debug|Win32.Build.0 = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Debug|x64.ActiveCfg = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.DebugAD|Win32.ActiveCfg = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.DebugAD|Win32.Build.0 = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.DebugAD|x64.ActiveCfg = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.DebugAS|Win32.ActiveCfg = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.DebugAS|Win32.Build.0 = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.DebugAS|x64.ActiveCfg = Debug|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Release|Win32.ActiveCfg = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Release|Win32.Build.0 = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.Release|x64.ActiveCfg = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.ReleaseAD|Win32.ActiveCfg = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.ReleaseAD|Win32.Build.0 = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.ReleaseAD|x64.ActiveCfg = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.ReleaseAS|Win32.ActiveCfg = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.ReleaseAS|Win32.Build.0 = Release|Win32 - {D4624B20-AC1E-4EE9-8C9C-0FB65EEE3393}.ReleaseAS|x64.ActiveCfg = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.ActiveCfg = Debug|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|Win32.Build.0 = Debug|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Debug|x64.Build.0 = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.DebugAD|Win32.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.DebugAD|x64.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.DebugAD|x64.Build.0 = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.DebugAS|Win32.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.DebugAS|x64.ActiveCfg = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.DebugAS|x64.Build.0 = Debug|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.ActiveCfg = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|Win32.Build.0 = Release|Win32 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.Release|x64.Build.0 = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.ReleaseAD|Win32.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.ReleaseAD|x64.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.ReleaseAD|x64.Build.0 = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.ReleaseAS|Win32.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.ReleaseAS|x64.ActiveCfg = Release|x64 - {8F1DEA42-6A5B-4B62-839D-C141A7BFACF2}.ReleaseAS|x64.Build.0 = Release|x64 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|Win32.ActiveCfg = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|Win32.Build.0 = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Debug|x64.ActiveCfg = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.DebugAD|Win32.ActiveCfg = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.DebugAD|Win32.Build.0 = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.DebugAD|x64.ActiveCfg = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.DebugAS|Win32.ActiveCfg = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.DebugAS|Win32.Build.0 = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.DebugAS|x64.ActiveCfg = Debug|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|Win32.ActiveCfg = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|Win32.Build.0 = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.Release|x64.ActiveCfg = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.ReleaseAD|Win32.ActiveCfg = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.ReleaseAD|Win32.Build.0 = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.ReleaseAD|x64.ActiveCfg = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.ReleaseAS|Win32.ActiveCfg = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.ReleaseAS|Win32.Build.0 = Release|Win32 - {B96F612A-C91D-43B3-A4C3-D4294817EC6C}.ReleaseAS|x64.ActiveCfg = Release|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|Win32.ActiveCfg = DebugAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|Win32.Build.0 = DebugAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.ActiveCfg = DebugAS|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Debug|x64.Build.0 = DebugAS|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|Win32.ActiveCfg = DebugAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|Win32.Build.0 = DebugAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|x64.ActiveCfg = DebugAD|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAD|x64.Build.0 = DebugAD|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|Win32.ActiveCfg = DebugAS|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|Win32.Build.0 = DebugAS|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|x64.ActiveCfg = DebugAS|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.DebugAS|x64.Build.0 = DebugAS|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Release|Win32.ActiveCfg = ReleaseAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Release|Win32.Build.0 = ReleaseAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.ActiveCfg = ReleaseAS|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.Release|x64.Build.0 = ReleaseAS|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|Win32.ActiveCfg = ReleaseAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|Win32.Build.0 = ReleaseAD|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|x64.ActiveCfg = ReleaseAD|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAD|x64.Build.0 = ReleaseAD|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|Win32.ActiveCfg = ReleaseAS|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|Win32.Build.0 = ReleaseAS|Win32 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|x64.ActiveCfg = ReleaseAS|x64 - {78424708-1F6E-4D4B-920C-FB6D26847055}.ReleaseAS|x64.Build.0 = ReleaseAS|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/src/tools/vmap-extractor/vmapextract/wmo.cpp b/src/tools/vmap-extractor/wmo.cpp similarity index 100% rename from src/tools/vmap-extractor/vmapextract/wmo.cpp rename to src/tools/vmap-extractor/wmo.cpp diff --git a/src/tools/vmap-extractor/vmapextract/wmo.h b/src/tools/vmap-extractor/wmo.h similarity index 100% rename from src/tools/vmap-extractor/vmapextract/wmo.h rename to src/tools/vmap-extractor/wmo.h