Jansson gcc8 fix (#679)

[proxmark3-svn] / armsrc / Makefile

diff --git a/armsrc/Makefile b/armsrc/Makefile
index f0a0c0ffda2c54b976aeef0b2fe467e0dbd85894..d230cda1c5c90061d2a41219d546de82a9a86974 100644 (file)
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -15,18 +15,19 @@ APP_CFLAGS  = -DON_DEVICE \
 
 include ../common/Makefile_Enabled_Options.common
 
 
 include ../common/Makefile_Enabled_Options.common
 

-ifneq (,$(findstring LCD,$(APP_CFLAGS)))
+ifneq (,$(findstring WITH_LCD,$(APP_CFLAGS)))

         SRC_LCD = fonts.c LCD.c
 else
         SRC_LCD = 
 endif
         SRC_LCD = fonts.c LCD.c
 else
         SRC_LCD = 
 endif

-#SRC_LCD = fonts.c LCD.c

 SRC_LF = lfops.c hitag2.c hitagS.c lfsampling.c pcf7931.c lfdemod.c protocols.c
 SRC_ISO15693 = iso15693.c iso15693tools.c
 SRC_ISO14443a = epa.c iso14443a.c mifareutil.c mifarecmd.c mifaresniff.c mifaresim.c
 SRC_ISO14443b = iso14443b.c
 SRC_CRAPTO1 = crypto1.c des.c
 SRC_CRC = iso14443crc.c crc.c crc16.c crc32.c parity.c
 SRC_LF = lfops.c hitag2.c hitagS.c lfsampling.c pcf7931.c lfdemod.c protocols.c
 SRC_ISO15693 = iso15693.c iso15693tools.c
 SRC_ISO14443a = epa.c iso14443a.c mifareutil.c mifarecmd.c mifaresniff.c mifaresim.c
 SRC_ISO14443b = iso14443b.c
 SRC_CRAPTO1 = crypto1.c des.c
 SRC_CRC = iso14443crc.c crc.c crc16.c crc32.c parity.c

+SRC_SMARTCARD = i2c.c
+

 #the FPGA bitstream files. Note: order matters!
 FPGA_BITSTREAMS = fpga_lf.bit fpga_hf.bit
 
 #the FPGA bitstream files. Note: order matters!
 FPGA_BITSTREAMS = fpga_lf.bit fpga_hf.bit
 


@@ -44,6 +45,7 @@ THUMBSRC = start.c \
        $(SRC_ISO15693) \
        $(SRC_LF) \
        $(SRC_ZLIB) \
        $(SRC_ISO15693) \
        $(SRC_LF) \
        $(SRC_ZLIB) \

+       $(SRC_SMARTCARD) \

        appmain.c \
        printf.c \
        util.c \
        appmain.c \
        printf.c \
        util.c \


@@ -54,11 +56,12 @@ THUMBSRC = start.c \
 # These are to be compiled in ARM mode
 ARMSRC = fpgaloader.c \
        legicrf.c \
 # These are to be compiled in ARM mode
 ARMSRC = fpgaloader.c \
        legicrf.c \

+       legicrfsim.c \
+       legic_prng.c \

        $(SRC_ISO14443a) \
        $(SRC_ISO14443b) \
        $(SRC_CRAPTO1) \
        $(SRC_CRC) \
        $(SRC_ISO14443a) \
        $(SRC_ISO14443b) \
        $(SRC_CRAPTO1) \
        $(SRC_CRC) \

-       legic_prng.c \

        iclass.c \
        BigBuf.c \
        optimized_cipher.c \
        iclass.c \
        BigBuf.c \
        optimized_cipher.c \