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

conflict resolution

This commit is contained in:
wgz-code 2022-03-04 12:12:33 +08:00
parent 46a8d5f9e5
commit 918bed7634
1 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
APP_Framework/Framework/connection/Makefile
View File

@ -1,51 +1,62 @@
SRC_FILES := adapter.c adapter_agent.c include $(KERNEL_ROOT)/.config
ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
include $(APPDIR)/Make.defs
CSRCS += adapter.c adapter_agent.c
include $(APPDIR)/Application.mk
ifeq ($(CONFIG_CONNECTION_INDUSTRIAL_ETHERNET),y)
SRC_DIR += industrial_ethernet
endif endif
ifeq ($(CONFIG_CONNECTION_INDUSTRIAL_FIELDBUS),y) ifeq ($(CONFIG_ADD_XIZI_FETURES),y)
SRC_DIR += industrial_fieldbus SRC_FILES := adapter.c adapter_agent.c
endif
ifeq ($(CONFIG_CONNECTION_INDUSTRIAL_WLAN),y) ifeq ($(CONFIG_CONNECTION_INDUSTRIAL_ETHERNET),y)
SRC_DIR += industrial_wlan SRC_DIR += industrial_ethernet
endif endif
ifeq ($(CONFIG_CONNECTION_ADAPTER_LORA),y) ifeq ($(CONFIG_CONNECTION_INDUSTRIAL_FIELDBUS),y)
SRC_DIR += lora SRC_DIR += industrial_fieldbus
endif endif
ifeq ($(CONFIG_CONNECTION_ADAPTER_4G),y) ifeq ($(CONFIG_CONNECTION_INDUSTRIAL_WLAN),y)
SRC_DIR += 4g SRC_DIR += industrial_wlan
endif endif
ifeq ($(CONFIG_CONNECTION_ADAPTER_NB),y) ifeq ($(CONFIG_CONNECTION_ADAPTER_LORA),y)
SRC_DIR += nbiot SRC_DIR += lora
endif endif
ifeq ($(CONFIG_CONNECTION_ADAPTER_WIFI),y) ifeq ($(CONFIG_CONNECTION_ADAPTER_4G),y)
SRC_DIR += wifi SRC_DIR += 4g
endif endif
ifeq ($(CONFIG_CONNECTION_ADAPTER_ETHERNET),y) ifeq ($(CONFIG_CONNECTION_ADAPTER_NB),y)
SRC_DIR += ethernet SRC_DIR += nbiot
endif endif
ifeq ($(CONFIG_CONNECTION_ADAPTER_ETHERCAT),y) ifeq ($(CONFIG_CONNECTION_ADAPTER_WIFI),y)
SRC_DIR += ethercat SRC_DIR += wifi
endif endif
ifeq ($(CONFIG_CONNECTION_ADAPTER_BLUETOOTH),y) ifeq ($(CONFIG_CONNECTION_ADAPTER_ETHERNET),y)
SRC_DIR += bluetooth SRC_DIR += ethernet
endif endif
ifeq ($(CONFIG_CONNECTION_ADAPTER_ZIGBEE),y) ifeq ($(CONFIG_CONNECTION_ADAPTER_ETHERCAT),y)
SRC_DIR += zigbee SRC_DIR += ethercat
endif endif
ifeq ($(CONFIG_CONNECTION_ADAPTER_5G),y) ifeq ($(CONFIG_CONNECTION_ADAPTER_BLUETOOTH),y)
SRC_DIR += 5g SRC_DIR += bluetooth
endif endif
include $(KERNEL_ROOT)/compiler.mk ifeq ($(CONFIG_CONNECTION_ADAPTER_ZIGBEE),y)
SRC_DIR += zigbee
endif
ifeq ($(CONFIG_CONNECTION_ADAPTER_5G),y)
SRC_DIR += 5g
endif
include $(KERNEL_ROOT)/compiler.mk
endif