未验证 提交 e3045389 编写于 作者: G guo 提交者: GitHub

Merge pull request #5157 from mysterywolf/win32

[bsp][simulator] support for finding a msvc path automatically
...@@ -140,6 +140,7 @@ CONFIG_RT_DFS_ELM_DRIVES=2 ...@@ -140,6 +140,7 @@ CONFIG_RT_DFS_ELM_DRIVES=2
CONFIG_RT_DFS_ELM_MAX_SECTOR_SIZE=512 CONFIG_RT_DFS_ELM_MAX_SECTOR_SIZE=512
# CONFIG_RT_DFS_ELM_USE_ERASE is not set # CONFIG_RT_DFS_ELM_USE_ERASE is not set
CONFIG_RT_DFS_ELM_REENTRANT=y CONFIG_RT_DFS_ELM_REENTRANT=y
CONFIG_RT_DFS_ELM_MUTEX_TIMEOUT=3000
CONFIG_RT_USING_DFS_DEVFS=y CONFIG_RT_USING_DFS_DEVFS=y
# CONFIG_RT_USING_DFS_ROMFS is not set # CONFIG_RT_USING_DFS_ROMFS is not set
# CONFIG_RT_USING_DFS_RAMFS is not set # CONFIG_RT_USING_DFS_RAMFS is not set
...@@ -228,6 +229,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 ...@@ -228,6 +229,7 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
# CONFIG_RT_USING_RYM is not set # CONFIG_RT_USING_RYM is not set
# CONFIG_RT_USING_ULOG is not set # CONFIG_RT_USING_ULOG is not set
# CONFIG_RT_USING_UTEST is not set # CONFIG_RT_USING_UTEST is not set
# CONFIG_RT_USING_VAR_EXPORT is not set
# CONFIG_RT_USING_RT_LINK is not set # CONFIG_RT_USING_RT_LINK is not set
# #
...@@ -324,6 +326,9 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 ...@@ -324,6 +326,9 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
# CONFIG_PKG_USING_AGILE_FTP is not set # CONFIG_PKG_USING_AGILE_FTP is not set
# CONFIG_PKG_USING_EMBEDDEDPROTO is not set # CONFIG_PKG_USING_EMBEDDEDPROTO is not set
# CONFIG_PKG_USING_RT_LINK_HW is not set # CONFIG_PKG_USING_RT_LINK_HW is not set
# CONFIG_PKG_USING_LORA_PKT_FWD is not set
# CONFIG_PKG_USING_LORA_GW_DRIVER_LIB is not set
# CONFIG_PKG_USING_LORA_PKT_SNIFFER is not set
# CONFIG_PKG_USING_HM is not set # CONFIG_PKG_USING_HM is not set
# #
...@@ -358,6 +363,13 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 ...@@ -358,6 +363,13 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
# CONFIG_PKG_USING_NUEMWIN is not set # CONFIG_PKG_USING_NUEMWIN is not set
# CONFIG_PKG_USING_MP3PLAYER is not set # CONFIG_PKG_USING_MP3PLAYER is not set
# CONFIG_PKG_USING_TINYJPEG is not set # CONFIG_PKG_USING_TINYJPEG is not set
# CONFIG_PKG_USING_UGUI is not set
#
# U8G2: a monochrome graphic library
#
# CONFIG_PKG_USING_U8G2_OFFICIAL is not set
# CONFIG_PKG_USING_U8G2 is not set
# #
# tools packages # tools packages
...@@ -466,7 +478,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 ...@@ -466,7 +478,6 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
# CONFIG_PKG_USING_AS7341 is not set # CONFIG_PKG_USING_AS7341 is not set
# CONFIG_PKG_USING_STM32_SDIO is not set # CONFIG_PKG_USING_STM32_SDIO is not set
# CONFIG_PKG_USING_ICM20608 is not set # CONFIG_PKG_USING_ICM20608 is not set
# CONFIG_PKG_USING_U8G2 is not set
# CONFIG_PKG_USING_BUTTON is not set # CONFIG_PKG_USING_BUTTON is not set
# CONFIG_PKG_USING_PCF8574 is not set # CONFIG_PKG_USING_PCF8574 is not set
# CONFIG_PKG_USING_SX12XX is not set # CONFIG_PKG_USING_SX12XX is not set
...@@ -528,6 +539,8 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8 ...@@ -528,6 +539,8 @@ CONFIG_RT_LIBC_DEFAULT_TIMEZONE=8
# CONFIG_PKG_USING_MCP23008 is not set # CONFIG_PKG_USING_MCP23008 is not set
# CONFIG_PKG_USING_BLUETRUM_SDK is not set # CONFIG_PKG_USING_BLUETRUM_SDK is not set
# CONFIG_PKG_USING_MISAKA_AT24CXX is not set # CONFIG_PKG_USING_MISAKA_AT24CXX is not set
# CONFIG_PKG_USING_MISAKA_RGB_BLING is not set
# CONFIG_PKG_USING_BL_MCU_SDK is not set
# #
# AI packages # AI packages
......
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
#define RT_DFS_ELM_DRIVES 2 #define RT_DFS_ELM_DRIVES 2
#define RT_DFS_ELM_MAX_SECTOR_SIZE 512 #define RT_DFS_ELM_MAX_SECTOR_SIZE 512
#define RT_DFS_ELM_REENTRANT #define RT_DFS_ELM_REENTRANT
#define RT_DFS_ELM_MUTEX_TIMEOUT 3000
#define RT_USING_DFS_DEVFS #define RT_USING_DFS_DEVFS
/* Device Drivers */ /* Device Drivers */
...@@ -158,6 +159,9 @@ ...@@ -158,6 +159,9 @@
/* multimedia packages */ /* multimedia packages */
/* U8G2: a monochrome graphic library */
/* tools packages */ /* tools packages */
......
import os import os
import SCons.Tool.MSCommon.vc
# toolchains options # toolchains options
ARCH='sim' ARCH='sim'
#CROSS_TOOL='msvc' or 'gcc' or 'mingw' #CROSS_TOOL='msvc' or 'gcc' or 'mingw'
#'msvc' and 'mingw' are both for windows #'msvc' and 'mingw' are both for windows
# 'gcc' is for linux # 'gcc' is for linux
CROSS_TOOL='mingw' CROSS_TOOL='msvc'
if os.getenv('RTT_CC'): if os.getenv('RTT_CC'):
CROSS_TOOL = os.getenv('RTT_CC') CROSS_TOOL = os.getenv('RTT_CC')
...@@ -26,6 +27,20 @@ elif CROSS_TOOL == 'msvc': ...@@ -26,6 +27,20 @@ elif CROSS_TOOL == 'msvc':
CPU = 'win32' CPU = 'win32'
PLATFORM = 'cl' PLATFORM = 'cl'
EXEC_PATH = '' EXEC_PATH = ''
vc_version = ''
vc_versions = SCons.Tool.MSCommon.vc.get_installed_vcs()
if not vc_versions:
print("No vc version!")
exit(1)
else:
vc_version = vc_versions[0]
EXEC_PATH = SCons.Tool.MSCommon.vc.find_vc_pdir(vc_version)
if not EXEC_PATH:
print('Installed VC %s failure!' % vc_version)
exit(1)
else:
print('Successfully installed VC %s, path:%s' % (vc_version, EXEC_PATH))
else: else:
print("bad CROSS TOOL!") print("bad CROSS TOOL!")
exit(1) exit(1)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册