瀏覽代碼

Compile fix.

Frank Zago 16 年之前
父節點
當前提交
c7a307dfed
共有 5 個文件被更改,包括 23 次插入10 次删除
  1. 19 0
      client/FontBase.h
  2. 1 2
      client/GUIBase.h
  3. 1 6
      client/Graphics.h
  4. 1 0
      client/Makefile.am
  5. 1 2
      client/SDL_Extensions.h

+ 19 - 0
client/FontBase.h

@@ -0,0 +1,19 @@
+#ifndef __FONTBASE_H__
+#define __FONTBASE_H__
+
+/*
+ * Graphics.h, part of VCMI engine
+ *
+ * Authors: listed in file AUTHORS in main folder
+ *
+ * License: GNU General Public License v2.0 or later
+ * Full text of license available in license.txt file, in main folder
+ *
+ */
+
+enum EFonts
+{
+	FONT_BIG, FONT_CALLI, FONT_CREDITS, FONT_HIGH_SCORE, FONT_MEDIUM, FONT_SMALL, FONT_TIMES, FONT_TINY, FONT_VERD
+};
+
+#endif

+ 1 - 2
client/GUIBase.h

@@ -6,7 +6,7 @@
 #include <set>
 #include <list>
 #include "../timeHandler.h"
-
+#include "FontBase.h"
 
 #ifdef max
 #undef max
@@ -55,7 +55,6 @@ class CArmedInstance;
 class CGTownInstance;
 class StackState;
 class CPlayerInterface;
-enum EFonts;
 
 struct Point
 {

+ 1 - 6
client/Graphics.h

@@ -3,6 +3,7 @@
 
 
 #include "../global.h"
+#include "FontBase.h"
 
 /*
  * Graphics.h, part of VCMI engine
@@ -43,12 +44,6 @@ struct Font
 	int getWidth(const char *text) const;
 };
 
-enum EFonts
-{
-	FONT_BIG, FONT_CALLI, FONT_CREDITS, FONT_HIGH_SCORE, FONT_MEDIUM, FONT_SMALL, FONT_TIMES, FONT_TINY, FONT_VERD
-};
-
-
 class Graphics
 {
 public:

+ 1 - 0
client/Makefile.am

@@ -63,6 +63,7 @@ vcmiclient_SOURCES =  \
 	CSpellWindow.h \
 	Client.cpp \
 	Client.h \
+	FontBase.h \
 	FunctionList.h \
 	GUIBase.cpp \
 	GUIBase.h \

+ 1 - 2
client/SDL_Extensions.h

@@ -6,6 +6,7 @@
 #include <string>
 #include <vector>
 #include <sstream>
+#include "FontBase.h"
 
 /*
  * SDL_Extensions.h, part of VCMI engine
@@ -17,8 +18,6 @@
  *
  */
 
-enum EFonts;
-
 extern SDL_Surface * screen, *screen2, *screenBuf;
 extern SDL_Color tytulowy, tlo, zwykly ;
 extern TTF_Font * TNRB16, *TNR, *GEOR13, *GEORXX, *GEORM;