From e5611cac57d5fb439fcb56d76ae3d819ebdd5789 Mon Sep 17 00:00:00 2001 From: Daniel de Cloet Date: Wed, 4 May 2022 08:50:48 +0200 Subject: [PATCH] Add support for building on OSX --- .gitignore | 2 +- Makefile | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 33b995e..8d3faa6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ qmk_firmware/ mdloader -mdloader-Linux.zip +mdloader.zip diff --git a/Makefile b/Makefile index 72d1434..e545c60 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,8 @@ BUILD_TARGET_LAYOUTS := $(addsuffix .bin, $(addprefix builds/, $(notdir $(TARGET WRITE_TARGET?=undefined-target +UNAME_S := $(shell uname -s) + .DEFAULT_GOAL := help .PHONY: help @@ -39,11 +41,16 @@ qmk_firmware/patches_applied: qmk_patches.diff @git -C qmk_firmware apply ../qmk_patches.diff @touch qmk_firmware/patches_applied -mdloader-Linux.zip: - @curl -LOs https://github.com/Massdrop/mdloader/releases/download/$(MDLOADER_VERSION)/mdloader-Linux.zip +mdloader.zip: +ifeq ($(UNAME_S),Linux) + @curl -Ls -o mdloader.zip https://github.com/Massdrop/mdloader/releases/download/$(MDLOADER_VERSION)/mdloader-Linux.zip +endif +ifeq ($(UNAME_S),Darwin) + @curl -Ls -o mdloader.zip https://github.com/Massdrop/mdloader/releases/download/$(MDLOADER_VERSION)/mdloader-macOS.zip +endif -mdloader: mdloader-Linux.zip - @unzip mdloader-Linux.zip +mdloader: mdloader.zip + @unzip mdloader.zip @[ -e mdloader ] && touch mdloader builds/%.bin: qmk_firmware/.git/HEAD | qmk_firmware