From 07f3022aa687d2ce469f9f9397076e78a03691cd Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Sun, 19 Apr 2020 13:00:35 +0200
Subject: [PATCH] make/cmake add common_fpga

---
 client/CMakeLists.txt              | 2 +-
 client/Makefile                    | 2 +-
 client/src/cmdhf.c                 | 2 +-
 client/src/mifare/desfire_crypto.h | 3 ---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index a548968f6..b29cffd50 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -240,8 +240,8 @@ add_executable(
 target_compile_options(proxmark3 PUBLIC -Wall -Werror -O3)
 
 target_include_directories(proxmark3 PRIVATE
-        ..
         ../common
+        ../common_fpga
         ../include
         src
 )
diff --git a/client/Makefile b/client/Makefile
index 9172e1908..a30a79bd4 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -54,7 +54,7 @@ ZLIBPATH = ../common/zlib
 ZLIB = $(OBJDIR)/libz.a
 
 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
 # 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)
diff --git a/client/src/cmdhf.c b/client/src/cmdhf.c
index b8688512b..bb6c022c4 100644
--- a/client/src/cmdhf.c
+++ b/client/src/cmdhf.c
@@ -39,7 +39,7 @@
 #include "ui.h"
 #include "cmddata.h"
 #include "graph.h"
-#include "../../common_fpga/fpga.h"
+#include "fpga.h"
 
 static int CmdHelp(const char *Cmd);
 
diff --git a/client/src/mifare/desfire_crypto.h b/client/src/mifare/desfire_crypto.h
index 40c57de27..1dc5316ae 100644
--- a/client/src/mifare/desfire_crypto.h
+++ b/client/src/mifare/desfire_crypto.h
@@ -4,9 +4,6 @@
 #include "common.h"
 #include "mifare.h" // structs
 #include "crc32.h"
-//#include "../../armsrc/printf.h"
-//#include "../../armsrc/desfire.h"
-//#include "../../armsrc/iso14443a.h"
 
 
 #define MAX_CRYPTO_BLOCK_SIZE 16