RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-06 21:19:18 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix compiling under MAC OSX

Browse source
This commit is contained in:
roel@libnfc.org 2011-09-05 11:44:45 +00:00
parent 3d77fdfab5
commit 38c4979dae
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
client/Makefile
View 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\

2
client/util.c
View 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)

2
common/Makefile.common
View 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