github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-10 15:32:41 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix temp changes

Browse source
This commit is contained in:
roel@libnfc.org 2011-09-05 11:48:08 +00:00
parent 38c4979dae
commit 245e844e80
2 changed files with 7 additions and 7 deletions
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
common/Makefile.common
View file

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