test/awtk
1
0
Fork 0
mirror of https://gitee.com/zlgopen/awtk.git synced 2024-12-02 20:18:22 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

update build scripts

Browse Source
This commit is contained in:
lixianjing 2019-08-19 16:16:06 -07:00
parent f76542ee45
commit 049312b1d0
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/SConscript
View File

@ -8,6 +8,7 @@ VGCANVAS=os.environ['VGCANVAS'];
NATIVE_WINDOW = os.environ['NATIVE_WINDOW'];
sources=Glob('layouters/*.c') + \
Glob('base/*.c') + \
Glob('ui_loader/*.c') + \
Glob('xml/*.c') + \
Glob('svg/*.c') + \
@ -20,8 +21,7 @@ sources=Glob('layouters/*.c') + \
Glob('misc/*.cpp') + \
Glob('window_animators/*.c') + \
Glob('dialog_highlighters/*.c') + \
Glob('window_manager/window_manager_default.c') + \
['awtk_global.c'];
Glob('window_manager/window_manager_default.c')
if NATIVE_WINDOW == 'sdl':
sources += Glob('native_window/native_window_sdl.c')
@ -32,15 +32,10 @@ sources += ['lcd/lcd_mono.c'];
sources += ['main_loop/main_loop_simple.c'];
if os.environ['LCD'] == 'SDL_GPU':
sources += ['lcd/lcd_nanovg.c', 'main_loop/main_loop_sdl.c'];
sources += Glob('platforms/pc/*.c')
elif os.environ['LCD'] == 'SDL_FB':
sources += ['lcd/lcd_sdl2.c', 'main_loop/main_loop_sdl.c']
sources += Glob('platforms/pc/*.c')
elif os.environ['LCD'] == 'SDL_FB_MONO':
sources += ['lcd/lcd_sdl2_mono.c', 'main_loop/main_loop_sdl.c']
sources += Glob('platforms/pc/*.c')
elif os.environ['LCD'] == 'LINUX_FB':
sources += Glob('platforms/pc/*.c')
sources += [
'input_methods/input_method_creator.c'
@ -87,9 +82,9 @@ if env['PLATFORM'] == 'win32' and os.environ['TOOLS_NAME'] != '':
buf.ourenv = env
env['SPAWN'] = buf.ourspawn
env.Library(os.path.join(LIB_DIR, 'tkc'), Glob('tkc/*.c'), LIBS=[])
env.Library(os.path.join(LIB_DIR, 'base'), Glob('base/*.c'), LIBS=[])
env.Library(os.path.join(LIB_DIR, 'base'), sources, LIBS=[])
env.Library(os.path.join(LIB_DIR, 'awtk'), ['awtk_global.c'], LIBS=[])
env.Library(os.path.join(LIB_DIR, 'widgets'), Glob('widgets/*.c'), LIBS=[])
env.Library(os.path.join(LIB_DIR, 'tkc'), Glob('tkc/*.c') + Glob('platforms/pc/*.c'), LIBS=[])
env.Library(os.path.join(LIB_DIR, 'exwidgets'), Glob('ext_widgets/*.c') + Glob('ext_widgets/*/*.c'), LIBS=[])
env.Library(os.path.join(LIB_DIR, 'awtk'), sources, LIBS=[])

6
src/input_methods/input_method_default.inc
View File

@ -210,7 +210,7 @@ static ret_t input_method_default_show_keyboard(input_method_t* im) {
value_set_str(&v, "");
widget_set_prop(im->keyboard, WIDGET_PROP_OPEN_ANIM_HINT, &v);
widget_set_prop(im->keyboard, WIDGET_PROP_CLOSE_ANIM_HINT, &v);
keyboard_close(im->keyboard);
window_close(im->keyboard);
im->keyboard = NULL;
open_anim = FALSE;
@ -233,7 +233,7 @@ static ret_t on_idle_close_keyboard(const idle_info_t* idle) {
if (im->keyboard == info->keyboard && im->widget == info->widget) {
input_method_default_restore_win_position(im);
keyboard_close(im->keyboard);
window_close(im->keyboard);
im->keyboard = NULL;
im->widget = NULL;
}
@ -264,7 +264,7 @@ static ret_t input_method_default_request(input_method_t* im, widget_t* widget)
idle_add(on_idle_close_keyboard, info);
} else {
keyboard_close(im->keyboard);
window_close(im->keyboard);
im->keyboard = NULL;
im->widget = NULL;
}