Skip to content

Commit a12a912

Browse files
author
chentan
committed
fix -lts order for raspi compile error
fix devices.json template mouse use event2
1 parent 4bdaf8b commit a12a912

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

awtk-port/main_loop_linux.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
#endif /*KB_DEVICE_FILENAME*/
6060

6161
#ifndef MICE_DEVICE_FILENAME
62-
#define MICE_DEVICE_FILENAME "/dev/input/mouse0"
62+
#define MICE_DEVICE_FILENAME "/dev/input/event2"
6363
#endif /*MICE_DEVICE_FILENAME*/
6464

6565
static device_info_t s_devices_default[] = {{"fb", FB_DEVICE_FILENAME},

awtk_config.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ def lcd_devices_is_egl(lcd_devices):
218218
STATIC_LIBS =['awtk_global', 'fscript_ext_widgets', 'extwidgets', 'widgets', 'awtk_linux_fb', 'base', 'gpinyin', 'linebreak', 'fribidi']
219219
STATIC_LIBS += TKC_STATIC_LIBS
220220
if TSLIB_LIB_DIR != '':
221-
SHARED_LIBS=['awtk', 'ts'] + OS_LIBS;
221+
SHARED_LIBS=['awtk'] + OS_LIBS + ['ts'];
222222
else:
223223
SHARED_LIBS=['awtk'] + OS_LIBS;
224224

@@ -275,7 +275,7 @@ def lcd_devices_is_egl(lcd_devices):
275275
] + OS_CPPPATH
276276

277277
if TSLIB_LIB_DIR != '':
278-
LIBS = ['ts'] + LIBS
278+
LIBS = LIBS + ['ts']
279279
LIBPATH = [TSLIB_LIB_DIR] + LIBPATH;
280280
CPPPATH = [TSLIB_INC_DIR] + CPPPATH;
281281

config/devices.json.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
"/dev/fb0" : {
33
"type" : "fb"
44
},
5-
"/dev/dri/card0" : {
5+
"/dev/dri/card0" : {
66
"type" : "drm"
77
},
8-
"/dev/input/event0" : {
8+
"/dev/input/event0" : {
99
"type" : "ts"
1010
},
11-
"/dev/input/event1" : {
11+
"/dev/input/event1" : {
1212
"type" : "input"
1313
},
14-
"/dev/input/mouse0" : {
14+
"/dev/input/event2" : {
1515
"type" : "mouse"
1616
}
1717
}

0 commit comments

Comments
 (0)