From: Sam Moore <matches@ucc.asn.au>
Date: Mon, 18 Aug 2014 05:18:39 +0000 (+0800)
Subject: Make Qt4 work
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=e35bf651e7ebfe4932e877780bb00397c41a7ec2;p=ipdf%2Fcode.git

Make Qt4 work

Needed to generate a special "moc" cpp file from the header file
---

diff --git a/src/Makefile b/src/Makefile
index 067cc61..26edd62 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,10 +3,10 @@ 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
 
 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)
@@ -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 $(DEF) controlpanel.h -o moc_controlpanel.cpp
+
 ../obj/%.o : %.cpp main.h
 	@mkdir -p $(dir $@)
 	$(CXX) $(CFLAGS) $(DEF) -c -MMD -o $@ $<
diff --git a/src/controlpanel.h b/src/controlpanel.h
index 3e8eb9a..f799375 100644
--- a/src/controlpanel.h
+++ b/src/controlpanel.h
@@ -32,7 +32,7 @@ namespace IPDF
 	 */
 	class ControlPanel : public QMainWindow
 	{	
-		//Q_OBJECT // Having this causes shit about undefined vtables
+		Q_OBJECT // Having this causes shit about undefined vtables
 				// Not having it means things break
 				// Apparently you need "qmake" to build qt applications
 				// Or some bullshit -_-