Small GCC fixes. Autoconf/automake project files updated

CGameState.h

@@ -4,6 +4,7 @@
 #ifndef _MSC_VER
 #include "hch/CCreatureHandler.h"
 #include "lib/VCMI_Lib.h"
+#include "map.h"
 #endif
 #include <set>
 #include <vector>

client/Makefile.am

@@ -19,17 +19,14 @@ vcmiclient_SOURCES =  \
 ../hch/CDefHandler.cpp \
 ../CGameInfo.cpp \
 ../CGameInterface.cpp \
-../hch/CGeneralTextHandler.cpp \
 ../CHeroWindow.cpp \
 ./Client.cpp \
-../CLuaHandler.cpp \
 ../CMessage.cpp \
 ../CMT.cpp \
 ../hch/CMusicHandler.cpp \
 ../CPathfinder.cpp \
 ../CPlayerInterface.cpp \
 ../CPreGame.cpp \
-../hch/CPreGameTextHandler.cpp \
 ../hch/CSndHandler.cpp \
 ../CThreadHelper.cpp \
 ./Graphics.cpp \
@@ -55,18 +52,15 @@ vcmiclient_SOURCES =  \
 ../hch/CDefHandler.h \
 ../CGameInfo.h \
 ../CGameInterface.h \
-../hch/CGeneralTextHandler.h \
 ../hch/CHeroHandler.h \
 ../CHeroWindow.h \
 ./Client.h \
-../CLuaHandler.h \
 ../CMessage.h \
 ../hch/CMusicHandler.h \
 ../hch/CObjectHandler.h \
 ../CPathfinder.h \
 ../CPlayerInterface.h \
 ../CPreGame.h \
-../hch/CPreGameTextHandler.h \
 ../hch/CSndHandler.h \
 ../hch/CSpellHandler.h \
 ../CThreadHelper.h \

hch/CObjectHandler.h

@@ -6,6 +6,11 @@
 #include <set>
 #include <map>
 #include "CCreatureHandler.h"
+#ifndef _MSC_VER
+#include "CHeroHandler.h"
+#include "CTownHandler.h"
+#include "../lib/VCMI_Lib.h"
+#endif
 
 using boost::logic::tribool;
 class IGameCallback;

lib/Connection.h

@@ -431,7 +431,8 @@ class DLL_EXPORT CLoadFile
 {
 	void dummyMagicFunction()
 	{
-		*this >> std::string("This function makes stuff working.");
+		std::string dummy = "This function makes stuff working.";
+		*this >> dummy;
 	}
 public:
 	std::ifstream *sfile;

lib/Makefile.am

@@ -17,6 +17,8 @@ libvcmi_a_SOURCES = \
 ../stdafx.cpp \
 ./VCMI_Lib.cpp \
 ../hch/CSpellHandler.cpp \
+../hch/CGeneralTextHandler.cpp \
+./IGameCallback.cpp \
 ../CConsoleHandler.cpp \
 ../hch/CAmbarCendamo.h \
 ../hch/CArtHandler.h \
@@ -32,4 +34,6 @@ libvcmi_a_SOURCES = \
 ../map.h \
 ./NetPacks.h \
 ./VCMI_Lib.h \
+./IGameCallback.h \
+../hch/CGeneralTextHandler.h \
 ../CConsoleHandler.h 

lib/VCMI_Lib.cpp

@@ -206,4 +206,4 @@ void LibClasses::clear()
 	dobjinfo = NULL;
 	buildh = NULL;
 	spellh = NULL;
-}
+}

lib/VCMI_Lib.h

@@ -1,6 +1,10 @@
 #ifndef __VCMI_LIB_H__
 #define __VCMI_LIB_H__
 #include "../global.h"
+#ifndef _MSC_VER
+#include "../hch/CArtHandler.h"
+#include "../hch/CGeneralTextHandler.h"
+#endif
 
 class CLodHandler;
 class CArtHandler;

map.h

@@ -8,6 +8,10 @@
 #include <map>
 #include <set>
 #include "global.h"
+#ifndef _MSC_VER
+#include "hch/CObjectHandler.h"
+#include "hch/CDefObjInfoHandler.h"
+#endif
 class CGDefInfo;
 class CGObjectInstance;
 class CGHeroInstance;

server/Makefile.am

@@ -7,10 +7,6 @@ vcmiserver_LDFLAGS = -L$(top_builddir)/lib
 vcmiserver_LDADD += -lvcmi
 vcmiserver_SOURCES = \
 ./CGameHandler.cpp \
-../CLua.cpp \
-./CScriptCallback.cpp \
 ./CVCMIServer.cpp \
 ./CGameHandler.h \
-../CLua.h \
-./CScriptCallback.h \
 ./CVCMIServer.h