autotest
/
xiuos
forked from xuos/xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix path_kernel.mk error

This commit is contained in:
Wien.b 2023-12-26 22:22:28 -08:00
parent cd759ccc83
commit a81f8e35d2
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Ubiquitous/XiZi_IIoT/path_kernel.mk
View File

@ -607,14 +607,13 @@ ifeq ($(CONFIG_LIB_USING_CJSON), y)
KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/lib/cJSON
endif
<<<<<<< HEAD
ifeq ($(CONFIG_LIB_USING_FREEMODBUS), y)
KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/lib/freemodbus
=======
endif
ifeq ($(CONFIG_LIB_USING_SQLITE), y)
KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/lib/SQLite #
KERNELPATHS += -I$(KERNEL_ROOT)/../../APP_Framework/lib/SQLite/xizi_port #
>>>>>>> 051f67ddba2c147f4dd182d204ca8dbf28110479
endif
ifeq ($(CONFIG_LIB_USING_LORAWAN), y)