Merge branch 'master' into experimental_varlen

* master:
  fix:  spellingmistake
  REM: removed unused define
This commit is contained in:
Philippe Teuwen 2019-04-25 21:26:51 +02:00
commit e7e07d9096
2 changed files with 3 additions and 5 deletions

View file

@ -28,7 +28,6 @@ endif
#in the next section to remove that particular feature from compilation.
# NO space,TABs after the "\" sign.
APP_CFLAGS = $(PLATFORM_DEFS) \
-DWITH_CRC \
-DON_DEVICE \
-DWITH_LF \
-DWITH_HITAG \
@ -88,13 +87,13 @@ else
SRC_FPC =
endif
ifneq (,$(findstring WITH_HITAG,$(APP_CLAGS)))
ifneq (,$(findstring WITH_HITAG,$(APP_CFLAGS)))
SRC_HITAG = hitag2_crypto.c hitag2.c hitagS.c
else
SRC_HITAG =
endif
ifneq (,$(findstring WITH_LCD,$(APP_CLAGS)))
ifneq (,$(findstring WITH_LCD,$(APP_CFLAGS)))
SRC_LCD = fonts.c LCD.c
else
SRC_LCD =

View file

@ -68,8 +68,7 @@ Once all this is done, you and others can now easily compile different standalon
#remove one of the following defines and comment out the relevant line
#in the next section to remove that particular feature from compilation.
# NO space,TABs after the "\" sign.
APP_CFLAGS = -DWITH_CRC \
-DON_DEVICE \
APP_CFLAGS = -DON_DEVICE \
-DWITH_LF \
-DWITH_HITAG \
-DWITH_ISO15693 \