Adapt buffyboard to build from subdir

This commit is contained in:
Johannes Marbach 2023-11-20 21:03:32 +01:00
parent e58718943a
commit 14b30c6018
6 changed files with 11 additions and 11 deletions

11
.gitmodules vendored
View file

@ -1,9 +1,6 @@
[submodule "lv_drivers"]
path = lv_drivers
[submodule "buffyboard/lv_drivers"]
path = buffyboard/lv_drivers
url = https://github.com/littlevgl/lv_drivers.git
[submodule "lvgl"]
path = lvgl
[submodule "buffyboard/lvgl"]
path = buffyboard/lvgl
url = https://github.com/littlevgl/lvgl.git
[submodule "squeek2lvgl"]
path = squeek2lvgl
url = https://gitlab.com/cherrypicker/squeek2lvgl

1
buffyboard/lv_drivers Submodule

@ -0,0 +1 @@
Subproject commit 33983bcb0a9bfd0a4cf44dba67617b9f537e76f3

1
buffyboard/lvgl Submodule

@ -0,0 +1 @@
Subproject commit a2b555e096f7d401b5d8e877a6b5e81ff81c747a

View file

@ -30,7 +30,7 @@
#include "lvgl/lvgl.h"
#include "squeek2lvgl/sq2lv.h"
#include "../squeek2lvgl/sq2lv.h"
#include <limits.h>
#include <signal.h>

View file

@ -38,7 +38,7 @@ buffyboard_sources = [
]
squeek2lvgl_sources = [
'squeek2lvgl/sq2lv.c',
'../squeek2lvgl/sq2lv.c',
]
lvgl_sources = run_command('find-lvgl-sources.sh', 'lvgl').stdout().strip().split('\n')

View file

@ -18,10 +18,11 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
cd squeek2lvgl
cd ../squeek2lvgl
pipenv install
pipenv run python squeek2lvgl.py \
--input terminal/us.yaml \
--output .. \
--name "US English (Terminal)" \
--output ../buffyboard \
--generate-scancodes \
--shift-keycap '\xef\x8d\x9b'