github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 21:33:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

make/cmake add common_fpga

Browse source
This commit is contained in:
Philippe Teuwen 2020-04-19 13:00:35 +02:00
commit 07f3022aa6
4 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/CMakeLists.txt
View file

@ -240,8 +240,8 @@ add_executable(
target_compile_options(proxmark3 PUBLIC -Wall -Werror -O3) target_compile_options(proxmark3 PUBLIC -Wall -Werror -O3)
target_include_directories(proxmark3 PRIVATE target_include_directories(proxmark3 PRIVATE
..
../common ../common
../common_fpga
../include ../include
src src
) )

2
client/Makefile
View file

@ -54,7 +54,7 @@ ZLIBPATH = ../common/zlib
ZLIB = $(OBJDIR)/libz.a ZLIB = $(OBJDIR)/libz.a
LIBS = -I$(LUALIBPATH) -I$(MBEDTLSLIBPATH) -I$(JANSSONLIBPATH) -I$(CBORLIBPATH) -I$(ZLIBPATH) -I$(REVENGPATH) -I$(AMIIBOLIBPATH) -I$(HARDNESTEDPATH) -I$(CLIPARSERPATH) LIBS = -I$(LUALIBPATH) -I$(MBEDTLSLIBPATH) -I$(JANSSONLIBPATH) -I$(CBORLIBPATH) -I$(ZLIBPATH) -I$(REVENGPATH) -I$(AMIIBOLIBPATH) -I$(HARDNESTEDPATH) -I$(CLIPARSERPATH)
INCLUDES_CLIENT = -I./src -I../include -I../common $(LIBS) INCLUDES_CLIENT = -I./src -I../include -I../common -I../common_fpga $(LIBS)
CFLAGS ?= -Wall -Werror -O3 CFLAGS ?= -Wall -Werror -O3
# We cannot just use CFLAGS+=... because it has impact on sub-makes if CFLAGS is defined in env: # We cannot just use CFLAGS+=... because it has impact on sub-makes if CFLAGS is defined in env:
PM3CFLAGS = $(CFLAGS) -std=c99 -D_ISOC99_SOURCE $(INCLUDES_CLIENT) PM3CFLAGS = $(CFLAGS) -std=c99 -D_ISOC99_SOURCE $(INCLUDES_CLIENT)

2
client/src/cmdhf.c
View file

@ -39,7 +39,7 @@
#include "ui.h" #include "ui.h"
#include "cmddata.h" #include "cmddata.h"
#include "graph.h" #include "graph.h"
#include "../../common_fpga/fpga.h" #include "fpga.h"
static int CmdHelp(const char *Cmd); static int CmdHelp(const char *Cmd);

3
client/src/mifare/desfire_crypto.h
View file

@ -4,9 +4,6 @@
#include "common.h" #include "common.h"
#include "mifare.h" // structs #include "mifare.h" // structs
#include "crc32.h" #include "crc32.h"
//#include "../../armsrc/printf.h"
//#include "../../armsrc/desfire.h"
//#include "../../armsrc/iso14443a.h"
#define MAX_CRYPTO_BLOCK_SIZE 16 #define MAX_CRYPTO_BLOCK_SIZE 16