1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-15 20:03:15 +02:00

Compilation fixes for MSVC (relative include paths)

This commit is contained in:
Michał W. Urbańczyk
2014-02-27 20:42:17 +00:00
parent 71e76966af
commit 07aef4f2f6
7 changed files with 105 additions and 105 deletions

View File

@@ -2,22 +2,22 @@
#define INSTANTIATE_REGISTER_TYPES_HERE #define INSTANTIATE_REGISTER_TYPES_HERE
#include "RegisterTypes.h" #include "RegisterTypes.h"
#include "mapping/CMapInfo.h" #include "../mapping/CMapInfo.h"
#include "StartInfo.h" #include "../StartInfo.h"
#include "BattleState.h" #include "../BattleState.h"
#include "CGameState.h" #include "../CGameState.h"
#include "mapping/CMap.h" #include "../mapping/CMap.h"
#include "CModHandler.h" #include "../CModHandler.h"
#include "CObjectHandler.h" #include "../CObjectHandler.h"
#include "CCreatureHandler.h" #include "../CCreatureHandler.h"
#include "VCMI_Lib.h" #include "../VCMI_Lib.h"
#include "CArtHandler.h" #include "../CArtHandler.h"
#include "CHeroHandler.h" #include "../CHeroHandler.h"
#include "CSpellHandler.h" #include "../CSpellHandler.h"
#include "CTownHandler.h" #include "../CTownHandler.h"
#include "mapping/CCampaignHandler.h" #include "../mapping/CCampaignHandler.h"
#include "NetPacks.h" #include "../NetPacks.h"
#include "CDefObjInfoHandler.h" #include "../CDefObjInfoHandler.h"
// For reference: peak memory usage by gcc during compilation of register type templates // For reference: peak memory usage by gcc during compilation of register type templates
// registerTypesMapObjects: 1.9 Gb // registerTypesMapObjects: 1.9 Gb

View File

@@ -1,14 +1,14 @@
#pragma once #pragma once
#include "Connection.h" #include "../Connection.h"
#include "NetPacks.h" #include "../NetPacks.h"
#include "VCMI_Lib.h" #include "../VCMI_Lib.h"
#include "CArtHandler.h" #include "../CArtHandler.h"
#include "CObjectHandler.h" #include "../CObjectHandler.h"
#include "CGameState.h" #include "../CGameState.h"
#include "CHeroHandler.h" #include "../CHeroHandler.h"
#include "CTownHandler.h" #include "../CTownHandler.h"
#include "CModHandler.h" //needed? #include "../CModHandler.h" //needed?
/* /*
* RegisterTypes.h, part of VCMI engine * RegisterTypes.h, part of VCMI engine

View File

@@ -1,22 +1,22 @@
#include "StdInc.h" #include "StdInc.h"
#include "RegisterTypes.h" #include "RegisterTypes.h"
#include "mapping/CMapInfo.h" #include "../mapping/CMapInfo.h"
#include "StartInfo.h" #include "../StartInfo.h"
#include "BattleState.h" #include "../BattleState.h"
#include "CGameState.h" #include "../CGameState.h"
#include "mapping/CMap.h" #include "../mapping/CMap.h"
#include "CModHandler.h" #include "../CModHandler.h"
#include "CObjectHandler.h" #include "../CObjectHandler.h"
#include "CCreatureHandler.h" #include "../CCreatureHandler.h"
#include "VCMI_Lib.h" #include "../VCMI_Lib.h"
#include "CArtHandler.h" #include "../CArtHandler.h"
#include "CHeroHandler.h" #include "../CHeroHandler.h"
#include "CSpellHandler.h" #include "../CSpellHandler.h"
#include "CTownHandler.h" #include "../CTownHandler.h"
#include "mapping/CCampaignHandler.h" #include "../mapping/CCampaignHandler.h"
#include "NetPacks.h" #include "../NetPacks.h"
#include "CDefObjInfoHandler.h" #include "../CDefObjInfoHandler.h"
template void registerTypesClientPacks1<CISer<CConnection>>(CISer<CConnection>& s); template void registerTypesClientPacks1<CISer<CConnection>>(CISer<CConnection>& s);

View File

@@ -1,22 +1,22 @@
#include "StdInc.h" #include "StdInc.h"
#include "RegisterTypes.h" #include "RegisterTypes.h"
#include "mapping/CMapInfo.h" #include "../mapping/CMapInfo.h"
#include "StartInfo.h" #include "../StartInfo.h"
#include "BattleState.h" #include "../BattleState.h"
#include "CGameState.h" #include "../CGameState.h"
#include "mapping/CMap.h" #include "../mapping/CMap.h"
#include "CModHandler.h" #include "../CModHandler.h"
#include "CObjectHandler.h" #include "../CObjectHandler.h"
#include "CCreatureHandler.h" #include "../CCreatureHandler.h"
#include "VCMI_Lib.h" #include "../VCMI_Lib.h"
#include "CArtHandler.h" #include "../CArtHandler.h"
#include "CHeroHandler.h" #include "../CHeroHandler.h"
#include "CSpellHandler.h" #include "../CSpellHandler.h"
#include "CTownHandler.h" #include "../CTownHandler.h"
#include "mapping/CCampaignHandler.h" #include "../mapping/CCampaignHandler.h"
#include "NetPacks.h" #include "../NetPacks.h"
#include "CDefObjInfoHandler.h" #include "../CDefObjInfoHandler.h"
template void registerTypesClientPacks2<CISer<CConnection>>(CISer<CConnection>& s); template void registerTypesClientPacks2<CISer<CConnection>>(CISer<CConnection>& s);

View File

@@ -1,22 +1,22 @@
#include "StdInc.h" #include "StdInc.h"
#include "RegisterTypes.h" #include "RegisterTypes.h"
#include "mapping/CMapInfo.h" #include "../mapping/CMapInfo.h"
#include "StartInfo.h" #include "../StartInfo.h"
#include "BattleState.h" #include "../BattleState.h"
#include "CGameState.h" #include "../CGameState.h"
#include "mapping/CMap.h" #include "../mapping/CMap.h"
#include "CModHandler.h" #include "../CModHandler.h"
#include "CObjectHandler.h" #include "../CObjectHandler.h"
#include "CCreatureHandler.h" #include "../CCreatureHandler.h"
#include "VCMI_Lib.h" #include "../VCMI_Lib.h"
#include "CArtHandler.h" #include "../CArtHandler.h"
#include "CHeroHandler.h" #include "../CHeroHandler.h"
#include "CSpellHandler.h" #include "../CSpellHandler.h"
#include "CTownHandler.h" #include "../CTownHandler.h"
#include "mapping/CCampaignHandler.h" #include "../mapping/CCampaignHandler.h"
#include "NetPacks.h" #include "../NetPacks.h"
#include "CDefObjInfoHandler.h" #include "../CDefObjInfoHandler.h"
template void registerTypesMapObjects<CISer<CConnection>>(CISer<CConnection>& s); template void registerTypesMapObjects<CISer<CConnection>>(CISer<CConnection>& s);

View File

@@ -1,22 +1,22 @@
#include "StdInc.h" #include "StdInc.h"
#include "RegisterTypes.h" #include "RegisterTypes.h"
#include "mapping/CMapInfo.h" #include "../mapping/CMapInfo.h"
#include "StartInfo.h" #include "../StartInfo.h"
#include "BattleState.h" #include "../BattleState.h"
#include "CGameState.h" #include "../CGameState.h"
#include "mapping/CMap.h" #include "../mapping/CMap.h"
#include "CModHandler.h" #include "../CModHandler.h"
#include "CObjectHandler.h" #include "../CObjectHandler.h"
#include "CCreatureHandler.h" #include "../CCreatureHandler.h"
#include "VCMI_Lib.h" #include "../VCMI_Lib.h"
#include "CArtHandler.h" #include "../CArtHandler.h"
#include "CHeroHandler.h" #include "../CHeroHandler.h"
#include "CSpellHandler.h" #include "../CSpellHandler.h"
#include "CTownHandler.h" #include "../CTownHandler.h"
#include "mapping/CCampaignHandler.h" #include "../mapping/CCampaignHandler.h"
#include "NetPacks.h" #include "../NetPacks.h"
#include "CDefObjInfoHandler.h" #include "../CDefObjInfoHandler.h"
template void registerTypesPregamePacks<CISer<CConnection>>(CISer<CConnection>& s); template void registerTypesPregamePacks<CISer<CConnection>>(CISer<CConnection>& s);
template void registerTypesPregamePacks<COSer<CConnection>>(COSer<CConnection>& s); template void registerTypesPregamePacks<COSer<CConnection>>(COSer<CConnection>& s);

View File

@@ -1,22 +1,22 @@
#include "StdInc.h" #include "StdInc.h"
#include "RegisterTypes.h" #include "RegisterTypes.h"
#include "mapping/CMapInfo.h" #include "../mapping/CMapInfo.h"
#include "StartInfo.h" #include "../StartInfo.h"
#include "BattleState.h" #include "../BattleState.h"
#include "CGameState.h" #include "../CGameState.h"
#include "mapping/CMap.h" #include "../mapping/CMap.h"
#include "CModHandler.h" #include "../CModHandler.h"
#include "CObjectHandler.h" #include "../CObjectHandler.h"
#include "CCreatureHandler.h" #include "../CCreatureHandler.h"
#include "VCMI_Lib.h" #include "../VCMI_Lib.h"
#include "CArtHandler.h" #include "../CArtHandler.h"
#include "CHeroHandler.h" #include "../CHeroHandler.h"
#include "CSpellHandler.h" #include "../CSpellHandler.h"
#include "CTownHandler.h" #include "../CTownHandler.h"
#include "mapping/CCampaignHandler.h" #include "../mapping/CCampaignHandler.h"
#include "NetPacks.h" #include "../NetPacks.h"
#include "CDefObjInfoHandler.h" #include "../CDefObjInfoHandler.h"
template void registerTypesServerPacks<CISer<CConnection>>(CISer<CConnection>& s); template void registerTypesServerPacks<CISer<CConnection>>(CISer<CConnection>& s);
template void registerTypesServerPacks<COSer<CConnection>>(COSer<CConnection>& s); template void registerTypesServerPacks<COSer<CConnection>>(COSer<CConnection>& s);