X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2FMakefile;h=cec94f2b56c242b9f540b5ff8967407528ffb727;hb=a69d8466e4ad4dd92488798582e680ae31029038;hp=26edd6204d32e11ad4abd8e03f1c1a13d429be5c;hpb=e35bf651e7ebfe4932e877780bb00397c41a7ec2;p=ipdf%2Fcode.git diff --git a/src/Makefile b/src/Makefile index 26edd62..cec94f2 100644 --- a/src/Makefile +++ b/src/Makefile @@ -3,7 +3,7 @@ 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 moc_controlpanel.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 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 @@ -82,7 +82,7 @@ $(BIN) : $(LINKOBJ) ../obj/$(MAIN) -include $(DEPS) moc_controlpanel.cpp : controlpanel.cpp controlpanel.h - moc $(DEF) controlpanel.h -o moc_controlpanel.cpp + moc-qt4 $(DEF) controlpanel.h -o moc_controlpanel.cpp ../obj/%.o : %.cpp main.h @mkdir -p $(dir $@)