xuos
/
xiuos
2
0
Fork 11
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

conflict resolution

This commit is contained in:
wgz-code 2022-03-04 12:07:39 +08:00
parent 233024f3f0
commit 295ffe0486
1 changed files with 37 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
APP_Framework/Framework/connection/Makefile
View File

@ -1,12 +1,3 @@
include $(KERNEL_ROOT)/.config
ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
include $(APPDIR)/Make.defs
CSRCS += adapter.c adapter_agent.c
include $(APPDIR)/Application.mk
endif
ifeq ($(CONFIG_ADD_XIUOS_FETURES),y)
SRC_FILES := adapter.c adapter_agent.c SRC_FILES := adapter.c adapter_agent.c
ifeq ($(CONFIG_CONNECTION_INDUSTRIAL_ETHERNET),y) ifeq ($(CONFIG_CONNECTION_INDUSTRIAL_ETHERNET),y)
@ -58,5 +49,3 @@ ifeq ($(CONFIG_ADD_XIUOS_FETURES),y)
endif endif
include $(KERNEL_ROOT)/compiler.mk include $(KERNEL_ROOT)/compiler.mk
endif