fix OS detection, libgcc detection

[proxmark3-svn] / armsrc / Makefile

diff --git a/armsrc/Makefile b/armsrc/Makefile
index 516e58359dd6b0a0b586b8daaec088e5ef494c31..97805b7a1a9f1f1c16cce3b8e7a0c59f023e41a8 100644 (file)
--- a/armsrc/Makefile
+++ b/armsrc/Makefile
@@ -4,10 +4,11 @@ APP_INCLUDES = apps.h
 \r
 #remove one of the following defines and comment out the relevant line\r
 #in the next section to remove that particular feature from compilation  \r
 \r
 #remove one of the following defines and comment out the relevant line\r
 #in the next section to remove that particular feature from compilation  \r

-APP_CFLAGS     = -O6 -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b\r
-#-DWITH_LCD\r
+APP_CFLAGS     = -O6 -DWITH_LF -DWITH_ISO15693 -DWITH_ISO14443a -DWITH_ISO14443b\r
+#-DWITH_LCD \r

 \r
 #SRC_LCD = fonts.c LCD.c\r
 \r
 #SRC_LCD = fonts.c LCD.c\r

+SRC_LF = lfops.c hitag2.c\r

 SRC_ISO15693 = iso15693.c\r
 SRC_ISO14443a = iso14443a.c\r
 SRC_ISO14443b = iso14443.c\r
 SRC_ISO15693 = iso15693.c\r
 SRC_ISO14443a = iso14443a.c\r
 SRC_ISO14443b = iso14443.c\r


@@ -15,17 +16,17 @@ SRC_ISO14443b = iso14443.c
 THUMBSRC = start.c \\r
        $(SRC_LCD) \\r
        $(SRC_ISO15693) \\r
 THUMBSRC = start.c \\r
        $(SRC_LCD) \\r
        $(SRC_ISO15693) \\r

+       $(SRC_LF) \\r

        appmain.c \\r
        appmain.c \\r

-       lfops.c \\r

        util.c \\r
        util.c \\r

-       hitag2.c \\r
-       legicrf.c \\r

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

+       legicrf.c \\r

        $(SRC_ISO14443a) \\r
        $(SRC_ISO14443a) \\r

-       $(SRC_ISO14443b)\r
+       $(SRC_ISO14443b) \\r
+       crc.c\r

 \r
 # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC\r
 include ../common/Makefile.common\r
 \r
 # Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC\r
 include ../common/Makefile.common\r


@@ -35,7 +36,7 @@ all: $(OBJDIR)/osimage.s19 $(OBJDIR)/fpgaimage.s19
 $(OBJDIR)/fpga.o: fpga.bit\r
        $(OBJCOPY) -O elf32-littlearm -I binary -B arm --redefine-sym _binary____fpga_fpga_bit_start=_binary_fpga_bit_start --redefine-sym _binary____fpga_fpga_bit_end=_binary_fpga_bit_end --prefix-sections=fpga_bit  $^ $@\r
 \r
 $(OBJDIR)/fpga.o: fpga.bit\r
        $(OBJCOPY) -O elf32-littlearm -I binary -B arm --redefine-sym _binary____fpga_fpga_bit_start=_binary_fpga_bit_start --redefine-sym _binary____fpga_fpga_bit_end=_binary_fpga_bit_end --prefix-sections=fpga_bit  $^ $@\r
 \r

-$(OBJDIR)/fullimage.elf: $(VERSIONOBJ) $(OBJDIR)/fpga.o $(THUMBOBJ) $(ARMOBJ) $(ARMLIB)/libgcc.a\r
+$(OBJDIR)/fullimage.elf: $(VERSIONOBJ) $(OBJDIR)/fpga.o $(THUMBOBJ) $(ARMOBJ) $(LIBGCC)\r

        $(LD) -g -Tldscript -Map=$(patsubst %.elf,%.map,$@) -o $@ $^\r
 \r
 $(OBJDIR)/fpgaimage.elf: $(OBJDIR)/fullimage.elf\r
        $(LD) -g -Tldscript -Map=$(patsubst %.elf,%.map,$@) -o $@ $^\r
 \r
 $(OBJDIR)/fpgaimage.elf: $(OBJDIR)/fullimage.elf\r