mirror of
https://github.com/qmk/qmk_firmware.git
synced 2025-06-05 07:52:42 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
b3e34b9c29
@ -179,9 +179,6 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, clean=Fa
|
|||||||
if bootloader:
|
if bootloader:
|
||||||
make_command.append(bootloader)
|
make_command.append(bootloader)
|
||||||
|
|
||||||
for key, value in env_vars.items():
|
|
||||||
make_command.append(f'{key}={value}')
|
|
||||||
|
|
||||||
make_command.extend([
|
make_command.extend([
|
||||||
f'KEYBOARD={user_keymap["keyboard"]}',
|
f'KEYBOARD={user_keymap["keyboard"]}',
|
||||||
f'KEYMAP={user_keymap["keymap"]}',
|
f'KEYMAP={user_keymap["keymap"]}',
|
||||||
@ -202,6 +199,9 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, clean=Fa
|
|||||||
'QMK_BIN="qmk"',
|
'QMK_BIN="qmk"',
|
||||||
])
|
])
|
||||||
|
|
||||||
|
for key, value in env_vars.items():
|
||||||
|
make_command.append(f'{key}={value}')
|
||||||
|
|
||||||
return make_command
|
return make_command
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user