diff options
Diffstat (limited to 'bsp/stm32/stm32f411-weact-MiniF4/SConstruct')
| -rw-r--r-- | bsp/stm32/stm32f411-weact-MiniF4/SConstruct | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/bsp/stm32/stm32f411-weact-MiniF4/SConstruct b/bsp/stm32/stm32f411-weact-MiniF4/SConstruct index 2e6891d41f..a021b1b3e3 100644 --- a/bsp/stm32/stm32f411-weact-MiniF4/SConstruct +++ b/bsp/stm32/stm32f411-weact-MiniF4/SConstruct @@ -15,7 +15,7 @@ except: print(RTT_ROOT) exit(-1) -TARGET = 'rt-thread.' + rtconfig.TARGET_EXT +TARGET = 'rtthread.' + rtconfig.TARGET_EXT DefaultEnvironment(tools=[]) env = Environment(tools = ['mingw'], @@ -29,7 +29,7 @@ env.PrependENVPath('PATH', rtconfig.EXEC_PATH) if rtconfig.PLATFORM == 'iar': env.Replace(CCCOM = ['$CC $CFLAGS $CPPFLAGS $_CPPDEFFLAGS $_CPPINCFLAGS -o $TARGET $SOURCES']) env.Replace(ARFLAGS = ['']) - env.Replace(LINKCOM = env["LINKCOM"] + ' --map rt-thread.map') + env.Replace(LINKCOM = env["LINKCOM"] + ' --map rtthread.map') Export('RTT_ROOT') Export('rtconfig') @@ -41,9 +41,6 @@ if os.path.exists(SDK_ROOT + '/libraries'): else: libraries_path_prefix = os.path.dirname(SDK_ROOT) + '/libraries' -from utils import _make_path_relative -libraries_path_prefix = _make_path_relative(os.path.abspath('./'), libraries_path_prefix) - SDK_LIB = libraries_path_prefix Export('SDK_LIB') @@ -53,19 +50,11 @@ objs = PrepareBuilding(env, RTT_ROOT, has_libcpu=False) stm32_library = 'STM32F4xx_HAL' rtconfig.BSP_LIBRARY_TYPE = stm32_library -bsp_vdir = 'build' - # include libraries -objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'), - variant_dir=bsp_vdir + '/libraries/'+ stm32_library, duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, stm32_library, 'SConscript'))) # include drivers -objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'), - variant_dir=bsp_vdir + '/libraries/HAL_Drivers', duplicate=0)) - -bsp_port_script = os.path.join(os.getcwd(), 'board', 'ports', 'SConscript') -if os.path.isfile(bsp_port_script): - objs.extend(SConscript(bsp_port_script, variant_dir=bsp_vdir + '/board/ports', duplicate=0)) +objs.extend(SConscript(os.path.join(libraries_path_prefix, 'HAL_Drivers', 'SConscript'))) # make a building DoBuilding(TARGET, objs) |