X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2FMakefile;h=cab9ceedee37e583bdfe221f47d316656cd402db;hp=9ad6ad1a462c1a5e0c6d6109aed2f3e36499604f;hb=0e17c7dcfd783acd4792c392c347e5e523757de3;hpb=a7d8519f7daa4b16677b558e974ad04afb419fa8

diff --git a/bigscreen/Makefile b/bigscreen/Makefile
index 9ad6ad1..cab9cee 100644
--- a/bigscreen/Makefile
+++ b/bigscreen/Makefile
@@ -1,17 +1,21 @@
 CC=gcc
 CXX=g++
-CPPFLAGS=-I/usr/include/postgresql
+CPPFLAGS=-I/usr/include/postgresql $(shell freetype-config --cflags) -Itinyptc/
 CXXFLAGS=-g -Wall
 LDFLAGS=-L/usr/X11R6/lib
-LIBS=-lGL -lX11 -lXext -lXxf86vm $(shell libpq3-config) -lpqxx
-CCBS_BIGSCREEN_OBJS=ccbs_bigscreen.o glwindow.o
+LIBS=$(shell freetype-config --libs) $(shell libpq3-config) -lpqxx tinyptc/libtinyptc.a -lX11 -lXext
+CCBS_BIGSCREEN_OBJS=ccbs_bigscreen.o flagtrigger.o widestring.o fetch_current_tournament.o fetch_list_of_active_groups.o fetch_max_score_for_songs.o fetch_max_score_for_players.o fetch_group.o fetch_needs_update.o fetch_highscore.o fetch_top_scores_for_tournament.o fetch_auxilliary_screens.o fonts.o groupscreen.o top10scorescreen.o splitscreen.o rotatescreen.o screen.o
 
 all: ccbs-bigscreen
 
-ccbs-bigscreen: $(CCBS_BIGSCREEN_OBJS)
+tinyptc/libtinyptc.a:
+	$(MAKE) -C tinyptc
+
+ccbs-bigscreen: $(CCBS_BIGSCREEN_OBJS) tinyptc/libtinyptc.a
 	$(CXX) -o ccbs-bigscreen $(CCBS_BIGSCREEN_OBJS) $(LDFLAGS) $(LIBS)
 
 clean:
 	$(RM) $(CCBS_BIGSCREEN_OBJS) ccbs-bigscreen
+	$(MAKE) -C tinyptc clean
 
 .PHONY: clean