FIX: logic behind compiler directive is now correct

This commit is contained in:
Chris 2018-09-04 20:31:12 +02:00
commit 27a036b087

View file

@ -24,7 +24,7 @@ APP_CFLAGS = -DWITH_CRC \
-DWITH_FLASH \ -DWITH_FLASH \
-DWITH_SMARTCARD \ -DWITH_SMARTCARD \
-DWITH_HFSNOOP \ -DWITH_HFSNOOP \
-DWITH_HF_COLIN\ -DWITH_LF_SAMYRUN \
-DWITH_FPC \ -DWITH_FPC \
-fno-strict-aliasing -ffunction-sections -fdata-sections -fno-strict-aliasing -ffunction-sections -fdata-sections
@ -77,47 +77,34 @@ else
endif endif
# Generic standalone Mode injection of source code # Generic standalone Mode injection of source code
SRC_STANDALONE =
# WITH_LF_ICERUN # WITH_LF_ICERUN
ifneq (,$(findstring WITH_LF_ICERUN,$(APP_CFLAGS))) ifneq (,$(findstring WITH_LF_ICERUN,$(APP_CFLAGS)))
SRC_STANDALONE = SRC_STANDALONE =
else
SRC_STANDALONE =
endif endif
# WITH_LF_SAMYRUN # WITH_LF_SAMYRUN
ifneq (,$(findstring WITH_LF_SAMYRUN,$(APP_CFLAGS))) ifneq (,$(findstring WITH_LF_SAMYRUN,$(APP_CFLAGS)))
SRC_STANDALONE = lf_samyrun.c SRC_STANDALONE = lf_samyrun.c
else
SRC_STANDALONE =
endif endif
# WITH_LF_PROXBRUTE # WITH_LF_PROXBRUTE
ifneq (,$(findstring WITH_LF_PROXBRUTE,$(APP_CFLAGS))) ifneq (,$(findstring WITH_LF_PROXBRUTE,$(APP_CFLAGS)))
SRC_STANDALONE = lf_proxbrute.c SRC_STANDALONE = lf_proxbrute.c
else
SRC_STANDALONE =
endif endif
# WITH_LF_HIDBRUTE # WITH_LF_HIDBRUTE
ifneq (,$(findstring WITH_LF_HIDBRUTE,$(APP_CFLAGS))) ifneq (,$(findstring WITH_LF_HIDBRUTE,$(APP_CFLAGS)))
SRC_STANDALONE = lf_hidbrute.c SRC_STANDALONE = lf_hidbrute.c
else
SRC_STANDALONE =
endif endif
# WITH_HF_YOUNG # WITH_HF_YOUNG
ifneq (,$(findstring WITH_HF_YOUNG,$(APP_CFLAGS))) ifneq (,$(findstring WITH_HF_YOUNG,$(APP_CFLAGS)))
SRC_STANDALONE = hf_young.c SRC_STANDALONE = hf_young.c
else
SRC_STANDALONE =
endif endif
# WITH_HF_MATTYRUN # WITH_HF_MATTYRUN
ifneq (,$(findstring WITH_HF_MATTYRUN,$(APP_CFLAGS))) ifneq (,$(findstring WITH_HF_MATTYRUN,$(APP_CFLAGS)))
SRC_STANDALONE = hf_mattyrun.c SRC_STANDALONE = hf_mattyrun.c
else
SRC_STANDALONE =
endif endif
# WITH_HF_COLIN # WITH_HF_COLIN
ifneq (,$(findstring WITH_HF_COLIN,$(APP_CFLAGS))) ifneq (,$(findstring WITH_HF_COLIN,$(APP_CFLAGS)))
SRC_STANDALONE = hf_colin.c vtsend.c SRC_STANDALONE = hf_colin.c vtsend.c
else
SRC_STANDALONE =
endif endif
#the FPGA bitstream files. Note: order matters! #the FPGA bitstream files. Note: order matters!