From: pwpiwi Date: Mon, 24 Apr 2017 16:33:55 +0000 (+0200) Subject: reenable build in old proxspace environment (#286) X-Git-Tag: v3.0.0~9 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/f9e2c24b0103436c15ee9385240e3f9169833d3a reenable build in old proxspace environment (#286) * reenable build in old proxspace environment (use -std=c++11 and -fPIC options for Qt5 only) * fixing the fix... --- diff --git a/client/Makefile b/client/Makefile index ee2a25c0..3faa6f93 100644 --- a/client/Makefile +++ b/client/Makefile @@ -20,7 +20,7 @@ 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 -O3 -CXXFLAGS = -std=c++11 -fPIC -Wall -O3 +CXXFLAGS = -Wall -O3 LUAPLATFORM = generic platform = $(shell uname) @@ -42,11 +42,13 @@ QTLDLIBS = $(shell pkg-config --libs Qt5Core Qt5Widgets 2>/dev/null) MOC = $(shell pkg-config --variable=host_bins Qt5Core)/moc UIC = $(shell pkg-config --variable=host_bins Qt5Core)/uic ifeq ($(QTINCLUDES), ) -# if Qt5 not found Check for correctly configured Qt4 +# 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) UIC = $(shell pkg-config --variable=uic_location QtCore) +else + CXXFLAGS += -std=c++11 -fPIC endif ifeq ($(QTINCLUDES), ) # if both pkg-config commands failed, search in common places @@ -56,6 +58,7 @@ ifeq ($(QTINCLUDES), ) ifneq ($(wildcard $(QTDIR)/include/QtWidgets),) QTINCLUDES += -I$(QTDIR)/include/QtWidgets QTLDLIBS = -L$(QTDIR)/lib -lQt5Widgets -lQt5Gui -lQt5Core + CXXFLAGS += -std=c++11 -fPIC endif MOC = $(QTDIR)/bin/moc UIC = $(QTDIR)/bin/uic