diff options
| author | Gordon McNab <[email protected]> | 2021-12-08 10:05:32 +0000 |
|---|---|---|
| committer | Gordon McNab <[email protected]> | 2021-12-08 10:05:32 +0000 |
| commit | fa06bd01c97a3a14215ea145764c09aecaa0dd79 (patch) | |
| tree | cf2b2adaf093f906388fd8b943bbbbf0b54a3a21 /examples | |
| parent | 45869958f6066fe4d195c62423cba2fec1886cbc (diff) | |
Merge in upstream changes
Merge upstream changes and expand example support to hid examples.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/make.mk | 3 | ||||
| -rw-r--r-- | examples/rules.mk | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/examples/make.mk b/examples/make.mk index 793c40aa2..e1cd0af2a 100644 --- a/examples/make.mk +++ b/examples/make.mk @@ -104,10 +104,11 @@ CFLAGS += \ -Wmissing-format-attribute \ -Wunreachable-code \ -Wcast-align \ - -Wcast-function-type \ -Wcast-qual \ -Wnull-dereference +# -Wcast-function-type \ + # Debugging/Optimization ifeq ($(DEBUG), 1) CFLAGS += -Og diff --git a/examples/rules.mk b/examples/rules.mk index 4cc35cb22..a12a75d60 100644 --- a/examples/rules.mk +++ b/examples/rules.mk @@ -84,7 +84,7 @@ OBJ_DIRS = $(sort $(dir $(OBJ))) $(OBJ): | $(OBJ_DIRS) $(OBJ_DIRS): ifeq ($(CMDEXE),1) - @$(MKDIR) $(subst /,\,$@) + -@$(MKDIR) $(subst /,\,$@) else @$(MKDIR) -p $@ endif @@ -207,7 +207,7 @@ debug-bmp: $(BUILD)/$(PROJECT).elf # Create binary directory $(BIN): - @$(MKDIR) -p $@ + -@$(MKDIR) -p $@ # Copy binaries .elf, .bin, .hex, .uf2 to BIN for upload # due to large size of combined artifacts, only uf2 is uploaded for now |