From: roel@libnfc.org <roel@libnfc.org@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Date: Mon, 5 Sep 2011 11:48:08 +0000 (+0000)
Subject: fix temp changes
X-Git-Tag: v1.0.0~242
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/245e844e80045bc566331c0e59a75e19d15e5bd8?ds=inline

fix temp changes
---

diff --git a/client/Makefile b/client/Makefile
index 7224fe06..c76edf52 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -31,13 +31,13 @@ MOC = $(shell pkg-config --variable=moc_location QtCore)
 endif
 
 
-#ifneq ($(QTLDLIBS),)
-#QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
-#CFLAGS += -DHAVE_GUI
-#LINK.o = $(LINK.cpp)
-#else
+ifneq ($(QTLDLIBS),)
+QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
+CFLAGS += -DHAVE_GUI
+LINK.o = $(LINK.cpp)
+else
 QTGUI = guidummy.o
-#endif
+endif
 
 CMDSRCS = \
 			nonce2key/crapto1.c\
diff --git a/common/Makefile.common b/common/Makefile.common
index d8968327..0e3bdd1e 100644
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -20,7 +20,7 @@ platform = $(shell uname)
 
 all:
 
-CROSS  ?= arm-none-eabi-
+CROSS  ?= arm-eabi-
 CC	= $(CROSS)gcc
 AS	= $(CROSS)as
 LD	= $(CROSS)ld