From 2ab691ef4065a7daca6686ba4bfd18d8b71cab87 Mon Sep 17 00:00:00 2001 From: Frank Zago Date: Wed, 20 May 2009 03:10:16 +0000 Subject: [PATCH] Linux build fixes. --- client/GUIClasses.h | 2 +- client/Makefile.am | 2 ++ client/Makefile.in | 19 ++++++++++++++++++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/client/GUIClasses.h b/client/GUIClasses.h index 6bed57ef9..6fbb8d937 100644 --- a/client/GUIClasses.h +++ b/client/GUIClasses.h @@ -1,7 +1,7 @@ #ifndef __GUICLASSES_H__ #define __GUICLASSES_H__ -#include "global.h" +#include "../global.h" #include "SDL_framerate.h" #include "FunctionList.h" #include diff --git a/client/Makefile.am b/client/Makefile.am index 043eace32..a72840ac5 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -70,4 +70,6 @@ vcmiclient_SOURCES = \ ./FunctionList.h \ ./Graphics.cpp \ ./Graphics.h \ + ./GUIClasses.cpp \ + ./GUIClasses.h \ ./NetPacksClient.cpp diff --git a/client/Makefile.in b/client/Makefile.in index 3c652e1fd..67348d121 100644 --- a/client/Makefile.in +++ b/client/Makefile.in @@ -77,7 +77,7 @@ am_vcmiclient_OBJECTS = vcmiclient-AdventureMapButton.$(OBJEXT) \ vcmiclient-CConfigHandler.$(OBJEXT) \ vcmiclient-CCreatureAnimation.$(OBJEXT) \ vcmiclient-CSpellWindow.$(OBJEXT) vcmiclient-Client.$(OBJEXT) \ - vcmiclient-Graphics.$(OBJEXT) \ + vcmiclient-Graphics.$(OBJEXT) vcmiclient-GUIClasses.$(OBJEXT) \ vcmiclient-NetPacksClient.$(OBJEXT) vcmiclient_OBJECTS = $(am_vcmiclient_OBJECTS) vcmiclient_DEPENDENCIES = $(top_builddir)/lib/libvcmi.la @@ -304,6 +304,8 @@ vcmiclient_SOURCES = \ ./FunctionList.h \ ./Graphics.cpp \ ./Graphics.h \ + ./GUIClasses.cpp \ + ./GUIClasses.h \ ./NetPacksClient.cpp all: all-am @@ -399,6 +401,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiclient-CSpellWindow.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiclient-CThreadHelper.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiclient-Client.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiclient-GUIClasses.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiclient-Graphics.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiclient-NetPacksClient.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vcmiclient-SDL_Extensions.Po@am__quote@ @@ -790,6 +793,20 @@ vcmiclient-Graphics.obj: ./Graphics.cpp @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-Graphics.obj `if test -f './Graphics.cpp'; then $(CYGPATH_W) './Graphics.cpp'; else $(CYGPATH_W) '$(srcdir)/./Graphics.cpp'; fi` +vcmiclient-GUIClasses.o: ./GUIClasses.cpp +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-GUIClasses.o -MD -MP -MF $(DEPDIR)/vcmiclient-GUIClasses.Tpo -c -o vcmiclient-GUIClasses.o `test -f './GUIClasses.cpp' || echo '$(srcdir)/'`./GUIClasses.cpp +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/vcmiclient-GUIClasses.Tpo $(DEPDIR)/vcmiclient-GUIClasses.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='./GUIClasses.cpp' object='vcmiclient-GUIClasses.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-GUIClasses.o `test -f './GUIClasses.cpp' || echo '$(srcdir)/'`./GUIClasses.cpp + +vcmiclient-GUIClasses.obj: ./GUIClasses.cpp +@am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-GUIClasses.obj -MD -MP -MF $(DEPDIR)/vcmiclient-GUIClasses.Tpo -c -o vcmiclient-GUIClasses.obj `if test -f './GUIClasses.cpp'; then $(CYGPATH_W) './GUIClasses.cpp'; else $(CYGPATH_W) '$(srcdir)/./GUIClasses.cpp'; fi` +@am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/vcmiclient-GUIClasses.Tpo $(DEPDIR)/vcmiclient-GUIClasses.Po +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='./GUIClasses.cpp' object='vcmiclient-GUIClasses.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -c -o vcmiclient-GUIClasses.obj `if test -f './GUIClasses.cpp'; then $(CYGPATH_W) './GUIClasses.cpp'; else $(CYGPATH_W) '$(srcdir)/./GUIClasses.cpp'; fi` + vcmiclient-NetPacksClient.o: ./NetPacksClient.cpp @am__fastdepCXX_TRUE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(vcmiclient_CXXFLAGS) $(CXXFLAGS) -MT vcmiclient-NetPacksClient.o -MD -MP -MF $(DEPDIR)/vcmiclient-NetPacksClient.Tpo -c -o vcmiclient-NetPacksClient.o `test -f './NetPacksClient.cpp' || echo '$(srcdir)/'`./NetPacksClient.cpp @am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/vcmiclient-NetPacksClient.Tpo $(DEPDIR)/vcmiclient-NetPacksClient.Po