Changeset 6609 in orxonox.OLD for trunk

Timestamp:

Jan 18, 2006, 11:50:25 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: compile again on Windows

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• src/lib/graphics/text_engine/font.cc (modified) (1 diff)
• src/lib/graphics/text_engine/font.h (modified) (1 diff)

trunk/configure.ac

@@ -550 +550 @@
      fi
   AC_CHECK_LIB([avutil], [main], [FOUND_avutil=yes; LIBS="$LIBS -lavutil"])
+
+  AC_CHECK_LIB([gcj], [main], [FOUND_gcj=yes; LIBS="$LIBS -lgcj"])
 
   AC_CHECK_LIB([theora], [main], [FOUND_theora=yes; LIBS="$LIBS -ltheora"])

trunk/src/lib/graphics/text_engine/font.cc

@@ -247 +247 @@
  * @param fileName the File to write the image into.
  */
-void Font::createAsciiImage(const char* fileName, uint size) const
+void Font::createAsciiImage(const char* fileName, unsigned int size) const
 {
   if (this->fontTTF == NULL)

trunk/src/lib/graphics/text_engine/font.h

@@ -78 +78 @@
     inline static Font* getDefaultFont() { if (Font::defaultFont == NULL) initDefaultFont(); return Font::defaultFont; };
 
-    void createAsciiImage(const char* fileName, uint size) const;
+    void createAsciiImage(const char* fileName, unsigned int size) const;
     static void initDefaultFont();
     static void removeDefaultFont();