X-Git-Url: https://git.sesse.net/?p=ccbs;a=blobdiff_plain;f=bigscreen%2FMakefile;h=fe010eef26f8cf5b292a9a1da51c77c860ffabc1;hp=ec590118fe6b99d240aac03a0bb297c695ee2092;hb=HEAD;hpb=723136532e3bb8b318b595b9eeef031275d5c72e

diff --git a/bigscreen/Makefile b/bigscreen/Makefile
index ec59011..fe010ee 100644
--- a/bigscreen/Makefile
+++ b/bigscreen/Makefile
@@ -1,28 +1,25 @@
 CC=gcc
 CXX=g++
-CPPFLAGS=-I/usr/include/postgresql $(shell freetype-config --cflags) -Itinyptc/
-CXXFLAGS=-g -Wall
+CPPFLAGS=-I/usr/include/postgresql $(shell freetype-config --cflags) $(shell sdl-config --cflags) $(shell pkg-config harfbuzz-icu --cflags) $(shell pkg-config pango --cflags) $(shell pkg-config pangoft2 --cflags)
+CXXFLAGS=-O2 -Wall -g
 LDFLAGS=-L/usr/X11R6/lib
-LIBS=$(shell freetype-config --libs) $(shell libpq3-config) -lpqxx tinyptc/libtinyptc.a -lX11 -lXext
+LIBS=$(shell freetype-config --libs) -lpqxx $(shell sdl-config --libs) $(shell pkg-config harfbuzz-icu --libs) $(shell pkg-config pango --libs) $(shell pkg-config pangoft2 --libs)
 
 CCBS_BIGSCREEN_SQL_OBJS=fetch_current_tournament.o fetch_list_of_active_groups.o \
+	fetch_list_of_finished_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_top_chosen_songs_for_tournament.o fetch_auxilliary_screens.o
 CCBS_BIGSCREEN_SCREEN_OBJS=groupscreen.o top10scorescreen.o top5chosenscreen.o splitscreen.o rotatescreen.o screen.o
-CCBS_BIGSCREEN_MAIN_OBJS=ccbs_bigscreen.o flagtrigger.o widestring.o fonts.o
+CCBS_BIGSCREEN_MAIN_OBJS=ccbs_bigscreen.o flagtrigger.o widestring.o fonts.o theme.o
 CCBS_BIGSCREEN_OBJS=$(CCBS_BIGSCREEN_SQL_OBJS) $(CCBS_BIGSCREEN_SCREEN_OBJS) $(CCBS_BIGSCREEN_MAIN_OBJS)
 
 all: ccbs-bigscreen
 
-tinyptc/libtinyptc.a:
-	$(MAKE) -C tinyptc
-
-ccbs-bigscreen: $(CCBS_BIGSCREEN_OBJS) tinyptc/libtinyptc.a
+ccbs-bigscreen: $(CCBS_BIGSCREEN_OBJS)
 	$(CXX) -o ccbs-bigscreen $(CCBS_BIGSCREEN_OBJS) $(LDFLAGS) $(LIBS)
 
 clean:
 	$(RM) $(CCBS_BIGSCREEN_OBJS) ccbs-bigscreen
-	$(MAKE) -C tinyptc clean
 
 .PHONY: clean