From: iceman1001 <iceman@iuse.se>
Date: Fri, 13 Mar 2015 08:22:12 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/108262a145256facb03fef99c4caa9680fa3620c

Merge branch 'master' of https://github.com/Proxmark/proxmark3
---

108262a145256facb03fef99c4caa9680fa3620c
diff --cc client/Makefile
index d85eed55,6ec34469..ae116dd6
--- a/client/Makefile
+++ b/client/Makefile
@@@ -12,47 -12,43 +12,52 @@@ CXX=g+
  VPATH = ../common
  OBJDIR = obj
  
 -LDLIBS = -L/opt/local/lib -L/usr/local/lib ../liblua/liblua.a -lreadline -lpthread -lm
 +LDLIBS =  -L/mingw/lib -L/opt/local/lib -L/usr/local/lib ../liblua/liblua.a -lm -lreadline -lpthread -lgdi32
  LDFLAGS = $(COMMON_FLAGS)
 -CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
 +CFLAGS = -std=c99 -I. -I../include -I../common -I/mingw/include -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
  LUAPLATFORM = generic
+ 
  ifneq (,$(findstring MINGW,$(platform)))
- CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
- QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
- MOC = $(QTDIR)/bin/moc
- LUAPLATFORM = mingw
+     CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
+     MOC = $(QTDIR)/bin/moc
+     LUAPLATFORM = mingw
+     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
  else ifeq ($(platform),Darwin)
- 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)
- LUAPLATFORM = macosx
+     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)
+     LUAPLATFORM = macosx
  else
- 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)
- LDLIBS +=  -ldl
- 
- # Below is a variant you can use if you have problems compiling with QT5 on ubuntu. see http://www.proxmark.org/forum/viewtopic.php?id=1661 for more info. 
- #MOC = /usr/lib/x86_64-linux-gnu/qt4/bin/moc
- LUAPLATFORM = linux
+     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)
+     LDLIBS +=  -ldl
+     # Below is a variant you can use if you have problems compiling with QT5 on ubuntu. see http://www.proxmark.org/forum/viewtopic.php?id=1661 for more info. 
+     #MOC = /usr/lib/x86_64-linux-gnu/qt4/bin/moc
+     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
- CFLAGS += -DHAVE_GUI
- LINK.o = $(LINK.cpp)
+     QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
+     CFLAGS += -DHAVE_GUI
+     LINK.o = $(LINK.cpp)
  else
- QTGUI = guidummy.o
+     QTGUI = guidummy.o
  endif
  
  CORESRCS = 	uart.c \