]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
ADD: a switch to detect if Qt4 or Qt5 is used.
authoriceman1001 <iceman@iuse.se>
Fri, 30 Jan 2015 14:23:01 +0000 (15:23 +0100)
committericeman1001 <iceman@iuse.se>
Fri, 30 Jan 2015 14:23:01 +0000 (15:23 +0100)
client/Makefile

index 823ee44599e24beecfdc2323850a779529ff0926..46fa3b2a14172d9e2e4f95a605dce5e276c4fa9a 100644 (file)
@@ -37,6 +37,15 @@ LDLIBS +=  -ldl
 LUAPLATFORM = linux
 endif
 
+# QT version,  4 or 5
+qtplatform = $(shell $(MOC) -v)
+ifneq (, $(findstring moc 5,$(qtplatform)))
+   CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui -I$(QTDIR)/include/QtWidgets  -I/mingw/include
+   QTLDLIBS = -L$(QTDIR)/lib  -lQt5Core -lQt5Gui -lQt5Widgets 
+else
+   CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
+   QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
+endif
 
 ifneq ($(QTLDLIBS),)
 QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
Impressum, Datenschutz