]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
fix compiling under MAC OSX
authorroel@libnfc.org <roel@libnfc.org@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Mon, 5 Sep 2011 11:44:45 +0000 (11:44 +0000)
committerroel@libnfc.org <roel@libnfc.org@ef4ab9da-24cd-11de-8aaa-f3a34680c41f>
Mon, 5 Sep 2011 11:44:45 +0000 (11:44 +0000)
client/Makefile
client/util.c
common/Makefile.common

index c76edf522e5b396e856a42f1ce80d6641ba3beac..7224fe069fc23ca36fc466590a7884d1471e5f7e 100644 (file)
@@ -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\
index c7764f7092df5c0d6358e23bd409397603298e71..cbb1bfda9599126b53ef4eec2202167880b19118 100644 (file)
@@ -14,7 +14,7 @@
 #include <ctype.h>
 #include "util.h"
 
-#ifdef __linux__
+#ifndef WIN32
 #include <termios.h>
 #include <sys/ioctl.h> 
 int ukbhit(void)
index 0e3bdd1ebfc7ce6289456684f98558bcb87d2b5d..d89683270cd6e2fecf9db4058b1eedd5e48fefd5 100644 (file)
@@ -20,7 +20,7 @@ platform = $(shell uname)
 
 all:
 
-CROSS  ?= arm-eabi-
+CROSS  ?= arm-none-eabi-
 CC     = $(CROSS)gcc
 AS     = $(CROSS)as
 LD     = $(CROSS)ld
Impressum, Datenschutz