josh/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Renames keyboard folder to keyboards, adds couple of tmk's fixes (#432)

Browse Source 
* fixes from tmk's repo

* rename keyboard to keyboards
This commit is contained in:
Jack Humbert
2016-06-21 22:39:54 -04:00
committed by GitHub
parent 464c8e274f
commit 649b33d778
545 changed files with 1752 additions and 15315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -7,8 +7,8 @@ starting_makefile := $(subst $(space),_SPACE_,$(abspath $(firstword $(MAKEFILE_L
mkfile_path := $(subst $(space),_SPACE_,$(abspath $(lastword $(MAKEFILE_LIST))))
abs_tmk_root := $(patsubst %/,%,$(dir $(mkfile_path)))
ifneq (,$(findstring /keyboard/,$(starting_makefile)))
possible_keyboard:=$(patsubst %/,%,$(dir $(patsubst $(abs_tmk_root)/keyboard/%,%,$(starting_makefile))))
ifneq (,$(findstring /keyboards/,$(starting_makefile)))
possible_keyboard:=$(patsubst %/,%,$(dir $(patsubst $(abs_tmk_root)/keyboards/%,%,$(starting_makefile))))
ifneq (,$(findstring /keymaps/,$(possible_keyboard)))
KEYBOARD_DIR:=$(firstword $(subst /keymaps/, ,$(possible_keyboard)))
KEYMAP_DIR:=$(lastword $(subst /keymaps/, ,$(possible_keyboard)))
@@ -41,9 +41,9 @@ endif
ifndef KEYBOARD
KEYBOARD=planck
endif
KEYBOARD_PATH = $(TOP_DIR)/keyboard/$(KEYBOARD)
KEYBOARD_PATH = $(TOP_DIR)/keyboards/$(KEYBOARD)
ifneq ("$(wildcard $(KEYBOARD_PATH)/$(KEYBOARD).c)","")
KEYBOARD_FILE = keyboard/$(KEYBOARD)/$(KEYBOARD).c
KEYBOARD_FILE = keyboards/$(KEYBOARD)/$(KEYBOARD).c
ifndef ARCH
include $(KEYBOARD_PATH)/Makefile
endif
@@ -62,7 +62,7 @@ ifndef KEYMAP
endif
KEYMAP_PATH = $(KEYBOARD_PATH)/keymaps/$(KEYMAP)
ifneq ("$(wildcard $(KEYMAP_PATH)/keymap.c)","")
KEYMAP_FILE = keyboard/$(KEYBOARD)/keymaps/$(KEYMAP)/keymap.c
KEYMAP_FILE = keyboards/$(KEYBOARD)/keymaps/$(KEYMAP)/keymap.c
-include $(KEYMAP_PATH)/Makefile
else
$(error "$(KEYMAP_PATH)/keymap.c" does not exist)