diff options
| author | prife <[email protected]> | 2013-02-02 00:37:10 +0800 |
|---|---|---|
| committer | prife <[email protected]> | 2013-02-02 00:37:10 +0800 |
| commit | fb94ccd89ee616d6741f4b5e8b05e031a5fa7775 (patch) | |
| tree | 87537e9d8613440c301e4f383d0a40efa42d0703 | |
| parent | 9400f237b29b9dc1ed3539cf7c0052a4d0456c9b (diff) | |
| parent | 0961cc5e36154b1eb2c474cb9472fdf5201c1cf5 (diff) | |
Merge branch 'simdev'
| -rwxr-xr-x | bsp/simulator/SConstruct | 1 | ||||
| -rwxr-xr-x | bsp/simulator/rtconfig.py | 2 | ||||
| -rw-r--r-- | bsp/simulator/rtgui_demo/snake/snake_gui.c | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/bsp/simulator/SConstruct b/bsp/simulator/SConstruct index 4dd5342cc6..12dbd7a025 100755 --- a/bsp/simulator/SConstruct +++ b/bsp/simulator/SConstruct @@ -55,6 +55,7 @@ else: TARGET = 'rtthread' env.Append(CCFLAGS=rtconfig.CFLAGS) env.Append(LINKFLAGS=rtconfig.LFLAGS) + env.Append(LIBS=['m']) # prepare building environment diff --git a/bsp/simulator/rtconfig.py b/bsp/simulator/rtconfig.py index fbff96e8be..4007e0b1d8 100755 --- a/bsp/simulator/rtconfig.py +++ b/bsp/simulator/rtconfig.py @@ -46,7 +46,7 @@ if PLATFORM == 'gcc': else: CFLAGS += ' -O2' - POST_ACTION = OBJCPY + ' -O binary $TARGET rtthread.bin\n' + SIZE + ' $TARGET \n' + POST_ACTION = '' elif PLATFORM == 'cl': # toolchains diff --git a/bsp/simulator/rtgui_demo/snake/snake_gui.c b/bsp/simulator/rtgui_demo/snake/snake_gui.c index 836355236b..0df1ba7a87 100644 --- a/bsp/simulator/rtgui_demo/snake/snake_gui.c +++ b/bsp/simulator/rtgui_demo/snake/snake_gui.c @@ -365,7 +365,7 @@ void snake_main(void) struct rtgui_win *win; rtgui_rect_t rect; - application = rtgui_app_create(rt_thread_self(), "sanke_app"); + application = rtgui_app_create("sanke_app"); if (application != RT_NULL) { rtgui_get_screen_rect(&rect); @@ -397,4 +397,4 @@ void snake_main(void) } #include <finsh.h> -FINSH_FUNCTION_EXPORT(snake_main, snake run)
\ No newline at end of file +FINSH_FUNCTION_EXPORT(snake_main, snake run) |