diff --git a/rt-thread/SConscript b/rt-thread/SConscript index 0e45f1d16..879fcb99f 100644 --- a/rt-thread/SConscript +++ b/rt-thread/SConscript @@ -8,13 +8,10 @@ cwd = GetCurrentDir() src = [] inc = [] -LOCAL_CCFLAGS = '' lvgl_cwd = cwd + '/../' lvgl_src_cwd = lvgl_cwd + 'src/' -src = src + Glob('*.c') -inc = inc + [cwd] inc = inc + [lvgl_src_cwd] for root, dirs, files in os.walk(lvgl_src_cwd): @@ -22,6 +19,7 @@ for root, dirs, files in os.walk(lvgl_src_cwd): src = src + Glob(os.path.join(root,dir,'*.c')) inc = inc + [os.path.join(root,dir)] +LOCAL_CCFLAGS = '' if rtconfig.CROSS_TOOL == 'gcc': LOCAL_CCFLAGS += ' -std=c99' elif rtconfig.CROSS_TOOL == 'keil': @@ -29,6 +27,10 @@ elif rtconfig.CROSS_TOOL == 'keil': group = DefineGroup('LVGL', src, depend = ['PKG_USING_LVGL'], CPPPATH = inc, LOCAL_CCFLAGS = LOCAL_CCFLAGS) +port_src = Glob('*.c') +port_inc = [cwd] +group = group + DefineGroup('LVGL-port', port_src, depend = ['PKG_USING_LVGL'], CPPPATH = port_inc) + list = os.listdir(cwd) for d in list: path = os.path.join(cwd, d) diff --git a/rt-thread/lv_rt_thread_port.c b/rt-thread/lv_rt_thread_port.c index e0086afad..dfce9ea64 100644 --- a/rt-thread/lv_rt_thread_port.c +++ b/rt-thread/lv_rt_thread_port.c @@ -16,6 +16,13 @@ #define DBG_LVL DBG_INFO #include +#ifndef PKG_USING_LVGL_DISP_DEVICE +# include +#endif +#ifndef PKG_USING_LVGL_INDEV_DEVICE +# include +#endif + #if LV_USE_LOG && LV_LOG_PRINTF static void lv_rt_log(const char *buf) { @@ -29,6 +36,15 @@ static int lv_port_init(void) lv_log_register_print_cb(lv_rt_log); #endif + lv_init(); + +#ifndef PKG_USING_LVGL_DISP_DEVICE + lv_port_disp_init(); +#endif +#ifndef PKG_USING_LVGL_INDEV_DEVICE + lv_port_indev_init(); +#endif + return 0; } INIT_COMPONENT_EXPORT(lv_port_init);