From 7d0043993e20c7d97aae37a1a9bd31f071229b73 Mon Sep 17 00:00:00 2001 From: sakumisu <1203593632@qq.com> Date: Thu, 6 Oct 2022 22:55:47 +0800 Subject: [PATCH] update sconsript --- SConscript | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/SConscript b/SConscript index e1034c53..b9e1c258 100644 --- a/SConscript +++ b/SConscript @@ -3,6 +3,13 @@ from building import * cwd = GetCurrentDir() path = [cwd + '/common'] path += [cwd + '/core'] +path += [cwd + '/class/cdc'] +path += [cwd + '/class/msc'] +path += [cwd + '/class/hid'] +path += [cwd + '/class/audio'] +path += [cwd + '/class/video'] +path += [cwd + '/class/wireless'] +path += [cwd + '/class/dfu'] src = [] CPPDEFINES = [] @@ -15,29 +22,19 @@ if GetDepend(['PKG_CHERRYUSB_DEVICE']): CPPDEFINES+=['CONFIG_USB_HS'] if GetDepend(['PKG_CHERRYUSB_DEVICE_CDC']): - path += [cwd + '/class/cdc'] src += Glob('class/cdc/usbd_cdc.c') if GetDepend(['PKG_CHERRYUSB_DEVICE_HID']): - path += [cwd + '/class/hid'] src += Glob('class/hid/usbd_hid.c') if GetDepend(['PKG_CHERRYUSB_DEVICE_MSC']): - path += [cwd + '/class/msc'] src += Glob('class/msc/usbd_msc.c') if GetDepend(['PKG_CHERRYUSB_DEVICE_AUDIO']): - path += [cwd + '/class/audio'] src += Glob('class/audio/usbd_audio.c') if GetDepend(['PKG_CHERRYUSB_DEVICE_VIDEO']): - path += [cwd + '/class/video'] src += Glob('class/video/usbd_video.c') if GetDepend(['PKG_CHERRYUSB_DEVICE_RNDIS']): - path += [cwd + '/class/wireless'] src += Glob('class/wireless/usbd_rndis.c') if GetDepend(['PKG_CHERRYUSB_USING_DFU']): - path += [cwd + '/class/dfu'] src += Glob('class/dfu/usbd_dfu.c') - if GetDepend(['PKG_CHERRYUSB_USING_HUB']): - path += [cwd + '/class/hub'] - src += Glob('class/hub/usbd_hub.c') if GetDepend(['PKG_CHERRYUSB_DEVICE_CDC_TEMPLATE']): src += Glob('demo/cdc_acm_template.c') @@ -53,6 +50,8 @@ if GetDepend(['PKG_CHERRYUSB_DEVICE']): src += Glob('demo/audio_v2_mic_speaker_multichan_template.c') if GetDepend(['PKG_CHERRYUSB_DEVICE_VIDEO_TEMPLATE']): src += Glob('demo/video_static_mjpeg_template.c') + if GetDepend(['PKG_CHERRYUSB_DEVICE_RNDIS_TEMPLATE']): + src += Glob('demo/cdc_rndis_template.c') if GetDepend(['PKG_CHERRYUSB_DEVICE_FSDEV']): src += Glob('port/fsdev/usb_dc_fsdev.c') @@ -84,13 +83,10 @@ if GetDepend(['PKG_CHERRYUSB_HOST']): src += Glob('osal/usb_osal_rtthread.c') if GetDepend(['PKG_CHERRYUSB_HOST_CDC']): - path += [cwd + '/class/cdc'] src += Glob('class/cdc/usbh_cdc_acm.c') if GetDepend(['PKG_CHERRYUSB_HOST_HID']): - path += [cwd + '/class/hid'] src += Glob('class/hid/usbh_hid.c') if GetDepend(['PKG_CHERRYUSB_HOST_MSC']): - path += [cwd + '/class/msc'] src += Glob('class/msc/usbh_msc.c') if GetDepend(['PKG_CHERRYUSB_HOST_RNDIS']): src += Glob('class/wireless/usbh_rndis.c')