From: roel@libnfc.org <roel@libnfc.org@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Date: Mon, 5 Sep 2011 11:44:45 +0000 (+0000)
Subject: fix compiling under MAC OSX
X-Git-Tag: v1.0.0~243
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/38c4979dae8b7a215d356ceaa5a386ccbb126e38?ds=sidebyside;hp=3d77fdfab52f8837dbd704f5d9efe4bafa057285

fix compiling under MAC OSX
---

diff --git a/client/Makefile b/client/Makefile
index c76edf52..7224fe06 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/client/util.c b/client/util.c
index c7764f70..cbb1bfda 100644
--- a/client/util.c
+++ b/client/util.c
@@ -14,7 +14,7 @@
 #include <ctype.h>
 #include "util.h"
 
-#ifdef __linux__
+#ifndef WIN32
 #include <termios.h>
 #include <sys/ioctl.h> 
 int ukbhit(void)
diff --git a/common/Makefile.common b/common/Makefile.common
index 0e3bdd1e..d8968327 100644
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -20,7 +20,7 @@ platform = $(shell uname)
 
 all:
 
-CROSS  ?= arm-eabi-
+CROSS  ?= arm-none-eabi-
 CC	= $(CROSS)gcc
 AS	= $(CROSS)as
 LD	= $(CROSS)ld