From aa326491a3d7243d226f52c6b85fb5a014728b4c Mon Sep 17 00:00:00 2001 From: Ivan Savenko Date: Fri, 10 Aug 2012 15:16:42 +0000 Subject: [PATCH] - compile fixes - build system update --- lib/CMakeLists.txt | 1 + lib/CModHandler.h | 6 ++++-- lib/Makefile.am | 2 ++ lib/Makefile.in | 25 ++++++++++++++++++------- lib/RegisterTypes.h | 8 ++++---- 5 files changed, 29 insertions(+), 13 deletions(-) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 085bd38c1..18a1e1917 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -29,6 +29,7 @@ set(lib_SRCS CHeroHandler.cpp CLogger.cpp CMapInfo.cpp + CModHandler.cpp CObjectHandler.cpp CObstacleInstance.cpp Connection.cpp diff --git a/lib/CModHandler.h b/lib/CModHandler.h index f0760b63b..00590632e 100644 --- a/lib/CModHandler.h +++ b/lib/CModHandler.h @@ -1,4 +1,6 @@ -#include "Filesystem\CResourceLoader.h" +#pragma once + +#include "Filesystem/CResourceLoader.h" #include "VCMI_Lib.h" #include "CCreatureHandler.h" @@ -83,4 +85,4 @@ public: h & creatures & artifacts; h & allMods & activeMods; } -}; \ No newline at end of file +}; diff --git a/lib/Makefile.am b/lib/Makefile.am index 4f555a420..3f9510da3 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -45,6 +45,8 @@ libvcmi_la_SOURCES = \ CLogger.h \ CMapInfo.cpp \ CMapInfo.h \ + CModHandler.cpp \ + CModHandler.h \ CObjectHandler.cpp \ CObjectHandler.h \ CObstacleInstance.cpp \ diff --git a/lib/Makefile.in b/lib/Makefile.in index 84a66eaa2..f05bd8a91 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -97,13 +97,14 @@ am_libvcmi_la_OBJECTS = libvcmi_la-CBinaryReader.lo \ libvcmi_la-CGameInterface.lo libvcmi_la-CGameState.lo \ libvcmi_la-CGeneralTextHandler.lo libvcmi_la-CHeroHandler.lo \ libvcmi_la-CLogger.lo libvcmi_la-CMapInfo.lo \ - libvcmi_la-CObjectHandler.lo libvcmi_la-CObstacleInstance.lo \ - libvcmi_la-CSpellHandler.lo libvcmi_la-CTownHandler.lo \ - libvcmi_la-CThreadHelper.lo libvcmi_la-Connection.lo \ - libvcmi_la-HeroBonus.lo libvcmi_la-IGameCallback.lo \ - libvcmi_la-JsonNode.lo libvcmi_la-NetPacksLib.lo \ - libvcmi_la-ResourceSet.lo libvcmi_la-BattleHex.lo \ - libvcmi_la-VCMI_Lib.lo libvcmi_la-map.lo + libvcmi_la-CModHandler.lo libvcmi_la-CObjectHandler.lo \ + libvcmi_la-CObstacleInstance.lo libvcmi_la-CSpellHandler.lo \ + libvcmi_la-CTownHandler.lo libvcmi_la-CThreadHelper.lo \ + libvcmi_la-Connection.lo libvcmi_la-HeroBonus.lo \ + libvcmi_la-IGameCallback.lo libvcmi_la-JsonNode.lo \ + libvcmi_la-NetPacksLib.lo libvcmi_la-ResourceSet.lo \ + libvcmi_la-BattleHex.lo libvcmi_la-VCMI_Lib.lo \ + libvcmi_la-map.lo libvcmi_la_OBJECTS = $(am_libvcmi_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) @@ -336,6 +337,8 @@ libvcmi_la_SOURCES = \ CLogger.h \ CMapInfo.cpp \ CMapInfo.h \ + CModHandler.cpp \ + CModHandler.h \ CObjectHandler.cpp \ CObjectHandler.h \ CObstacleInstance.cpp \ @@ -470,6 +473,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-CLogger.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-CMapInfo.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-CMemoryStream.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-CModHandler.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-CObjectHandler.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-CObstacleInstance.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libvcmi_la-CResourceLoader.Plo@am__quote@ @@ -667,6 +671,13 @@ libvcmi_la-CMapInfo.lo: CMapInfo.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CMapInfo.lo `test -f 'CMapInfo.cpp' || echo '$(srcdir)/'`CMapInfo.cpp +libvcmi_la-CModHandler.lo: CModHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CModHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CModHandler.Tpo -c -o libvcmi_la-CModHandler.lo `test -f 'CModHandler.cpp' || echo '$(srcdir)/'`CModHandler.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CModHandler.Tpo $(DEPDIR)/libvcmi_la-CModHandler.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='CModHandler.cpp' object='libvcmi_la-CModHandler.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -c -o libvcmi_la-CModHandler.lo `test -f 'CModHandler.cpp' || echo '$(srcdir)/'`CModHandler.cpp + libvcmi_la-CObjectHandler.lo: CObjectHandler.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libvcmi_la_CXXFLAGS) $(CXXFLAGS) -MT libvcmi_la-CObjectHandler.lo -MD -MP -MF $(DEPDIR)/libvcmi_la-CObjectHandler.Tpo -c -o libvcmi_la-CObjectHandler.lo `test -f 'CObjectHandler.cpp' || echo '$(srcdir)/'`CObjectHandler.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libvcmi_la-CObjectHandler.Tpo $(DEPDIR)/libvcmi_la-CObjectHandler.Plo diff --git a/lib/RegisterTypes.h b/lib/RegisterTypes.h index f5634142b..32dc3b8ea 100644 --- a/lib/RegisterTypes.h +++ b/lib/RegisterTypes.h @@ -8,7 +8,7 @@ #include "CGameState.h" #include "CHeroHandler.h" #include "CTownHandler.h" -//#include "CModHandler.h" //needed? +#include "CModHandler.h" //needed? /* * RegisterTypes.h, part of VCMI engine @@ -20,7 +20,7 @@ * */ -template +template void registerTypes1(Serializer &s) { //map objects @@ -114,7 +114,7 @@ void registerTypes1(Serializer &s) //s.template registerType(); } -template +template void registerTypes2(Serializer &s) { s.template registerType(); @@ -257,4 +257,4 @@ void registerTypes(Serializer &s) registerTypes2(s); registerTypes3(s); registerTypes4(s); -} \ No newline at end of file +}