games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity

Small GCC fixes. Autoconf/automake project files updated

Browse Source
This commit is contained in:
Vadim Glazunov 2009-01-30 18:36:00 +00:00
parent 673ffddf4a
commit 8523fcbb43
9 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CGameState.h
View File

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

6
client/Makefile.am
View File

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

5
hch/CObjectHandler.h
View File

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

3
lib/Connection.h
View File

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

4
lib/Makefile.am
View File

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

4
lib/VCMI_Lib.h
View File

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

4
map.h
View File

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

4
server/Makefile.am
View File

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