aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2018-06-07 10:40:18 -0700
committerGravatar Tom Willemsen2018-06-07 10:40:18 -0700
commitb79835455e03cb381f7dd51efd18fdd3a844fd68 (patch)
tree13b2fb4f80ef067ec93ed5d679ea7829e1a12fd4
parent106fe5ab4ca5f4ebb13caa905bce130639717f35 (diff)
downloadnew-dotfiles-b79835455e03cb381f7dd51efd18fdd3a844fd68.tar.gz
new-dotfiles-b79835455e03cb381f7dd51efd18fdd3a844fd68.zip
Add Windows-specific makefile settings
-rw-r--r--emacs/.emacs.d/GNUmakefile7
-rwxr-xr-xemacs/.emacs.d/windows.mk2
2 files changed, 7 insertions, 2 deletions
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)