merged trunk changes into branch

[proxmark3-svn] / armsrc / Makefile

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 8d9e2b4ad6a302d9dbbe0a3609e1d05ecb89c91c..2e5350bb3a406dac1d67a7ba3601ee2bef0d7ec5 100644 (file)
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -10,14 +10,15 @@ APP_INCLUDES = apps.h
 
 #remove one of the following defines and comment out the relevant line
 #in the next section to remove that particular feature from compilation  
 
 #remove one of the following defines and comment out the relevant line
 #in the next section to remove that particular feature from compilation  

-APP_CFLAGS     = -O2 -DWITH_LF -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b
+APP_CFLAGS     = -DWITH_LF -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b -DWITH_ICLASS -DWITH_LEGICRF -DWITH_HITAG

 #-DWITH_LCD 
 
 #SRC_LCD = fonts.c LCD.c
 SRC_LF = lfops.c hitag2.c
 SRC_ISO15693 = iso15693.c iso15693tools.c 
 #-DWITH_LCD 
 
 #SRC_LCD = fonts.c LCD.c
 SRC_LF = lfops.c hitag2.c
 SRC_ISO15693 = iso15693.c iso15693tools.c 

-SRC_ISO14443a = iso14443a.c
+SRC_ISO14443a = epa.c iso14443a.c mifareutil.c mifarecmd.c mifaresniff.c

 SRC_ISO14443b = iso14443.c
 SRC_ISO14443b = iso14443.c

+SRC_CRAPTO1 = crapto1.c crypto1.c

 
 THUMBSRC = start.c \
        $(SRC_LCD) \
 
 THUMBSRC = start.c \
        $(SRC_LCD) \


@@ -26,7 +27,8 @@ THUMBSRC = start.c \
        appmain.c printf.c \
        util.c \
        string.c \
        appmain.c printf.c \
        util.c \
        string.c \

-       usb.c
+       usb_cdc.c \
+       cmd.c

 
 # These are to be compiled in ARM mode
 ARMSRC = fpgaloader.c \
 
 # These are to be compiled in ARM mode
 ARMSRC = fpgaloader.c \


@@ -35,7 +37,9 @@ ARMSRC = fpgaloader.c \
        crc16.c \
        $(SRC_ISO14443a) \
        $(SRC_ISO14443b) \
        crc16.c \
        $(SRC_ISO14443a) \
        $(SRC_ISO14443b) \

+       $(SRC_CRAPTO1) \

        legic_prng.c \
        legic_prng.c \

+       iclass.c \

        crc.c
 
 # stdint.h provided locally until GCC 4.5 becomes C99 compliant
        crc.c
 
 # stdint.h provided locally until GCC 4.5 becomes C99 compliant