From 89c1437b0e84ca2ea5af30911d89675d6dbdde4d Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Thu, 16 Apr 2015 15:46:28 +0200 Subject: [PATCH] Use 4 CPU cores to build QT GUI + use qmake-qt4 by default --- Makefile.in | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 9fc6f7ce1..66c3fa425 100644 --- a/Makefile.in +++ b/Makefile.in @@ -393,7 +393,7 @@ dxt_compress/dxt_glsl.h:dxt_compress/compress_vp.glsl \ #echo ";" >> $@ gui/QT/uv-qt: - cd gui/QT; $(QMAKE) ; make -j; cd - + cd gui/QT; $(QMAKE) ; make -j 4; cd - # ------------------------------------------------------------------------------------------------- TEST_OBJS = test/test_bitstream.o \ diff --git a/configure.ac b/configure.ac index 091757d06..918654d87 100644 --- a/configure.ac +++ b/configure.ac @@ -2538,7 +2538,7 @@ AC_ARG_ENABLE(qt, if test $qt_req != no then - AC_CHECK_PROGS(QMAKE, [qmake qmake-qt4]) + AC_CHECK_PROGS(QMAKE, [qmake-qt4 qmake]) GUI_TARGET=gui/QT/uv-qt else GUI_TARGET=