conflict resolution

2022-03-04 12:12:33 +08:00
parent 46a8d5f9e5
commit 918bed7634
1 changed files with 48 additions and 37 deletions
@@ -1,3 +1,12 @@
+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_XIZI_FETURES),y)
    SRC_FILES := adapter.c adapter_agent.c

    ifeq ($(CONFIG_CONNECTION_INDUSTRIAL_ETHERNET),y)
@@ -49,3 +58,5 @@ ifeq ($(CONFIG_CONNECTION_ADAPTER_5G),y)
    endif

    include $(KERNEL_ROOT)/compiler.mk
+
+endif