From b79835455e03cb381f7dd51efd18fdd3a844fd68 Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Thu, 7 Jun 2018 10:40:18 -0700 Subject: [PATCH] Add Windows-specific makefile settings --- emacs/.emacs.d/GNUmakefile | 7 +++++-- emacs/.emacs.d/windows.mk | 2 ++ 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100755 emacs/.emacs.d/windows.mk diff --git a/emacs/.emacs.d/GNUmakefile b/emacs/.emacs.d/GNUmakefile index 9a04907..dbb8f78 100644 --- a/emacs/.emacs.d/GNUmakefile +++ b/emacs/.emacs.d/GNUmakefile @@ -1,6 +1,5 @@ -include ../../dotfiles.mk - SHELL = bash +EMACS := emacs .SECONDARY: @@ -12,6 +11,10 @@ INIT_LISPS = init/oni-org-init.elc init/oni-js2-init.elc init/oni-gnus-init.elc $(addsuffix .elc,$(basename $(wildcard init/*.org))) VENDOR_DIRS = $(wildcard vendor-lisp/*) +ifeq ($(OS),Windows_NT) +include windows.mk +endif + .PHONY: all snippets all: $(SITE_LISPS) init.elc $(INIT_LISPS) $(AUTOLOADS_FILE) snippets diff --git a/emacs/.emacs.d/windows.mk b/emacs/.emacs.d/windows.mk new file mode 100755 index 0000000..53d6f57 --- /dev/null +++ b/emacs/.emacs.d/windows.mk @@ -0,0 +1,2 @@ +EMACS := C:/msys64/mingw64/bin/emacs.exe +HOME := $(APPDATA)