fix compiling under MAC OSX

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

View file

@ -31,13 +31,13 @@ MOC = $(shell pkg-config --variable=moc_location QtCore)
endif endif
ifneq ($(QTLDLIBS),) #ifneq ($(QTLDLIBS),)
QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o #QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
CFLAGS += -DHAVE_GUI #CFLAGS += -DHAVE_GUI
LINK.o = $(LINK.cpp) #LINK.o = $(LINK.cpp)
else #else
QTGUI = guidummy.o QTGUI = guidummy.o
endif #endif
CMDSRCS = \ CMDSRCS = \
nonce2key/crapto1.c\ nonce2key/crapto1.c\

View file

@ -14,7 +14,7 @@
#include <ctype.h> #include <ctype.h>
#include "util.h" #include "util.h"
#ifdef __linux__ #ifndef WIN32
#include <termios.h> #include <termios.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
int ukbhit(void) int ukbhit(void)

View file

@ -20,7 +20,7 @@ platform = $(shell uname)
all: all:
CROSS ?= arm-eabi- CROSS ?= arm-none-eabi-
CC = $(CROSS)gcc CC = $(CROSS)gcc
AS = $(CROSS)as AS = $(CROSS)as
LD = $(CROSS)ld LD = $(CROSS)ld