Initialize FreeType, link to it.

diff --git a/bigscreen/Makefile b/bigscreen/Makefile
index 9ad6ad1a462c1a5e0c6d6109aed2f3e36499604f..07201d5cee973a266b0e8c57ba10e1ca519054db 100644 (file)
--- a/bigscreen/Makefile
+++ b/bigscreen/Makefile
@@ -1,9 +1,9 @@
 CC=gcc
 CXX=g++
 CC=gcc
 CXX=g++

-CPPFLAGS=-I/usr/include/postgresql
+CPPFLAGS=-I/usr/include/postgresql $(shell freetype-config --cflags)

 CXXFLAGS=-g -Wall
 LDFLAGS=-L/usr/X11R6/lib
 CXXFLAGS=-g -Wall
 LDFLAGS=-L/usr/X11R6/lib

-LIBS=-lGL -lX11 -lXext -lXxf86vm $(shell libpq3-config) -lpqxx
+LIBS=-lGL -lX11 -lXext -lXxf86vm $(shell freetype-config --libs) $(shell libpq3-config) -lpqxx

 CCBS_BIGSCREEN_OBJS=ccbs_bigscreen.o glwindow.o
 
 all: ccbs-bigscreen
 CCBS_BIGSCREEN_OBJS=ccbs_bigscreen.o glwindow.o
 
 all: ccbs-bigscreen

diff --git a/bigscreen/ccbs_bigscreen.cpp b/bigscreen/ccbs_bigscreen.cpp
index 17b71df61154d8364861df88db16910cc47ccf3a..5df9dcdc989ec6defcdc0d4f0f61a710f49adf4a 100644 (file)
--- a/bigscreen/ccbs_bigscreen.cpp
+++ b/bigscreen/ccbs_bigscreen.cpp
@@ -3,6 +3,9 @@
 #include <iconv.h>
 #include <unistd.h>
 #include <pqxx/pqxx>
 #include <iconv.h>
 #include <unistd.h>
 #include <pqxx/pqxx>

+#include <ft2build.h>
+#include FT_FREETYPE_H
+

 #include "glwindow.h"
 
 iconv_t ucs4_iconv;
 #include "glwindow.h"
 
 iconv_t ucs4_iconv;


@@ -81,6 +84,7 @@ public:
 };
 
 Tournament active_tournament;
 };
 
 Tournament active_tournament;

+FT_Face font;

 
 /* A trigger that sets a flag whenever it's trigged. */
 class FlagTrigger : pqxx::trigger {
 
 /* A trigger that sets a flag whenever it's trigged. */
 class FlagTrigger : pqxx::trigger {


@@ -163,12 +167,25 @@ void main_loop(pqxx::connection &conn)
        sleep(1);
 }
 
        sleep(1);
 }
 

+void init_freetype()
+{
+       FT_Library library;
+       if (FT_Init_FreeType(&library))
+               throw std::logic_error("FreeType init failed.");
+       if (FT_New_Face(library, "/usr/share/fonts/truetype/msttcorefonts/Georgia.ttf", 0, &font))
+               throw std::logic_error("Face opening failed.");
+       if (FT_Set_Char_Size(font, 0, 12, 96, 96))
+               throw std::logic_error("Size set failed.");
+}
+

 int main(int argc, char **argv)
 {
        ucs4_iconv = iconv_open("ucs-4", "utf-8");
        
        GLWindow glw("CCBS bigscreen", 800, 600, 32, false, 16, -1);
 int main(int argc, char **argv)
 {
        ucs4_iconv = iconv_open("ucs-4", "utf-8");
        
        GLWindow glw("CCBS bigscreen", 800, 600, 32, false, 16, -1);

+       

        try {
        try {

+               init_freetype();

                pqxx::connection conn("dbname=ccbs host=altersex.samfundet.no user=ccbs password=GeT|>>B_");
                FlagTrigger tournament_changed(conn, "active_tournament");
                
                pqxx::connection conn("dbname=ccbs host=altersex.samfundet.no user=ccbs password=GeT|>>B_");
                FlagTrigger tournament_changed(conn, "active_tournament");