From: pwpiwi Date: Tue, 11 Apr 2017 04:58:20 +0000 (+0200) Subject: Compatibility fixes for Qt5 (#271) X-Git-Tag: v3.0.0~15 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/3472ebe5285ecaaffba676db471e03f704da1c51 Compatibility fixes for Qt5 (#271) * Compatibility fixes for Qt5 - make Qt detection in client/Makefile independent of OS - added -std=c++11 and -fPIC as compiler options (required by some Qt versions, breaks compiling with old ProxSpace environment) --- diff --git a/client/Makefile b/client/Makefile index 3b4ce89e..2a2c7e49 100644 --- a/client/Makefile +++ b/client/Makefile @@ -20,28 +20,13 @@ LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm LUALIB = ../liblua/liblua.a LDFLAGS = $(COMMON_FLAGS) CFLAGS = -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4 -LUAPLATFORM = generic +CXXFLAGS = -std=c++11 -fPIC -Wall -O3 +LUAPLATFORM = generic platform = $(shell uname) ifneq (,$(findstring MINGW,$(platform))) - CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui - ifneq ($(wildcard $(QTDIR)/include/QtWidgets),) - CXXFLAGS += -I$(QTDIR)/include/QtWidgets - QTLDLIBS = -L$(QTDIR)/lib -lQt5Core -lQt5Gui -lQt5Widgets - else - QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4 - endif - MOC = $(QTDIR)/bin/moc LUAPLATFORM = mingw else - CXXFLAGS = $(shell pkg-config --cflags Qt5Core Qt5Widgets 2>/dev/null) -Wall -O4 - QTLDLIBS = $(shell pkg-config --libs Qt5Core Qt5Widgets 2>/dev/null) - MOC = $(shell pkg-config --variable=host_bins Qt5Core)/moc - ifeq ($(QTLDLIBS), ) - CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4 - QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null) - MOC = $(shell pkg-config --variable=moc_location QtCore) - endif ifeq ($(platform),Darwin) LUAPLATFORM = macosx else @@ -51,7 +36,31 @@ else endif endif -ifneq ($(QTLDLIBS),) +# Check for correctly configured Qt5 +QTINCLUDES = $(shell pkg-config --cflags Qt5Core Qt5Widgets 2>/dev/null) +QTLDLIBS = $(shell pkg-config --libs Qt5Core Qt5Widgets 2>/dev/null) +MOC = $(shell pkg-config --variable=host_bins Qt5Core)/moc +ifeq ($(QTINCLUDES), ) +# if Qt5 not found Check for correctly configured Qt4 + QTINCLUDES = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) + QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null) + MOC = $(shell pkg-config --variable=moc_location QtCore) +endif +ifeq ($(QTINCLUDES), ) +# if both pkg-config commands failed, search in common places + ifneq ($(QTDIR), ) + QTINCLUDES = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui + QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4 + ifneq ($(wildcard $(QTDIR)/include/QtWidgets),) + QTINCLUDES += -I$(QTDIR)/include/QtWidgets + QTLDLIBS = -L$(QTDIR)/lib -lQt5Widgets -lQt5Gui -lQt5Core + endif + MOC = $(QTDIR)/bin/moc + endif +endif + + +ifneq ($(QTLDLIBS), ) QTGUIOBJS = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o CFLAGS += -DHAVE_GUI else @@ -193,7 +202,7 @@ $(OBJDIR)/%.o : %.c $(OBJDIR)/%.d %.o: %.cpp $(OBJDIR)/%.o : %.cpp $(OBJDIR)/%.d - $(CXX) $(DEPFLAGS) $(CXXFLAGS) -c -o $@ $< + $(CXX) $(DEPFLAGS) $(CXXFLAGS) $(QTINCLUDES) -c -o $@ $< $(POSTCOMPILE) diff --git a/client/proxguiqt.cpp b/client/proxguiqt.cpp index cd8297ef..077e202f 100644 --- a/client/proxguiqt.cpp +++ b/client/proxguiqt.cpp @@ -7,6 +7,7 @@ //----------------------------------------------------------------------------- // GUI (QT) //----------------------------------------------------------------------------- +#include "proxguiqt.h" #include #include @@ -19,7 +20,6 @@ #include #include #include -#include "proxguiqt.h" #include "proxgui.h" int GridOffset= 0;