Jack Humbert
a3f726174c
Merge pull request #665 from linsomniac/keymap_jafo
...
Adding jafo layout.
2016-08-20 11:04:54 -04:00
Jack Humbert
a592c9dcf4
Merge pull request #658 from Xyverz/master
...
Got rid of all the kludge in my ErgoDox keymap.
2016-08-20 11:04:02 -04:00
Jack Humbert
7cef0f56e9
Merge pull request #630 from nrrkeene/master
...
The Ordinary Layout is the unsurprising layout
2016-08-20 11:01:22 -04:00
Fred Sundvik
fd2f957a1a
Normalize line endings
2016-08-20 17:59:18 +03:00
Fred Sundvik
f0fd840a57
Add .gitattributes to ensure correct line endings
...
It also ensures that make files and shell script are checked out
with lf endings, for compability with the Windows 10 bash
2016-08-20 17:27:51 +03:00
IBNobody
462e516ad9
Merge
2016-08-20 08:34:42 -05:00
IBNobody
9e3a550840
Merge
2016-08-20 08:31:24 -05:00
IBNobody
2dfe13ac6d
fixed color detection routine in makefile
2016-08-20 08:28:30 -05:00
IBNobody
e1590abea9
fixed color detection routine in makefile
2016-08-20 08:28:30 -05:00
IBNobody
6bd9235fe3
Merge
2016-08-20 08:16:06 -05:00
Fred Sundvik
b26ded3ab1
Comment the Makefile
...
Also move some messages to message.mk
2016-08-20 14:53:29 +03:00
Fred Sundvik
48f8ab1ae2
Fix the clean target
...
It now properly cleans all the outputs
2016-08-20 12:44:04 +03:00
Xyverz
70d4ea7904
Merge remote-tracking branch 'upstream/master'
2016-08-19 22:50:55 -07:00
Xyverz
e4984f65de
Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.
2016-08-19 22:45:20 -07:00
Xyverz
aff792545d
Changed my keymap to match normal keymaps.
2016-08-19 22:30:34 -07:00
IBNobody
dd553d460e
fixed color detection routine in makefile
2016-08-19 23:53:22 -05:00
Nicholas Keene
6a9a6b9477
The Ordinary Layout is boring because all the keys are where you expect them to be
2016-08-19 23:44:08 -05:00
IBNobody
23617779b4
Merge https://github.com/IBNobody/qmk_firmware
2016-08-19 23:39:35 -05:00
Nicholas Keene
8f78ba1f73
The Ordinary Layout is boring because all the keys are where you expect them to be
2016-08-19 23:38:13 -05:00
IBNobody
fdaae7ec88
fixed color detection routine in makefile
2016-08-19 23:37:54 -05:00
Sean Reifschneider
d98e5ddf30
Tweaks after review.
2016-08-19 21:50:04 -06:00
Sean Reifschneider
9e03517ae5
Restructuring of the ergodox README.
2016-08-19 21:47:00 -06:00
Sean Reifschneider
a25480b3b5
Bringing over changes from default map.
2016-08-19 20:55:50 -06:00
Fred Sundvik
da226e6126
Update keyboard readme files with new makefile instructions
2016-08-20 03:56:48 +03:00
Fred Sundvik
b4c75569b0
Update readme with new instructions for make
2016-08-20 03:56:47 +03:00
Fred Sundvik
e1243339ca
Add diffutils to travis.yml and install_dependencies
...
It has been required for a while now, and now actually checked in
the makefiles. Before, if you didn't have it installed it would
just recompile everything.
The readme hasn't been updated to reflect this, I think we need
to go through that separately, and see what's really needed. Or
just instruct people to run the batch scripts.
2016-08-20 03:56:46 +03:00
Fred Sundvik
ab4d7adbb9
Fix the template for the Makefile/rules.mk split
2016-08-20 03:56:45 +03:00
Fred Sundvik
f29730da36
Better format for non-silent output
2016-08-20 03:56:44 +03:00
Fred Sundvik
03e31ef8b9
Continue on error
2016-08-20 03:56:43 +03:00
Fred Sundvik
3442e216dc
Move bootloader_defs include to build_keyboard
...
Also fix it for subprojects
2016-08-20 03:56:42 +03:00
Fred Sundvik
9028a412ea
Add output specific config file
2016-08-20 03:56:41 +03:00
Fred Sundvik
33fbd3be36
Output specific include paths
2016-08-20 03:56:40 +03:00
Fred Sundvik
3aac4e95c9
More general system for generating several outputs
2016-08-20 03:56:39 +03:00
Fred Sundvik
87bf34a5d3
Pass the target to submake
2016-08-20 03:56:38 +03:00
Fred Sundvik
d924eb591e
Fix variable name clash with builtin
...
This caused the submake to be called several times, messing up the
build.
2016-08-20 03:56:37 +03:00
Fred Sundvik
8732265928
Options for silent compilation
...
A single keyboard is always by default compiled in verbose mode.
While multiple keyboards are compiled in silent mode. This can be
overriden by the silent variable from the command line
2016-08-20 03:56:36 +03:00
Fred Sundvik
e4c842de02
Don't run builtin rules for submake
...
To speed up the compilation
2016-08-20 03:56:35 +03:00
Fred Sundvik
881bde8258
Fix running make in parallel
2016-08-20 03:56:34 +03:00
Fred Sundvik
dd8c1a7659
Don't add VERSION as a define
...
To avoid full recompilation when the git commit hash changes.
2016-08-20 03:56:33 +03:00
Fred Sundvik
60c6e79ecb
Move git submodule check and version generation to main Makefile
2016-08-20 03:56:32 +03:00
Fred Sundvik
cc2df445ab
Remove unneded code from tmk_core/rules.mk
2016-08-20 03:56:31 +03:00
Fred Sundvik
67b294ca66
Actual compilation
2016-08-20 03:56:30 +03:00
Fred Sundvik
db5c3b74fb
Add color output
2016-08-20 03:56:29 +03:00
Fred Sundvik
0dd629a990
Fix running make from various subfolders
2016-08-20 03:56:28 +03:00
Fred Sundvik
a04bb3a3ba
Fixed the shortcut targets
2016-08-20 03:56:27 +03:00
Fred Sundvik
3fa6625869
Proper default goals when inside keyboard fodlers
2016-08-20 03:56:26 +03:00
Fred Sundvik
459ddaceda
Add backwards compability with makefile variables
2016-08-20 03:56:25 +03:00
Fred Sundvik
4f20061f66
Proper handling for running make from a subproject or keymap dir
2016-08-20 03:56:24 +03:00
Fred Sundvik
051017c312
Split subproject make files into Makefile and rules.mk
2016-08-20 03:56:23 +03:00
Fred Sundvik
c83af54513
Support for running from keyboard directory
2016-08-20 03:56:21 +03:00
