diff options
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rwxr-xr-x | scripts/archive-source.sh | 2 | ||||
| m--------- | subprojects/keycodemapdb (renamed from ui/keycodemapdb) | 0 | ||||
| -rw-r--r-- | ui/meson.build | 8 |
5 files changed, 9 insertions, 9 deletions
diff --git a/.gitmodules b/.gitmodules index 3ed5d07..f8b2ddf 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,8 +25,8 @@ [submodule "roms/QemuMacDrivers"] path = roms/QemuMacDrivers url = https://gitlab.com/qemu-project/QemuMacDrivers.git -[submodule "ui/keycodemapdb"] - path = ui/keycodemapdb +[submodule "subprojects/keycodemapdb"] + path = subprojects/keycodemapdb url = https://gitlab.com/qemu-project/keycodemapdb.git [submodule "roms/seabios-hppa"] path = roms/seabios-hppa @@ -253,7 +253,7 @@ else git_submodules_action="ignore" fi -git_submodules="ui/keycodemapdb" +git_submodules="subprojects/keycodemapdb" git="git" debug_tcg="no" docs="auto" @@ -805,7 +805,7 @@ case $git_submodules_action in fi ;; ignore) - if ! test -f "$source_path/ui/keycodemapdb/README" + if ! test -f "$source_path/subprojects/keycodemapdb/README" then echo echo "ERROR: missing GIT submodules" diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index a7c2886..dba5ae0 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -26,7 +26,7 @@ sub_file="${sub_tdir}/submodule.tar" # independent of what the developer currently has initialized # in their checkout, because the build environment is completely # different to the host OS. -submodules="subprojects/dtc ui/keycodemapdb" +submodules="subprojects/dtc subprojects/keycodemapdb" submodules="$submodules tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3" sub_deinit="" diff --git a/ui/keycodemapdb b/subprojects/keycodemapdb -Subproject f5772a62ec52591ff6870b7e8ef32482371f22c +Subproject f5772a62ec52591ff6870b7e8ef32482371f22c diff --git a/ui/meson.build b/ui/meson.build index 3303697..e09b616 100644 --- a/ui/meson.build +++ b/ui/meson.build @@ -162,15 +162,15 @@ keymaps = [ ] if have_system or xkbcommon.found() + keycodemapdb_proj = subproject('keycodemapdb', required: true) foreach e : keymaps output = 'input-keymap-@0@-to-@1@.c.inc'.format(e[0], e[1]) genh += custom_target(output, output: output, capture: true, - input: files('keycodemapdb/data/keymaps.csv'), - command: [python, files('keycodemapdb/tools/keymap-gen'), - 'code-map', - '--lang', 'glib2', + input: keycodemapdb_proj.get_variable('keymaps_csv'), + command: [python, keycodemapdb_proj.get_variable('keymap_gen').full_path(), + 'code-map', '--lang', 'glib2', '--varname', 'qemu_input_map_@0@_to_@1@'.format(e[0], e[1]), '@INPUT0@', e[0], e[1]]) endforeach |