Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Load keymap-level rules.mk when compiling keymap.json #8841

Merged
merged 1 commit into from
Apr 18, 2020

Conversation

Erovia
Copy link
Member

@Erovia Erovia commented Apr 18, 2020

Description

Load keymap-level rules.mk when compiling keymap.json

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@Erovia Erovia requested a review from a team April 18, 2020 11:18
Copy link
Member

@zvecr zvecr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a fan of the duplicate logic from https://github.com/qmk/qmk_firmware/blob/master/build_keyboard.mk#L104-L133, but I can see why its needed right now.

build_json.mk Show resolved Hide resolved
@zvecr zvecr merged commit 46a84ec into qmk:master Apr 18, 2020
@Erovia Erovia deleted the make/json_rulesmk branch April 18, 2020 13:39
kylekuj pushed a commit to kylekuj/qmk_firmware that referenced this pull request Apr 21, 2020
mrlinuxfish pushed a commit to mrlinuxfish/qmk_firmware that referenced this pull request May 3, 2020
bitherder pushed a commit to bitherder/qmk_firmware that referenced this pull request May 15, 2020
drashna pushed a commit to zsa/qmk_firmware that referenced this pull request May 24, 2020
sowbug pushed a commit to sowbug/qmk_firmware that referenced this pull request May 24, 2020
fdidron pushed a commit to zsa/qmk_firmware that referenced this pull request Jun 12, 2020
turky pushed a commit to turky/qmk_firmware that referenced this pull request Jun 13, 2020
jakobaa pushed a commit to jakobaa/qmk_firmware that referenced this pull request Jul 7, 2020
sjmacneil pushed a commit to sjmacneil/qmk_firmware that referenced this pull request Feb 19, 2021
BorisTestov pushed a commit to BorisTestov/qmk_firmware that referenced this pull request May 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants