X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2FMakefile;h=1e4d83f5ec4c9a2c549ddb4deb60377604bf7138;hp=067cc6137f25f90526d14e5c657fb7914578992d;hb=138ee74c900c6f485cdd959d55c01099d6043661;hpb=6dd539966821debd18e0b86ed126742cd81d7fc9

diff --git a/src/Makefile b/src/Makefile
index 067cc61..1e4d83f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,13 +3,13 @@ ARCH := $(shell uname -m)
 # TODO: stb_truetype doesn't compile with some of these warnings.
 CXX = g++ -std=gnu++0x -g -Wall -Werror -Wshadow -pedantic -rdynamic
 MAIN = main.o
-OBJ = log.o real.o bezier.o document.o objectrenderer.o view.o screen.o vfpu.o quadtree.o graphicsbuffer.o framebuffer.o shaderprogram.o stb_truetype.o gl_core44.o add_digits_asm.o sub_digits_asm.o mul_digits_asm.o div_digits_asm.o arbint.o controlpanel.o
+OBJ = log.o real.o bezier.o document.o objectrenderer.o view.o screen.o vfpu.o quadtree.o graphicsbuffer.o framebuffer.o shaderprogram.o stb_truetype.o gl_core44.o add_digits_asm.o sub_digits_asm.o mul_digits_asm.o div_digits_asm.o arbint.o moc_controlpanel.o controlpanel.o path.o paranoidnumber.o
 
 QT_INCLUDE := -I/usr/share/qt4/mkspecs/linux-g++-64 -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui -I/usr/include/qt4 -I. -Itests -I.
-
+QT_DEF := -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB
 QT_LIB :=  -L/usr/lib/x86_64-linux-gnu -lQtGui -lQtCore -lpthread 
 
-LIB_x86_64 = ../contrib/lib/libSDL2-2.0.so.0 -lGL -lgmp $(QT_LIB)
+LIB_x86_64 = ../contrib/lib/libSDL2-2.0.so.0 -lGL -lmpfr -lgmp $(QT_LIB)
 LIB_i386 = ../contrib/lib32/libSDL2-2.0.so.0 -lGL -lgmp
 LIB_i686 = $(LIB_i386)
 
@@ -49,6 +49,8 @@ double : $(BIN)
 
 DEF = -DREAL=$(REALTYPE) -DQUADTREE_DISABLED
 
+CFLAGS := $(CFLAGS) $(QT_DEF)
+
 demo : $(BIN) ../tools/stream_plot.py
 	mkdir -p ../data/
 	$(RM) ../data/performance.dat
@@ -79,6 +81,9 @@ $(BIN) : $(LINKOBJ) ../obj/$(MAIN)
 
 -include $(DEPS)
 
+moc_controlpanel.cpp : controlpanel.cpp controlpanel.h
+	moc-qt4 $(DEF) controlpanel.h -o moc_controlpanel.cpp
+
 ../obj/%.o : %.cpp main.h
 	@mkdir -p $(dir $@)
 	$(CXX) $(CFLAGS) $(DEF) -c -MMD -o $@ $<